aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/init_32.c
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-22 05:46:58 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-08 06:50:16 -0400
commit225c37d71bc8b97eb2063e8eda153b383328b20b (patch)
tree912185a6db6753a62842966db180ebecfce32fc6 /arch/x86/mm/init_32.c
parentb2ac82a0909aea0d2620ba4c189f37c567c21fe5 (diff)
x86: introduce reserve_initrd
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/init_32.c')
-rw-r--r--arch/x86/mm/init_32.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 9bc8607d7980..98080782ee47 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -597,8 +597,6 @@ void __init zone_sizes_init(void)
597} 597}
598#endif /* !CONFIG_NEED_MULTIPLE_NODES */ 598#endif /* !CONFIG_NEED_MULTIPLE_NODES */
599 599
600extern void reserve_initrd(void);
601
602void __init setup_bootmem_allocator(void) 600void __init setup_bootmem_allocator(void)
603{ 601{
604 int i; 602 int i;
@@ -613,9 +611,9 @@ void __init setup_bootmem_allocator(void)
613 if (bootmap == -1L) 611 if (bootmap == -1L)
614 panic("Cannot find bootmem map of size %ld\n", bootmap_size); 612 panic("Cannot find bootmem map of size %ld\n", bootmap_size);
615 reserve_early(bootmap, bootmap + bootmap_size, "BOOTMAP"); 613 reserve_early(bootmap, bootmap + bootmap_size, "BOOTMAP");
616#ifdef CONFIG_BLK_DEV_INITRD 614
617 reserve_initrd(); 615 reserve_initrd();
618#endif 616
619 bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, max_low_pfn); 617 bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, max_low_pfn);
620 printk(KERN_INFO " mapped low ram: 0 - %08lx\n", 618 printk(KERN_INFO " mapped low ram: 0 - %08lx\n",
621 max_pfn_mapped<<PAGE_SHIFT); 619 max_pfn_mapped<<PAGE_SHIFT);