diff options
| -rw-r--r-- | arch/x86/include/asm/numa.h | 2 | ||||
| -rw-r--r-- | arch/x86/mm/numa.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/include/asm/numa.h b/arch/x86/include/asm/numa.h index 74540865dd83..bfacd2ccf651 100644 --- a/arch/x86/include/asm/numa.h +++ b/arch/x86/include/asm/numa.h | |||
| @@ -61,14 +61,12 @@ static inline int numa_cpu_node(int cpu) | |||
| 61 | #ifdef CONFIG_NUMA | 61 | #ifdef CONFIG_NUMA |
| 62 | extern void __cpuinit numa_set_node(int cpu, int node); | 62 | extern void __cpuinit numa_set_node(int cpu, int node); |
| 63 | extern void __cpuinit numa_clear_node(int cpu); | 63 | extern void __cpuinit numa_clear_node(int cpu); |
| 64 | extern void __init numa_init_array(void); | ||
| 65 | extern void __init init_cpu_to_node(void); | 64 | extern void __init init_cpu_to_node(void); |
| 66 | extern void __cpuinit numa_add_cpu(int cpu); | 65 | extern void __cpuinit numa_add_cpu(int cpu); |
| 67 | extern void __cpuinit numa_remove_cpu(int cpu); | 66 | extern void __cpuinit numa_remove_cpu(int cpu); |
| 68 | #else /* CONFIG_NUMA */ | 67 | #else /* CONFIG_NUMA */ |
| 69 | static inline void numa_set_node(int cpu, int node) { } | 68 | static inline void numa_set_node(int cpu, int node) { } |
| 70 | static inline void numa_clear_node(int cpu) { } | 69 | static inline void numa_clear_node(int cpu) { } |
| 71 | static inline void numa_init_array(void) { } | ||
| 72 | static inline void init_cpu_to_node(void) { } | 70 | static inline void init_cpu_to_node(void) { } |
| 73 | static inline void numa_add_cpu(int cpu) { } | 71 | static inline void numa_add_cpu(int cpu) { } |
| 74 | static inline void numa_remove_cpu(int cpu) { } | 72 | static inline void numa_remove_cpu(int cpu) { } |
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 56ed714ed24f..ecb5685d7d20 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c | |||
| @@ -535,7 +535,7 @@ static int __init numa_register_memblks(struct numa_meminfo *mi) | |||
| 535 | * as the number of CPUs is not known yet. We round robin the existing | 535 | * as the number of CPUs is not known yet. We round robin the existing |
| 536 | * nodes. | 536 | * nodes. |
| 537 | */ | 537 | */ |
| 538 | void __init numa_init_array(void) | 538 | static void __init numa_init_array(void) |
| 539 | { | 539 | { |
| 540 | int rr, i; | 540 | int rr, i; |
| 541 | 541 | ||
