luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: topology.c cleanup

Browse Source 
Impact: cleanup

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
This commit is contained in:
Jaswinder Singh Rajput 2009-03-21 16:55:24 +05:30
parent 7f00a2495b
commit 271eb5c588
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,10 +25,10 @@
* *
* Send feedback to <colpatch@us.ibm.com> * Send feedback to <colpatch@us.ibm.com>
*/ */
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/nodemask.h> #include <linux/nodemask.h>
#include <linux/mmzone.h> #include <linux/mmzone.h>
#include <linux/init.h>
#include <linux/smp.h>
#include <asm/cpu.h> #include <asm/cpu.h>
static DEFINE_PER_CPU(struct x86_cpu, cpu_devices); static DEFINE_PER_CPU(struct x86_cpu, cpu_devices);
@ -47,6 +47,7 @@ int __ref arch_register_cpu(int num)
*/ */
if (num) if (num)
per_cpu(cpu_devices, num).cpu.hotpluggable = 1; per_cpu(cpu_devices, num).cpu.hotpluggable = 1;
return register_cpu(&per_cpu(cpu_devices, num).cpu, num); return register_cpu(&per_cpu(cpu_devices, num).cpu, num);
} }
EXPORT_SYMBOL(arch_register_cpu); EXPORT_SYMBOL(arch_register_cpu);
@ -56,12 +57,13 @@ void arch_unregister_cpu(int num)
unregister_cpu(&per_cpu(cpu_devices, num).cpu); unregister_cpu(&per_cpu(cpu_devices, num).cpu);
} }
EXPORT_SYMBOL(arch_unregister_cpu); EXPORT_SYMBOL(arch_unregister_cpu);
#else #else /* CONFIG_HOTPLUG_CPU */
static int __init arch_register_cpu(int num) static int __init arch_register_cpu(int num)
{ {
return register_cpu(&per_cpu(cpu_devices, num).cpu, num); return register_cpu(&per_cpu(cpu_devices, num).cpu, num);
} }
#endif /*CONFIG_HOTPLUG_CPU*/ #endif /* CONFIG_HOTPLUG_CPU */
static int __init topology_init(void) static int __init topology_init(void)
{ {
@ -70,11 +72,11 @@ static int __init topology_init(void)
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
for_each_online_node(i) for_each_online_node(i)
register_one_node(i); register_one_node(i);
#endif /* CONFIG_NUMA */ #endif
for_each_present_cpu(i) for_each_present_cpu(i)
arch_register_cpu(i); arch_register_cpu(i);
return 0; return 0;
} }
subsys_initcall(topology_init); subsys_initcall(topology_init);