diff options
| author | Jaswinder Singh Rajput <jaswinderrajput@gmail.com> | 2009-03-21 12:25:24 +0100 |
|---|---|---|
| committer | Jaswinder Singh Rajput <jaswinderrajput@gmail.com> | 2009-03-21 12:25:24 +0100 |
| commit | 271eb5c588e5d0a41eca6e118b6927af3f0f04b9 (patch) | |
| tree | 69780daca183d0cd9545bcb7c19bc4ffaf74da52 /arch/x86/kernel/topology.c | |
| parent | Merge branches 'x86/cleanups', 'x86/mm', 'x86/setup' and 'linus' into x86/core (diff) | |
| download | linux-271eb5c588e5d0a41eca6e118b6927af3f0f04b9.tar.xz linux-271eb5c588e5d0a41eca6e118b6927af3f0f04b9.zip | |
x86: topology.c cleanup
Impact: cleanup
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Diffstat (limited to 'arch/x86/kernel/topology.c')
| -rw-r--r-- | arch/x86/kernel/topology.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c index 0fcc95a354f7..7e4515957a1c 100644 --- a/arch/x86/kernel/topology.c +++ b/arch/x86/kernel/topology.c @@ -25,10 +25,10 @@ * * Send feedback to <colpatch@us.ibm.com> */ -#include <linux/init.h> -#include <linux/smp.h> #include <linux/nodemask.h> #include <linux/mmzone.h> +#include <linux/init.h> +#include <linux/smp.h> #include <asm/cpu.h> static DEFINE_PER_CPU(struct x86_cpu, cpu_devices); @@ -47,6 +47,7 @@ int __ref arch_register_cpu(int num) */ if (num) per_cpu(cpu_devices, num).cpu.hotpluggable = 1; + return register_cpu(&per_cpu(cpu_devices, num).cpu, num); } EXPORT_SYMBOL(arch_register_cpu); @@ -56,12 +57,13 @@ void arch_unregister_cpu(int num) unregister_cpu(&per_cpu(cpu_devices, num).cpu); } EXPORT_SYMBOL(arch_unregister_cpu); -#else +#else /* CONFIG_HOTPLUG_CPU */ + static int __init arch_register_cpu(int 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) { @@ -70,11 +72,11 @@ static int __init topology_init(void) #ifdef CONFIG_NUMA for_each_online_node(i) register_one_node(i); -#endif /* CONFIG_NUMA */ +#endif for_each_present_cpu(i) arch_register_cpu(i); + return 0; } - subsys_initcall(topology_init); |