aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/mm/init_32.c
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-22 02:46:58 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-08 12:50:16 +0200
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 9bc8607d798..98080782ee4 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)
}
#endif /* !CONFIG_NEED_MULTIPLE_NODES */
-extern void reserve_initrd(void);
-
void __init setup_bootmem_allocator(void)
{
int i;
@@ -613,9 +611,9 @@ void __init setup_bootmem_allocator(void)
if (bootmap == -1L)
panic("Cannot find bootmem map of size %ld\n", bootmap_size);
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 " mapped low ram: 0 - %08lx\n",
max_pfn_mapped<<PAGE_SHIFT);