[Xen-changelog] [linux-2.6.18-xen] linux/x86-64: Reduce delta to native setup code

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1196956271 0
# Node ID a235a50c9f1e0f67a96c8cb9e3351ad897623ca3
# Parent  582b6839f60a4ff6766cf4ba54fbdff056ec3da0
linux/x86-64: Reduce delta to native setup code
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 arch/x86_64/kernel/setup-xen.c |   12 +-----------
 1 files changed, 1 insertion(+), 11 deletions(-)

diff -r 582b6839f60a -r a235a50c9f1e arch/x86_64/kernel/setup-xen.c
--- a/arch/x86_64/kernel/setup-xen.c    Thu Dec 06 15:49:58 2007 +0000
+++ b/arch/x86_64/kernel/setup-xen.c    Thu Dec 06 15:51:11 2007 +0000
@@ -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();
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog