Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30964d54 authored by travis@sgi.com's avatar travis@sgi.com Committed by Ingo Molnar
Browse files

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: default avatarMike Travis <travis@sgi.com>
Reviewed-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 24b0d22b

arch/x86/kernel/topology.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

include/asm-x86/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -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);