Browse Source

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>
Thomas Gleixner 17 years ago
parent
commit
aaa64e04f9
3 changed files with 7 additions and 5 deletions
  1. 1 0
      arch/x86/mm/init_64.c
  2. 6 0
      include/asm-x86/numa_64.h
  3. 0 5
      include/asm-x86/proto.h

+ 1 - 0
arch/x86/mm/init_64.c

@@ -44,6 +44,7 @@
 #include <asm/smp.h>
 #include <asm/smp.h>
 #include <asm/sections.h>
 #include <asm/sections.h>
 #include <asm/kdebug.h>
 #include <asm/kdebug.h>
+#include <asm/numa.h>
 
 
 #ifndef Dprintk
 #ifndef Dprintk
 #define Dprintk(x...)
 #define Dprintk(x...)

+ 6 - 0
include/asm-x86/numa_64.h

@@ -21,6 +21,12 @@ extern void srat_reserve_add_area(int nodeid);
 extern int hotadd_percent;
 extern int hotadd_percent;
 
 
 extern unsigned char apicid_to_node[MAX_LOCAL_APIC];
 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
 #ifdef CONFIG_NUMA
 extern void __init init_cpu_to_node(void);
 extern void __init init_cpu_to_node(void);
 
 

+ 0 - 5
include/asm-x86/proto.h

@@ -37,9 +37,6 @@ extern u32 pmtmr_ioport;
 #endif
 #endif
 extern int nohpet;
 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 reserve_bootmem_generic(unsigned long phys, unsigned len);
 
 
 extern void load_gs_index(unsigned gs);
 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 syscall32_cpu_init(void);
 
 
-extern void setup_node_bootmem(int nodeid, unsigned long start, unsigned long end);
-
 extern void check_efer(void);
 extern void check_efer(void);
 
 
 extern unsigned long table_start, table_end;
 extern unsigned long table_start, table_end;