1 files changed, 9 insertions, 6 deletions

diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index b6cda06b455f..7b8f2141427b 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -343,15 +343,18 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
                  */
                 thumb = handler & 1;
 
-#if __LINUX_ARM_ARCH__ >= 7
                 /*
-                 * Clear the If-Then Thumb-2 execution state
-                 * ARM spec requires this to be all 000s in ARM mode
-                 * Snapdragon S4/Krait misbehaves on a Thumb=>ARM
-                 * signal transition without this.
+                 * Clear the If-Then Thumb-2 execution state.  ARM spec
+                 * requires this to be all 000s in ARM mode.  Snapdragon
+                 * S4/Krait misbehaves on a Thumb=>ARM signal transition
+                 * without this.
+                 *
+                 * We must do this whenever we are running on a Thumb-2
+                 * capable CPU, which includes ARMv6T2.  However, we elect
+                 * to always do this to simplify the code; this field is
+                 * marked UNK/SBZP for older architectures.
                  */
                 cpsr &= ~PSR_IT_MASK;
-#endif
 
                 if (thumb) {
                         cpsr |= PSR_T_BIT;