X-Git-Url: http://bbs.cooldavid.org/git/?a=blobdiff_plain;f=arch%2Fx86%2Fmm%2Finit_64.c;h=53158b7e5d4659f5888c5352a8d5e65ac9024c8c;hb=08677214;hp=a15abaae5ba41d3e4614eb4a98d1b581dc0cfc56;hpb=c252a5bb1f57afb1e336d68085217727ca7b2134;p=net-next-2.6.git

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index a15abaae5ba..53158b7e5d4 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -572,6 +572,7 @@ kernel_physical_mapping_init(unsigned long start,
 void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn,
 				int acpi, int k8)
 {
+#ifndef CONFIG_NO_BOOTMEM
 	unsigned long bootmap_size, bootmap;
 
 	bootmap_size = bootmem_bootmap_pages(end_pfn)<<PAGE_SHIFT;
@@ -585,6 +586,9 @@ void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn,
 					 0, end_pfn);
 	e820_register_active_regions(0, start_pfn, end_pfn);
 	free_bootmem_with_active_regions(0, end_pfn);
+#else
+	e820_register_active_regions(0, start_pfn, end_pfn);
+#endif
 }
 #endif