[ARM] 5557/1: Discard some ARM.ex*.*exit.text sections when !HOTPLUG or !HOTPLUG_CPU

Not discarding these sections when hotplug isn't available prevents the
kernel from building.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index 6c0779792546d5c58d4ab722d4b3e037022a1ffa..4340bf3d2c84a8feae21eea058283f143640a698 100644 (file)
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -84,6 +84,14 @@ SECTIONS
                *(.exitcall.exit)
                *(.ARM.exidx.exit.text)
                *(.ARM.extab.exit.text)
+#ifndef CONFIG_HOTPLUG_CPU
+               *(.ARM.exidx.cpuexit.text)
+               *(.ARM.extab.cpuexit.text)
+#endif
+#ifndef CONFIG_HOTPLUG
+               *(.ARM.exidx.devexit.text)
+               *(.ARM.extab.devexit.text)
+#endif
 #ifndef CONFIG_MMU
                *(.fixup)
                *(__ex_table)