---

yaml --- r: 276151 b: refs/heads/master c: c89cefe h: refs/heads/master i: 276149: 580177c 276147: 6bf2785 276143: 7070f89 v: v3
git-mirror · Nov 26, 2011 · 8e3a6f4 · 8e3a6f4
1 parent 0511172
commit 8e3a6f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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