diff options
author | Tejun Heo <tj@kernel.org> | 2009-10-29 09:34:14 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-10-29 09:34:14 -0400 |
commit | 6b7487fc6517736a6e32ccc0f8b46109c1b998ec (patch) | |
tree | 540f8dade4e4e78c867779ce612cefae40966209 /arch/powerpc/kernel/smp.c | |
parent | 0fe1e009541e925adc1748a605d8b66188e4b2ab (diff) |
percpu: make percpu symbols in powerpc unique
This patch updates percpu related symbols in powerpc such that percpu
symbols are unique and don't clash with local symbols. This serves
two purposes of decreasing the possibility of global percpu symbol
collision and allowing dropping per_cpu__ prefix from percpu symbols.
* arch/powerpc/kernel/perf_callchain.c: s/callchain/cpu_perf_callchain/
* arch/powerpc/kernel/setup-common.c: s/pvr/cpu_pvr/
* arch/powerpc/platforms/pseries/dtl.c: s/dtl/cpu_dtl/
* arch/powerpc/platforms/cell/interrupt.c: s/iic/cpu_iic/
Partly based on Rusty Russell's "alloc_percpu: rename percpu vars
which cause name clashes" patch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@ozlabs.org
Diffstat (limited to 'arch/powerpc/kernel/smp.c')
-rw-r--r-- | arch/powerpc/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index 9b86a74d2815..2ebb48410976 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c | |||
@@ -232,7 +232,7 @@ struct thread_info *current_set[NR_CPUS]; | |||
232 | 232 | ||
233 | static void __devinit smp_store_cpu_info(int id) | 233 | static void __devinit smp_store_cpu_info(int id) |
234 | { | 234 | { |
235 | per_cpu(pvr, id) = mfspr(SPRN_PVR); | 235 | per_cpu(cpu_pvr, id) = mfspr(SPRN_PVR); |
236 | } | 236 | } |
237 | 237 | ||
238 | static void __init smp_create_idle(unsigned int cpu) | 238 | static void __init smp_create_idle(unsigned int cpu) |