From 257ea41318ea892d27ef7cabfa38c677d8d50da5 Mon Sep 17 00:00:00 2001
From: Stephen Boyd <sboyd@codeaurora.org>
Date: Mon, 29 Oct 2012 19:19:34 +0100
Subject: [PATCH] --- yaml --- r: 339509 b: refs/heads/master c:
 ee951c630c5ce5108f8014ce1c9d738b5bbfea60 h: refs/heads/master i:   339507:
 d02fb80ebcb6e6f7e3bea72bc4a1fc9b69f1f615 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/arm/Kconfig              |  1 +
 trunk/arch/arm/kernel/vmlinux.lds.S | 19 +++++++++----------
 trunk/scripts/sortextable.c         |  1 +
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 0ca0cc879608..0d80309b2c45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a68becd1dcda55b467dcabaff136cadc10abb761
+refs/heads/master: ee951c630c5ce5108f8014ce1c9d738b5bbfea60
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 73067efd4845..208414c0506a 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -5,6 +5,7 @@ config ARM
 	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 	select ARCH_HAVE_CUSTOM_GPIO_H
 	select ARCH_WANT_IPC_PARSE_VERSION
+	select BUILDTIME_EXTABLE_SORT if MMU
 	select CPU_PM if (SUSPEND || CPU_IDLE)
 	select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN
 	select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI)
diff --git a/trunk/arch/arm/kernel/vmlinux.lds.S b/trunk/arch/arm/kernel/vmlinux.lds.S
index 36ff15bbfdd4..b9f38e388b43 100644
--- a/trunk/arch/arm/kernel/vmlinux.lds.S
+++ b/trunk/arch/arm/kernel/vmlinux.lds.S
@@ -114,6 +114,15 @@ SECTIONS
 
 	RO_DATA(PAGE_SIZE)
 
+	. = ALIGN(4);
+	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
+		__start___ex_table = .;
+#ifdef CONFIG_MMU
+		*(__ex_table)
+#endif
+		__stop___ex_table = .;
+	}
+
 #ifdef CONFIG_ARM_UNWIND
 	/*
 	 * Stack unwinding tables
@@ -219,16 +228,6 @@ SECTIONS
 		CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
 		READ_MOSTLY_DATA(L1_CACHE_BYTES)
 
-		/*
-		 * The exception fixup table (might need resorting at runtime)
-		 */
-		. = ALIGN(4);
-		__start___ex_table = .;
-#ifdef CONFIG_MMU
-		*(__ex_table)
-#endif
-		__stop___ex_table = .;
-
 		/*
 		 * and the usual data section
 		 */
diff --git a/trunk/scripts/sortextable.c b/trunk/scripts/sortextable.c
index f19ddc47304c..1f10e89d15b4 100644
--- a/trunk/scripts/sortextable.c
+++ b/trunk/scripts/sortextable.c
@@ -248,6 +248,7 @@ do_file(char const *const fname)
 	case EM_S390:
 		custom_sort = sort_relative_table;
 		break;
+	case EM_ARM:
 	case EM_MIPS:
 		break;
 	}  /* end switch */