leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: get rid of needless #if in signal handling code

Browse Source 
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>
This commit is contained in:
Russell King 2015-09-16 11:08:49 +01:00
parent 9b55613f42
commit 12fc7306e6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/kernel/signal.c
View File

@ -343,7 +343,6 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
*/ */
thumb = handler & 1; thumb = handler & 1;
#if __LINUX_ARM_ARCH__ >= 6
/* /*
* Clear the If-Then Thumb-2 execution state. ARM spec * Clear the If-Then Thumb-2 execution state. ARM spec
* requires this to be all 000s in ARM mode. Snapdragon * 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 * We must do this whenever we are running on a Thumb-2
* capable CPU, which includes ARMv6T2. However, we elect * capable CPU, which includes ARMv6T2. However, we elect
* to do this whenever we're on an ARMv6 or later CPU for * to always do this to simplify the code; this field is
* simplicity. * marked UNK/SBZP for older architectures.
*/ */
cpsr &= ~PSR_IT_MASK; cpsr &= ~PSR_IT_MASK;
#endif
if (thumb) { if (thumb) {
cpsr |= PSR_T_BIT; cpsr |= PSR_T_BIT;