From: Robin Holt <holt@sgi.com>
Date: Mon, 8 Dec 2008 14:43:46 +0000 (-0600)
Subject: [IA64] Clear up section mismatch with arch_unregister_cpu()
X-Git-Tag: Ubuntu-5.2.0-15.16~31823^2~3
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8704ad8552c5954b2cd9b3c76b4c50471049ad7f;p=mirror_ubuntu-eoan-kernel.git

[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>
---

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