diff options
Diffstat (limited to 'arch/ia64/kernel/topology.c')
-rw-r--r-- | arch/ia64/kernel/topology.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index 42cb05bdc680..5737c9a061ef 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c | |||
@@ -30,12 +30,6 @@ static struct ia64_cpu *sysfs_cpus; | |||
30 | 30 | ||
31 | int arch_register_cpu(int num) | 31 | int arch_register_cpu(int num) |
32 | { | 32 | { |
33 | struct node *parent = NULL; | ||
34 | |||
35 | #ifdef CONFIG_NUMA | ||
36 | parent = &node_devices[cpu_to_node(num)]; | ||
37 | #endif /* CONFIG_NUMA */ | ||
38 | |||
39 | #if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU) | 33 | #if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU) |
40 | /* | 34 | /* |
41 | * If CPEI cannot be re-targetted, and this is | 35 | * If CPEI cannot be re-targetted, and this is |
@@ -45,21 +39,14 @@ int arch_register_cpu(int num) | |||
45 | sysfs_cpus[num].cpu.no_control = 1; | 39 | sysfs_cpus[num].cpu.no_control = 1; |
46 | #endif | 40 | #endif |
47 | 41 | ||
48 | return register_cpu(&sysfs_cpus[num].cpu, num, parent); | 42 | return register_cpu(&sysfs_cpus[num].cpu, num); |
49 | } | 43 | } |
50 | 44 | ||
51 | #ifdef CONFIG_HOTPLUG_CPU | 45 | #ifdef CONFIG_HOTPLUG_CPU |
52 | 46 | ||
53 | void arch_unregister_cpu(int num) | 47 | void arch_unregister_cpu(int num) |
54 | { | 48 | { |
55 | struct node *parent = NULL; | 49 | return unregister_cpu(&sysfs_cpus[num].cpu); |
56 | |||
57 | #ifdef CONFIG_NUMA | ||
58 | int node = cpu_to_node(num); | ||
59 | parent = &node_devices[node]; | ||
60 | #endif /* CONFIG_NUMA */ | ||
61 | |||
62 | return unregister_cpu(&sysfs_cpus[num].cpu, parent); | ||
63 | } | 50 | } |
64 | EXPORT_SYMBOL(arch_register_cpu); | 51 | EXPORT_SYMBOL(arch_register_cpu); |
65 | EXPORT_SYMBOL(arch_unregister_cpu); | 52 | EXPORT_SYMBOL(arch_unregister_cpu); |