Change the following static arrays sized by NR_CPUS to per_cpu data variables: i386_cpu cpu_devices[NR_CPUS]; (And change the struct name to x86_cpu.) Signed-off-by: Mike Travis Reviewed-by: Christoph Lameter --- arch/x86/kernel/topology.c | 8 ++++---- include/asm-x86/cpu.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) --- a/arch/x86/kernel/topology.c +++ b/arch/x86/kernel/topology.c @@ -31,7 +31,7 @@ #include #include -static struct i386_cpu cpu_devices[NR_CPUS]; +static DEFINE_PER_CPU(struct x86_cpu, cpu_devices); int __cpuinit arch_register_cpu(int num) { @@ -46,16 +46,16 @@ int __cpuinit arch_register_cpu(int num) */ #ifdef CONFIG_HOTPLUG_CPU if (num) - cpu_devices[num].cpu.hotpluggable = 1; + per_cpu(cpu_devices, num).cpu.hotpluggable = 1; #endif - return register_cpu(&cpu_devices[num].cpu, num); + return register_cpu(&per_cpu(cpu_devices, num).cpu, num); } #ifdef CONFIG_HOTPLUG_CPU void arch_unregister_cpu(int num) { - return unregister_cpu(&cpu_devices[num].cpu); + return unregister_cpu(&per_cpu(cpu_devices, num).cpu); } EXPORT_SYMBOL(arch_register_cpu); EXPORT_SYMBOL(arch_unregister_cpu); --- a/include/asm-x86/cpu.h +++ b/include/asm-x86/cpu.h @@ -7,7 +7,7 @@ #include #include -struct i386_cpu { +struct x86_cpu { struct cpu cpu; }; extern int arch_register_cpu(int num); -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/