x86: move numa related declarations

More stuff shuffeled to the correct place

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 9677abb6cf8a2b28433ac939a32b40b9719a4089..0fbb657a8b19171c931b2234c5fe0c2d94af2a5d 100644 (file)
--- a/arch/x86/mm/init_64.c
+++ b/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/include/asm-x86/numa_64.h b/include/asm-x86/numa_64.h
index 0cc5c97a7fc91f1555c5082d9bc28cbbc3922fbb..e6bc0b5dfe3a19715453cd6ae230f6f6cf7dd61a 100644 (file)
--- a/include/asm-x86/numa_64.h
+++ b/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/include/asm-x86/proto.h b/include/asm-x86/proto.h
index 02420dea73c6315101bce016af68a569e3726459..71a419c6e0417050e365700338076538629b8489 100644 (file)
--- a/include/asm-x86/proto.h
+++ b/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;