From 1fb5655bda2fac28e7a68ebfd059f008999fcc40 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 19 Jun 2009 16:39:29 +0100
Subject: [PATCH] --- yaml --- r: 153739 b: refs/heads/master c:
 7436127ce9042f95a10bb5423f726fd63a61934d h: refs/heads/master i:   153737:
 834ae83620d2bc473427eb60ce765f50845b7b1c   153735:
 b8717fc8f35972e5482b0df87c53d52e5bb8a77c v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/kernel/vmlinux.lds.S | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2ba5a045ac92..1f2c2d9f7de5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2860d43f5dfab599fc1308ab61b1d3e30801ceb
+refs/heads/master: 7436127ce9042f95a10bb5423f726fd63a61934d
diff --git a/trunk/arch/arm/kernel/vmlinux.lds.S b/trunk/arch/arm/kernel/vmlinux.lds.S
index 6c0779792546..4340bf3d2c84 100644
--- a/trunk/arch/arm/kernel/vmlinux.lds.S
+++ b/trunk/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)