|
@@ -36,9 +36,11 @@ void arch_fix_phys_package_id(int num, u32 slot)
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(arch_fix_phys_package_id);
|
|
|
|
|
|
-int arch_register_cpu(int num)
|
|
|
+
|
|
|
+#ifdef CONFIG_HOTPLUG_CPU
|
|
|
+int __ref arch_register_cpu(int num)
|
|
|
{
|
|
|
-#if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU)
|
|
|
+#ifdef CONFIG_ACPI
|
|
|
/*
|
|
|
* If CPEI can be re-targetted or if this is not
|
|
|
* CPEI target, then it is hotpluggable
|
|
@@ -47,19 +49,21 @@ int arch_register_cpu(int num)
|
|
|
sysfs_cpus[num].cpu.hotpluggable = 1;
|
|
|
map_cpu_to_node(num, node_cpuid[num].nid);
|
|
|
#endif
|
|
|
-
|
|
|
return register_cpu(&sysfs_cpus[num].cpu, num);
|
|
|
}
|
|
|
-
|
|
|
-#ifdef CONFIG_HOTPLUG_CPU
|
|
|
+EXPORT_SYMBOL(arch_register_cpu);
|
|
|
|
|
|
void arch_unregister_cpu(int num)
|
|
|
{
|
|
|
unregister_cpu(&sysfs_cpus[num].cpu);
|
|
|
unmap_cpu_from_node(num, cpu_to_node(num));
|
|
|
}
|
|
|
-EXPORT_SYMBOL(arch_register_cpu);
|
|
|
EXPORT_SYMBOL(arch_unregister_cpu);
|
|
|
+#else
|
|
|
+static int __init arch_register_cpu(int num)
|
|
|
+{
|
|
|
+ return register_cpu(&sysfs_cpus[num].cpu, num);
|
|
|
+}
|
|
|
#endif /*CONFIG_HOTPLUG_CPU*/
|
|
|
|
|
|
|