From 95a15bae077c8d88077e0c38f68b0f3c616ca15d Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Sun, 22 Jun 2008 02:44:49 -0700
Subject: [PATCH] --- yaml --- r: 99875 b: refs/heads/master c:
 1f75d7e32ed47b2ab8570771a2ce8c707a7225a2 h: refs/heads/master i:   99873:
 d5f29abe670d6847c63632bb8b8fdf6744f050aa   99871:
 a27bf7f91fd566040ca04f7200aea33a1df952a6 v: v3

---
 [refs]                          |  2 +-
 trunk/arch/x86/mm/init_64.c     | 16 ++++++++++++++++
 trunk/arch/x86/mm/numa_64.c     |  2 +-
 trunk/include/asm-x86/numa_64.h |  1 -
 trunk/include/asm-x86/page_64.h |  1 +
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6790672fe24e..13ac23530ea7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17b4cceb1feb2a8865ce47064dd3bd446063a5d5
+refs/heads/master: 1f75d7e32ed47b2ab8570771a2ce8c707a7225a2
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
index 97c2bc741e94..99a091ee5a6a 100644
--- a/trunk/arch/x86/mm/init_64.c
+++ b/trunk/arch/x86/mm/init_64.c
@@ -611,6 +611,22 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, unsigned lon
 }
 
 #ifndef CONFIG_NUMA
+void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn)
+{
+	unsigned long bootmap_size, bootmap;
+
+	bootmap_size = bootmem_bootmap_pages(end_pfn)<<PAGE_SHIFT;
+	bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT, bootmap_size,
+				 PAGE_SIZE);
+	if (bootmap == -1L)
+		panic("Cannot find bootmem map of size %ld\n", bootmap_size);
+	bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, end_pfn);
+	e820_register_active_regions(0, start_pfn, end_pfn);
+	free_bootmem_with_active_regions(0, end_pfn);
+	early_res_to_bootmem(0, end_pfn<<PAGE_SHIFT);
+	reserve_bootmem(bootmap, bootmap_size, BOOTMEM_DEFAULT);
+}
+
 void __init paging_init(void)
 {
 	unsigned long max_zone_pfns[MAX_NR_ZONES];
diff --git a/trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c
index c4557e25f60c..316e5f961ef0 100644
--- a/trunk/arch/x86/mm/numa_64.c
+++ b/trunk/arch/x86/mm/numa_64.c
@@ -514,7 +514,7 @@ static int __init numa_emulation(unsigned long start_pfn, unsigned long last_pfn
 }
 #endif /* CONFIG_NUMA_EMU */
 
-void __init numa_initmem_init(unsigned long start_pfn, unsigned long last_pfn)
+void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn)
 {
 	int i;
 
diff --git a/trunk/include/asm-x86/numa_64.h b/trunk/include/asm-x86/numa_64.h
index b510daf4f4d8..3830094434a9 100644
--- a/trunk/include/asm-x86/numa_64.h
+++ b/trunk/include/asm-x86/numa_64.h
@@ -22,7 +22,6 @@ extern int hotadd_percent;
 
 extern s16 apicid_to_node[MAX_LOCAL_APIC];
 
-extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn);
 extern unsigned long numa_free_all_bootmem(void);
 extern void setup_node_bootmem(int nodeid, unsigned long start,
 			       unsigned long end);
diff --git a/trunk/include/asm-x86/page_64.h b/trunk/include/asm-x86/page_64.h
index 6ea72859c491..ac37643078e7 100644
--- a/trunk/include/asm-x86/page_64.h
+++ b/trunk/include/asm-x86/page_64.h
@@ -83,6 +83,7 @@ typedef struct { pteval_t pte; } pte_t;
 extern unsigned long init_memory_mapping(unsigned long start,
 					 unsigned long end);
 
+extern void initmem_init(unsigned long start_pfn, unsigned long end_pfn);
 #endif	/* !__ASSEMBLY__ */
 
 #ifdef CONFIG_FLATMEM