]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[IA64] Clear up section mismatch with arch_unregister_cpu()
authorRobin Holt <holt@sgi.com>
Mon, 8 Dec 2008 14:43:46 +0000 (08:43 -0600)
committerTony Luck <tony.luck@intel.com>
Tue, 9 Dec 2008 18:08:44 +0000 (10:08 -0800)
The generic_defconfig has three section mismatches.  This clears
arch_unregister_cpu()

Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/kernel/topology.c

index 26228e2d01ae472bcab1e5917b0c973d826f6f3a..c75b914f2d6bb587c413990663e864f573c9368a 100644 (file)
@@ -53,10 +53,12 @@ int __ref arch_register_cpu(int num)
 }
 EXPORT_SYMBOL(arch_register_cpu);
 
-void arch_unregister_cpu(int num)
+void __ref arch_unregister_cpu(int num)
 {
        unregister_cpu(&sysfs_cpus[num].cpu);
+#ifdef CONFIG_ACPI
        unmap_cpu_from_node(num, cpu_to_node(num));
+#endif
 }
 EXPORT_SYMBOL(arch_unregister_cpu);
 #else