Jan Beulich
2007-Dec-06 15:47 UTC
[Xen-devel] [PATCH] linux/x86-64: Reduce delta to native setup code
.. once more making applying other patches easier. As usual, written and tested against 2.6.24-rc3 and made apply against 2.6.18 without further testing. Signed-off-by: Jan Beulich <jbeulich@novell.com> Index: head-2007-11-30/arch/x86_64/kernel/setup-xen.c ==================================================================--- head-2007-11-30.orig/arch/x86_64/kernel/setup-xen.c 2007-12-06 14:56:17.000000000 +0100 +++ head-2007-11-30/arch/x86_64/kernel/setup-xen.c 2007-12-06 11:23:48.000000000 +0100 @@ -301,16 +338,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); @@ -322,6 +312,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; @@ -330,7 +331,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-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel