aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup_64.c
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-03-18 15:51:22 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-19 13:19:54 -0400
commit2b8106a0a3d3c1e5b69f091192bc99019ff4d81d (patch)
tree22bffad7c1e75ab93b5cb5eb22ce5f0649820d81 /arch/x86/kernel/setup_64.c
parent4a3575fd436aa98957184afd745e4ada8f1542d8 (diff)
x86_64: do not reserve ramdisk two times
ramdisk is reserved via reserve_early in x86_64_start_kernel, later early_res_to_bootmem() will convert to reservation in bootmem. so don't need to reserve that again. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/setup_64.c')
-rw-r--r--arch/x86/kernel/setup_64.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 674ef3510cdf..0aa291bff4e0 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -420,11 +420,14 @@ void __init setup_arch(char **cmdline_p)
420 unsigned long end_of_mem = end_pfn << PAGE_SHIFT; 420 unsigned long end_of_mem = end_pfn << PAGE_SHIFT;
421 421
422 if (ramdisk_end <= end_of_mem) { 422 if (ramdisk_end <= end_of_mem) {
423 reserve_bootmem_generic(ramdisk_image, ramdisk_size); 423 /*
424 * don't need to reserve again, already reserved early
425 * in x86_64_start_kernel, and early_res_to_bootmem
426 * convert that to reserved in bootmem
427 */
424 initrd_start = ramdisk_image + PAGE_OFFSET; 428 initrd_start = ramdisk_image + PAGE_OFFSET;
425 initrd_end = initrd_start+ramdisk_size; 429 initrd_end = initrd_start+ramdisk_size;
426 } else { 430 } else {
427 /* Assumes everything on node 0 */
428 free_bootmem(ramdisk_image, ramdisk_size); 431 free_bootmem(ramdisk_image, ramdisk_size);
429 printk(KERN_ERR "initrd extends beyond end of memory " 432 printk(KERN_ERR "initrd extends beyond end of memory "
430 "(0x%08lx > 0x%08lx)\ndisabling initrd\n", 433 "(0x%08lx > 0x%08lx)\ndisabling initrd\n",