leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: change NR_CPUS arrays in topology

Browse Source 
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>
This commit is contained in:
travis@sgi.com 2008-01-30 13:33:11 +01:00 committed by Ingo Molnar
parent 24b0d22b7b
commit 30964d54e9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/topology.c
View File

@ -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);

2
include/asm-x86/cpu.h
View File

@ -7,7 +7,7 @@
#include <linux/nodemask.h>
#include <linux/percpu.h>
struct i386_cpu {
struct x86_cpu {
struct cpu cpu;
};
extern int arch_register_cpu(int num);