From: "Jan Beulich" Subject: [PATCH] linux/x86-64: Reduce delta to native setup code Date: Thu, 06 Dec 2007 15:47:27 +0000 Message-ID: <4758279F.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org .. 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 Index: head-2007-11-30/arch/x86_64/kernel/setup-xen.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 =3D 0; =20 copy_edid(); - saved_video_mode =3D SAVED_VIDEO_MODE; - bootloader_type =3D LOADER_TYPE; - -#ifdef CONFIG_BLK_DEV_RAM - rd_image_start =3D RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK; - rd_prompt =3D ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) !=3D 0); - rd_doload =3D ((RAMDISK_FLAGS & RAMDISK_LOAD_FLAG) !=3D 0); - - -#endif =20 HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_writable_pagetables); @@ -322,6 +312,7 @@ void __init setup_arch(char **cmdline_p) ROOT_DEV =3D old_decode_dev(ORIG_ROOT_DEV); screen_info =3D SCREEN_INFO; edid_info =3D EDID_INFO; +#endif /* !CONFIG_XEN */ saved_video_mode =3D SAVED_VIDEO_MODE; bootloader_type =3D LOADER_TYPE; =20 @@ -330,7 +331,6 @@ void __init setup_arch(char **cmdline_p) rd_prompt =3D ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) !=3D 0); rd_doload =3D ((RAMDISK_FLAGS & RAMDISK_LOAD_FLAG) !=3D 0); #endif -#endif /* !CONFIG_XEN */ setup_memory_region(); copy_edd(); =20