---

yaml --- r: 79750 b: refs/heads/master c: aaa64e0 h: refs/heads/master v: v3
git-mirror · Jan 30, 2008 · c60824c · c60824c
1 parent 7dbcffe
commit c60824c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af7a78e9258ffcca681e080cbc857f854869144f
+refs/heads/master: aaa64e04f9af8c05a10ab3d67df44154742d15cf
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
@@ -44,6 +44,7 @@
 #include <asm/smp.h>
 #include <asm/sections.h>
 #include <asm/kdebug.h>
+#include <asm/numa.h>
 
 #ifndef Dprintk
 #define Dprintk(x...)

diff --git a/trunk/include/asm-x86/numa_64.h b/trunk/include/asm-x86/numa_64.h
@@ -21,6 +21,12 @@ extern void srat_reserve_add_area(int nodeid);
 extern int hotadd_percent;
 
 extern unsigned char 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);
+
 #ifdef CONFIG_NUMA
 extern void __init init_cpu_to_node(void);
 

diff --git a/trunk/include/asm-x86/proto.h b/trunk/include/asm-x86/proto.h
@@ -37,9 +37,6 @@ extern u32 pmtmr_ioport;
 #endif
 extern int nohpet;
 
-extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn);
-extern unsigned long numa_free_all_bootmem(void);
-
 extern void reserve_bootmem_generic(unsigned long phys, unsigned len);
 
 extern void load_gs_index(unsigned gs);
@@ -52,8 +49,6 @@ extern void swap_low_mappings(void);
 
 extern void syscall32_cpu_init(void);
 
-extern void setup_node_bootmem(int nodeid, unsigned long start, unsigned long end);
-
 extern void check_efer(void);
 
 extern unsigned long table_start, table_end;