From 8e3a6f4c031aa813e6989974e8489d8780f7b764 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Tue, 22 Nov 2011 23:42:12 +0100
Subject: [PATCH] --- yaml --- r: 276151 b: refs/heads/master c:
 c89cefed35c8c5f53f36757f8a6768e390394ee3 h: refs/heads/master i:   276149:
 580177c9d3349ad0569dade01327afeb0c364c85   276147:
 6bf2785621438d041dae506dcfddb21644c02945   276143:
 7070f894d1c47c754ed533126342331312f3189b v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/kernel/entry-armv.S | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b8eae94cb195..7b9b7ce3f6fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41dfaa934c5d866d626de9bea785e6168524a47e
+refs/heads/master: c89cefed35c8c5f53f36757f8a6768e390394ee3
diff --git a/trunk/arch/arm/kernel/entry-armv.S b/trunk/arch/arm/kernel/entry-armv.S
index 9ad50c4208ae..b145f16c91bc 100644
--- a/trunk/arch/arm/kernel/entry-armv.S
+++ b/trunk/arch/arm/kernel/entry-armv.S
@@ -497,7 +497,7 @@ ENDPROC(__und_usr)
 	.popsection
 	.pushsection __ex_table,"a"
 	.long	1b, 4b
-#if __LINUX_ARM_ARCH__ >= 7
+#if CONFIG_ARM_THUMB && __LINUX_ARM_ARCH__ >= 6 && CONFIG_CPU_V7
 	.long	2b, 4b
 	.long	3b, 4b
 #endif