summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorRobin Holt <holt@sgi.com>2008-12-08 08:43:46 -0600
committerTony Luck <tony.luck@intel.com>2008-12-09 10:08:44 -0800
commit8704ad8552c5954b2cd9b3c76b4c50471049ad7f (patch)
treec042115d091c2d191632e709c32e9c069726370d /arch/ia64
parent6882edc04f37691ff9c7fcb30b52506cd7697eb0 (diff)
downloadtalos-obmc-linux-8704ad8552c5954b2cd9b3c76b4c50471049ad7f.tar.gz
talos-obmc-linux-8704ad8552c5954b2cd9b3c76b4c50471049ad7f.zip
[IA64] Clear up section mismatch with arch_unregister_cpu()
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>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/topology.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 26228e2d01ae..c75b914f2d6b 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -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
OpenPOWER on IntegriCloud