From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755503AbYAPRLH (ORCPT ); Wed, 16 Jan 2008 12:11:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755914AbYAPRJL (ORCPT ); Wed, 16 Jan 2008 12:09:11 -0500 Received: from relay2.sgi.com ([192.48.171.30]:41402 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755876AbYAPRJE (ORCPT ); Wed, 16 Jan 2008 12:09:04 -0500 Message-Id: <20080116170902.857097000@sgi.com> References: <20080116170902.006151000@sgi.com> User-Agent: quilt/0.46-1 Date: Wed, 16 Jan 2008 09:09:08 -0800 From: travis@sgi.com To: Andrew Morton , Andi Kleen , mingo@elte.hu Cc: Eric Dumazet , Christoph Lameter , Jack Steiner , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/10] x86: Change NR_CPUS arrays in topology V3 Content-Disposition: inline; filename=NR_CPUS-arrays-in-topology Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- V1->V2: - (none) --- 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); --