diff options
| author | Tejun Heo <tj@kernel.org> | 2009-10-29 22:34:14 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-10-29 22:34:14 +0900 |
| commit | 877105cc49f6e6ad32e3d63a214e8f537c0339ef (patch) | |
| tree | 29245558dc6a7face0d891c4a4f0302619cc6cd0 /arch/ia64/mm | |
| parent | 6b7487fc6517736a6e32ccc0f8b46109c1b998ec (diff) | |
| download | linux-877105cc49f6e6ad32e3d63a214e8f537c0339ef.tar.gz linux-877105cc49f6e6ad32e3d63a214e8f537c0339ef.tar.bz2 linux-877105cc49f6e6ad32e3d63a214e8f537c0339ef.zip | |
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/mm')
| -rw-r--r-- | arch/ia64/mm/discontig.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index 40e4c1fbf76b..19c4b2195dce 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c @@ -450,7 +450,8 @@ static void __init initialize_pernode_data(void) /* Set the node_data pointer for each per-cpu struct */ for_each_possible_early_cpu(cpu) { node = node_cpuid[cpu].nid; - per_cpu(cpu_info, cpu).node_data = mem_data[node].node_data; + per_cpu(ia64_cpu_info, cpu).node_data = + mem_data[node].node_data; } #else { @@ -458,7 +459,7 @@ static void __init initialize_pernode_data(void) cpu = 0; node = node_cpuid[cpu].nid; cpu0_cpu_info = (struct cpuinfo_ia64 *)(__phys_per_cpu_start + - ((char *)&per_cpu__cpu_info - __per_cpu_start)); + ((char *)&per_cpu__ia64_cpu_info - __per_cpu_start)); cpu0_cpu_info->node_data = mem_data[node].node_data; } #endif /* CONFIG_SMP */ |