linux/x86-64: Reduce delta to native setup code

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/arch/x86_64/kernel/setup-xen.c b/arch/x86_64/kernel/setup-xen.c
index ce8485ddfad64c4755b3e9db0e73e42bf5ddcdf9..45b9e980d4b6b6656ee87272db77214bacda39eb 100644 (file)
--- a/arch/x86_64/kernel/setup-xen.c
+++ b/arch/x86_64/kernel/setup-xen.c
@@ -606,16 +606,6 @@ void __init setup_arch(char **cmdline_p)
                screen_info.orig_video_isVGA = 0;
 
        copy_edid();
-       saved_video_mode = SAVED_VIDEO_MODE;
-       bootloader_type = LOADER_TYPE;
-
-#ifdef CONFIG_BLK_DEV_RAM
-       rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK;
-       rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0);
-       rd_doload = ((RAMDISK_FLAGS & RAMDISK_LOAD_FLAG) != 0);
-
-
-#endif
 
        HYPERVISOR_vm_assist(VMASST_CMD_enable,
                             VMASST_TYPE_writable_pagetables);
@@ -625,6 +615,7 @@ void __init setup_arch(char **cmdline_p)
        ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
        screen_info = SCREEN_INFO;
        edid_info = EDID_INFO;
+#endif /* !CONFIG_XEN */
        saved_video_mode = SAVED_VIDEO_MODE;
        bootloader_type = LOADER_TYPE;
 
@@ -633,7 +624,6 @@ void __init setup_arch(char **cmdline_p)
        rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0);
        rd_doload = ((RAMDISK_FLAGS & RAMDISK_LOAD_FLAG) != 0);
 #endif
-#endif /* !CONFIG_XEN */
        setup_memory_region();
        copy_edd();