From: Vivek Goyal Date: Sat, 25 Jun 2005 21:57:51 +0000 (-0700) Subject: [PATCH] kexec: reserve Bootmem fix for booting nondefault location kernel X-Git-Tag: v2.6.13-rc1~68^2~119 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8a9190853c34289d9181acd9c620c76143bf88ca;p=linux-2.6-omap-h63xx.git [PATCH] kexec: reserve Bootmem fix for booting nondefault location kernel This patch fixes a problem with reserving memory during boot up of a kernel built for non-default location. Currently boot memory allocator reserves the memory required by kernel image, boot allocaotor bitmap etc. It assumes that kernel is loaded at 1MB (HIGH_MEMORY hard coded to 1024*1024). But kernel can be built for non-default locatoin, hence existing hardcoding will lead to reserving unnecessary memory. This patch fixes it. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index f1ad9fdeaad..6337157f5df 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c @@ -1124,8 +1124,8 @@ void __init setup_bootmem_allocator(void) * the (very unlikely) case of us accidentally initializing the * bootmem allocator with an invalid RAM area. */ - reserve_bootmem(HIGH_MEMORY, (PFN_PHYS(min_low_pfn) + - bootmap_size + PAGE_SIZE-1) - (HIGH_MEMORY)); + reserve_bootmem(__PHYSICAL_START, (PFN_PHYS(min_low_pfn) + + bootmap_size + PAGE_SIZE-1) - (__PHYSICAL_START)); /* * reserve physical page 0 - it's a special BIOS page on many boxes,