[PATCH] x86: extend e820 ealy_res support 32bit - fix #2
- From: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
- Date: Sun, 25 May 2008 10:00:09 -0700
remove extra -1 in reseve_early calling
panic if can not find space for new RAMDISK
Signed-off-by: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
Index: linux-2.6/arch/x86/kernel/setup_32.c
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index 361e5c9..eed7121 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -479,7 +479,7 @@ static void __init reserve_initrd(void)
initrd_start = 0;
if (ramdisk_size >= end_of_lowmem/2) {
- free_early(ramdisk_image, ramdisk_image + ramdisk_size - 1);
+ free_early(ramdisk_image, ramdisk_end);
printk(KERN_ERR "initrd too large to handle, "
"disabling initrd\n");
return;
@@ -501,9 +501,13 @@ static void __init reserve_initrd(void)
end_of_lowmem, ramdisk_size,
PAGE_SIZE);
+ if (ramdisk_here == -1ULL)
+ panic("Cannot find place for new RAMDISK of size %lld\n",
+ ramdisk_size);
+
/* Note: this includes all the lowmem currently occupied by
the initrd, we rely on that fact to keep the data intact. */
- reserve_early(ramdisk_here, ramdisk_here + ramdisk_size - 1,
+ reserve_early(ramdisk_here, ramdisk_here + ramdisk_size,
"NEW RAMDISK");
initrd_start = ramdisk_here + PAGE_OFFSET;
initrd_end = initrd_start + ramdisk_size;
@@ -579,15 +583,15 @@ void __init setup_bootmem_allocator(void)
PAGE_SIZE);
if (bootmap == -1L)
panic("Cannot find bootmem map of size %ld\n", bootmap_size);
- reserve_early(bootmap, bootmap + bootmap_size - 1, "BOOTMAP");
+ reserve_early(bootmap, bootmap + bootmap_size, "BOOTMAP");
#ifdef CONFIG_BLK_DEV_INITRD
reserve_initrd();
#endif
bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, max_low_pfn);
printk(KERN_INFO " low ram: %08lx - %08lx\n",
min_low_pfn<<PAGE_SHIFT, max_low_pfn<<PAGE_SHIFT);
- printk(KERN_INFO " bootmap [%08lx - %08lx]\n",
- bootmap, bootmap + bootmap_size - 1);
+ printk(KERN_INFO " bootmap %08lx - %08lx\n",
+ bootmap, bootmap + bootmap_size);
register_bootmem_low_pages(max_low_pfn);
early_res_to_bootmem(0, max_low_pfn<<PAGE_SHIFT);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- [PATCH] x86: 32bit numa srat fix early_ioremap leak
- From: Yinghai Lu
- [PATCH] x86: extend e820 early_res support 32bit -fix #4
- From: Yinghai Lu
- [PATCH] x86: extend e820 early_res support 32bit -fix #5
- From: Yinghai Lu
- [PATCH] x86: extend e820 early_res support 32bit -fix #3
- From: Yinghai Lu
- Re: [PATCH] x86: extend e820 ealy_res support 32bit - fix #2
- From: Thomas Gleixner
- [PATCH] x86: 32bit numa srat fix early_ioremap leak
- References:
- [PATCH] x86: make e820.c to have common functions
- From: Yinghai Lu
- [PATCH] x86: extend e820 ealy_res support 32bit
- From: Yinghai Lu
- [PATCH] x86: extend e820 ealy_res support 32bit - fix
- From: Yinghai Lu
- [PATCH] x86: make e820.c to have common functions
- Prev by Date: Re: [PATCH] SERIAL: Simplify code using ARRAY_SIZE() macro.
- Next by Date: [PATCHv3 27/28] firmware: Add CONFIG_BUILTIN_FIRMWARE option
- Previous by thread: Re: [PATCH] x86: extend e820 ealy_res support 32bit - fix v2
- Next by thread: Re: [PATCH] x86: extend e820 ealy_res support 32bit - fix #2
- Index(es):
Relevant Pages
|
