From: "Jan Beulich" Subject: [PATCH] i386 linux: adjust kexec reservation Date: Thu, 06 Apr 2006 14:34:41 +0200 Message-ID: <44352701.76F0.0078.0@novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartE2C79EF1.0__=" Return-path: 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 This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartE2C79EF1.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Comparing arch/i386/kernel/setup{,-xen}.c, it seems like the place reserve_bootmem() is currently called in the Xen kernel is the result of a mis-merge. Jan --=__PartE2C79EF1.0__= Content-Type: text/plain; name="xenlinux-i386-kexec-reserve.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xenlinux-i386-kexec-reserve.patch" Index: head-2006-04-05/arch/i386/kernel/setup-xen.c =================================================================== --- head-2006-04-05.orig/arch/i386/kernel/setup-xen.c 2006-04-06 13:57:12.000000000 +0200 +++ head-2006-04-05/arch/i386/kernel/setup-xen.c 2006-04-06 14:02:35.000000000 +0200 @@ -1317,6 +1317,11 @@ void __init setup_bootmem_allocator(void } } #endif +#ifdef CONFIG_KEXEC + if (crashk_res.start != crashk_res.end) + reserve_bootmem(crashk_res.start, + crashk_res.end - crashk_res.start + 1); +#endif if (!xen_feature(XENFEAT_auto_translated_physmap)) phys_to_machine_mapping = @@ -1436,11 +1441,6 @@ legacy_init_iomem_resources(struct resou } } #endif -#ifdef CONFIG_KEXEC - if (crashk_res.start != crashk_res.end) - reserve_bootmem(crashk_res.start, - crashk_res.end - crashk_res.start + 1); -#endif } /* --=__PartE2C79EF1.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=__PartE2C79EF1.0__=--