aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/mm/init_64.c1
-rw-r--r--include/asm-x86/numa_64.h6
-rw-r--r--include/asm-x86/proto.h5
3 files changed, 7 insertions, 5 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 9677abb6cf8a..0fbb657a8b19 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -44,6 +44,7 @@
44#include <asm/smp.h> 44#include <asm/smp.h>
45#include <asm/sections.h> 45#include <asm/sections.h>
46#include <asm/kdebug.h> 46#include <asm/kdebug.h>
47#include <asm/numa.h>
47 48
48#ifndef Dprintk 49#ifndef Dprintk
49#define Dprintk(x...) 50#define Dprintk(x...)
diff --git a/include/asm-x86/numa_64.h b/include/asm-x86/numa_64.h
index 0cc5c97a7fc9..e6bc0b5dfe3a 100644
--- 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);
21extern int hotadd_percent; 21extern int hotadd_percent;
22 22
23extern unsigned char apicid_to_node[MAX_LOCAL_APIC]; 23extern unsigned char apicid_to_node[MAX_LOCAL_APIC];
24
25extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn);
26extern unsigned long numa_free_all_bootmem(void);
27extern void setup_node_bootmem(int nodeid, unsigned long start,
28 unsigned long end);
29
24#ifdef CONFIG_NUMA 30#ifdef CONFIG_NUMA
25extern void __init init_cpu_to_node(void); 31extern void __init init_cpu_to_node(void);
26 32
diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index 02420dea73c6..71a419c6e041 100644
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -37,9 +37,6 @@ extern u32 pmtmr_ioport;
37#endif 37#endif
38extern int nohpet; 38extern int nohpet;
39 39
40extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn);
41extern unsigned long numa_free_all_bootmem(void);
42
43extern void reserve_bootmem_generic(unsigned long phys, unsigned len); 40extern void reserve_bootmem_generic(unsigned long phys, unsigned len);
44 41
45extern void load_gs_index(unsigned gs); 42extern void load_gs_index(unsigned gs);
@@ -52,8 +49,6 @@ extern void swap_low_mappings(void);
52 49
53extern void syscall32_cpu_init(void); 50extern void syscall32_cpu_init(void);
54 51
55extern void setup_node_bootmem(int nodeid, unsigned long start, unsigned long end);
56
57extern void check_efer(void); 52extern void check_efer(void);
58 53
59extern unsigned long table_start, table_end; 54extern unsigned long table_start, table_end;