2 files changed, 13 insertions, 2 deletions

diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h
index 236a06b9b7ce..4a4290f7b4a2 100644
--- a/arch/arm/include/asm/ptrace.h
+++ b/arch/arm/include/asm/ptrace.h
@@ -65,6 +65,13 @@
 #define PSR_x           0x0000ff00      /* Extension            */
 #define PSR_c           0x000000ff      /* Control              */
 
+/*
+ * ARMv7 groups of APSR bits
+ */
+#define PSR_ISET_MASK   0x01000010      /* ISA state (J, T) mask */
+#define PSR_IT_MASK     0x0600fc00      /* If-Then execution state mask */
+#define PSR_ENDIAN_MASK 0x00000200      /* Endianness state mask */
+
 #ifndef __ASSEMBLY__
 
 /*
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 80b8b5c7e07a..442b87476f97 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -426,9 +426,13 @@ setup_return(struct pt_regs *regs, struct k_sigaction *ka,
                  */
                 thumb = handler & 1;
 
-                if (thumb)
+                if (thumb) {
                         cpsr |= PSR_T_BIT;
-                else
+#if __LINUX_ARM_ARCH__ >= 7
+                        /* clear the If-Then Thumb-2 execution state */
+                        cpsr &= ~PSR_IT_MASK;
+#endif
+                } else
                         cpsr &= ~PSR_T_BIT;
         }
 #endif