diff options
| author | Tejun Heo | 2011-05-02 14:18:52 +0200 |
|---|---|---|
| committer | Tejun Heo | 2011-05-02 14:18:52 +0200 |
| commit | 84914ed0ec6787d38e84b510f92ad4ca3a572fd8 (patch) | |
| tree | 0ff73a42ef3db03b33d11516c386ac2b72c44a38 /arch/x86/include/asm/apic.h | |
| parent | x86, NUMA: Unify 32/64bit numa_cpu_node() implementation (diff) | |
| download | kernel-qcow2-linux-84914ed0ec6787d38e84b510f92ad4ca3a572fd8.tar.gz kernel-qcow2-linux-84914ed0ec6787d38e84b510f92ad4ca3a572fd8.tar.xz kernel-qcow2-linux-84914ed0ec6787d38e84b510f92ad4ca3a572fd8.zip | |
x86-32, NUMA: Make apic->x86_32_numa_cpu_node() optional
NUMAQ is the only meaningful user of this callback and
setup_local_APIC() the only callsite. Stop torturing everyone else by
making the callback optional and removing all the boilerplate
implementations and assignments.
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/apic.h')
| -rw-r--r-- | arch/x86/include/asm/apic.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 2b7d573be549..a0c46f061210 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -363,7 +363,12 @@ struct apic { */ int (*x86_32_early_logical_apicid)(int cpu); - /* determine CPU -> NUMA node mapping */ + /* + * Optional method called from setup_local_APIC() after logical + * apicid is guaranteed to be known to initialize apicid -> node + * mapping if NUMA initialization hasn't done so already. Don't + * add new users. + */ int (*x86_32_numa_cpu_node)(int cpu); #endif }; @@ -537,8 +542,6 @@ static inline int default_phys_pkg_id(int cpuid_apic, int index_msb) return cpuid_apic >> index_msb; } -extern int default_x86_32_numa_cpu_node(int cpu); - #endif static inline unsigned int |