aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-09-16 11:08:49 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-09-16 23:58:46 +0100
commit12fc7306e6ffae4e86680892f2286063d7d6eae7 (patch)
treef9d24c12835f079f58861726c24c098132c1b5f1 /arch/arm/kernel
parent9b55613f42e8d40d5c9ccb8970bde6af4764b2ab (diff)
downloadlinux-linaro-stable-12fc7306e6ffae4e86680892f2286063d7d6eae7.tar.gz
ARM: get rid of needless #if in signal handling code
Remove the #if statement which caused trouble for kernels that support both ARMv6 and ARMv7. Older architectures do not implement these bits, so it should be safe to always clear them. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/signal.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 586eef26203d..29e5dc70bb41 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -343,7 +343,6 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
*/
thumb = handler & 1;
-#if __LINUX_ARM_ARCH__ >= 6
/*
* Clear the If-Then Thumb-2 execution state. ARM spec
* requires this to be all 000s in ARM mode. Snapdragon
@@ -352,11 +351,10 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
*
* We must do this whenever we are running on a Thumb-2
* capable CPU, which includes ARMv6T2. However, we elect
- * to do this whenever we're on an ARMv6 or later CPU for
- * simplicity.
+ * 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;