From 8e895cb2c06e42936e615d01d75ca6ae7bfae6ce Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 6 Dec 2007 15:51:11 +0000 Subject: [PATCH] linux/x86-64: Reduce delta to native setup code Signed-off-by: Jan Beulich --- arch/x86_64/kernel/setup-xen.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/x86_64/kernel/setup-xen.c b/arch/x86_64/kernel/setup-xen.c index ce8485dd..45b9e980 100644 --- 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(); -- 2.39.5