From 30964d54e94229f567a7312a0e6666f9deb6a488 Mon Sep 17 00:00:00 2001 From: "travis@sgi.com" <travis@sgi.com> Date: Wed, 30 Jan 2008 13:33:11 +0100 Subject: x86: change NR_CPUS arrays in topology 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 <travis@sgi.com> Reviewed-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- arch/x86/kernel/topology.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'arch/x86/kernel/topology.c') diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c index 7e16d675eb85..a0d1719bda79 100644 --- a/arch/x86/kernel/topology.c +++ b/arch/x86/kernel/topology.c @@ -31,7 +31,7 @@ #include <linux/mmzone.h> #include <asm/cpu.h> -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); -- cgit v1.2.3