diff options
| author | Tejun Heo <tj@kernel.org> | 2009-10-29 16:34:14 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-10-29 16:34:14 +0300 |
| commit | 877105cc49f6e6ad32e3d63a214e8f537c0339ef (patch) | |
| tree | 29245558dc6a7face0d891c4a4f0302619cc6cd0 /arch/ia64/kernel/relocate_kernel.S | |
| parent | 6b7487fc6517736a6e32ccc0f8b46109c1b998ec (diff) | |
| download | linux-877105cc49f6e6ad32e3d63a214e8f537c0339ef.tar.xz | |
percpu: make percpu symbols in ia64 unique
This patch updates percpu related symbols in ia64 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/ia64/kernel/setup.c: s/cpu_info/ia64_cpu_info/
Partly based on Rusty Russell's "alloc_percpu: rename percpu vars
which cause name clashes" patch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org
Diffstat (limited to 'arch/ia64/kernel/relocate_kernel.S')
| -rw-r--r-- | arch/ia64/kernel/relocate_kernel.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/relocate_kernel.S b/arch/ia64/kernel/relocate_kernel.S index 32f6fc131fbe..c370e02f0061 100644 --- a/arch/ia64/kernel/relocate_kernel.S +++ b/arch/ia64/kernel/relocate_kernel.S @@ -61,7 +61,7 @@ GLOBAL_ENTRY(relocate_new_kernel) // purge all TC entries #define O(member) IA64_CPUINFO_##member##_OFFSET - GET_THIS_PADDR(r2, cpu_info) // load phys addr of cpu_info into r2 + GET_THIS_PADDR(r2, ia64_cpu_info) // load phys addr of cpu_info into r2 ;; addl r17=O(PTCE_STRIDE),r2 addl r2=O(PTCE_BASE),r2 |