From f8c63c3cdeb5e5ea9c1964ad6a7a955c385ecd81 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 2 May 2011 17:24:48 +0200 Subject: [PATCH] --- yaml --- r: 245715 b: refs/heads/master c: 752d4f372f90a2f6eb562aaffb639957890cbcab h: refs/heads/master i: 245713: 4cc6b98c32fc7ade8cdb6b855688128476276e6e 245711: 42c0f5743a5d5d36244473804ed8f85287e20f66 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/numa.h | 2 -- trunk/arch/x86/mm/numa.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 605f27298fad..6e39c055b907 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd6709a91a593d8fe35d08da542e9f93bb74a304 +refs/heads/master: 752d4f372f90a2f6eb562aaffb639957890cbcab diff --git a/trunk/arch/x86/include/asm/numa.h b/trunk/arch/x86/include/asm/numa.h index 74540865dd83..bfacd2ccf651 100644 --- a/trunk/arch/x86/include/asm/numa.h +++ b/trunk/arch/x86/include/asm/numa.h @@ -61,14 +61,12 @@ static inline int numa_cpu_node(int cpu) #ifdef CONFIG_NUMA extern void __cpuinit numa_set_node(int cpu, int node); extern void __cpuinit numa_clear_node(int cpu); -extern void __init numa_init_array(void); extern void __init init_cpu_to_node(void); extern void __cpuinit numa_add_cpu(int cpu); extern void __cpuinit numa_remove_cpu(int cpu); #else /* CONFIG_NUMA */ static inline void numa_set_node(int cpu, int node) { } static inline void numa_clear_node(int cpu) { } -static inline void numa_init_array(void) { } static inline void init_cpu_to_node(void) { } static inline void numa_add_cpu(int cpu) { } static inline void numa_remove_cpu(int cpu) { } diff --git a/trunk/arch/x86/mm/numa.c b/trunk/arch/x86/mm/numa.c index 56ed714ed24f..ecb5685d7d20 100644 --- a/trunk/arch/x86/mm/numa.c +++ b/trunk/arch/x86/mm/numa.c @@ -535,7 +535,7 @@ static int __init numa_register_memblks(struct numa_meminfo *mi) * as the number of CPUs is not known yet. We round robin the existing * nodes. */ -void __init numa_init_array(void) +static void __init numa_init_array(void) { int rr, i;