summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/numa_32.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-05-02 14:18:52 +0200
committerTejun Heo <tj@kernel.org>2011-05-02 14:18:52 +0200
commit6bd262731bf7559bab8c749786e8652e2df1fb4e (patch)
tree64f3dccdda9175a2f2694a5d554779b8af5f035a /arch/x86/include/asm/numa_32.h
parentc4b90c11992e61123071977c0e5556e59a70852c (diff)
x86, NUMA: Unify 32/64bit numa_cpu_node() implementation
Currently, the only meaningful user of apic->x86_32_numa_cpu_node() is NUMAQ which returns valid mapping only after CPU is initialized during SMP bringup; thus, the previous patch to set apicid -> node in setup_local_APIC() makes __apicid_to_node[] always contain the correct mapping whether custom apic->x86_32_numa_cpu_node() is used or not. So, there is no reason to keep separate 32bit implementation. We can always consult __apicid_to_node[]. Move 64bit implementation from numa_64.c to numa.c and remove 32bit implementation from numa_32.c. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "H. Peter Anvin" <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm/numa_32.h')
-rw-r--r--arch/x86/include/asm/numa_32.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/include/asm/numa_32.h b/arch/x86/include/asm/numa_32.h
index c6beed1ef10..242522fe9f8 100644
--- a/arch/x86/include/asm/numa_32.h
+++ b/arch/x86/include/asm/numa_32.h
@@ -5,12 +5,6 @@ extern int numa_off;
extern int pxm_to_nid(int pxm);
-#ifdef CONFIG_NUMA
-extern int __cpuinit numa_cpu_node(int cpu);
-#else /* CONFIG_NUMA */
-static inline int numa_cpu_node(int cpu) { return NUMA_NO_NODE; }
-#endif /* CONFIG_NUMA */
-
#ifdef CONFIG_HIGHMEM
extern void set_highmem_pages_init(void);
#else