aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/kernel/entry-common.S
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-04-24 16:40:34 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-05-21 14:36:32 -0400
commit84849b3ed8081e9e2eb0e441c699eda807853cb6 (patch)
tree3e15f1c4598275d3caf7b188cd00d87e815f55d6 /arch/arm/kernel/entry-common.S
parent7f1b5a9966b176e10d6cd322324a82be2379a51b (diff)
downloadlinux-linaro-stable-84849b3ed8081e9e2eb0e441c699eda807853cb6.tar.gz
arm: trim _TIF_WORK_MASK, get rid of useless test and branch...
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/entry-common.S')
-rw-r--r--arch/arm/kernel/entry-common.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 54ee265dd819..82aaf0aeb85d 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -53,8 +53,9 @@ fast_work_pending:
work_pending:
tst r1, #_TIF_NEED_RESCHED
bne work_resched
- tst r1, #_TIF_SIGPENDING|_TIF_NOTIFY_RESUME
- beq no_work_pending
+ /*
+ * TIF_SIGPENDING or TIF_NOTIFY_RESUME must've been set if we got here
+ */
mov r0, sp @ 'regs'
mov r2, why @ 'syscall'
tst r1, #_TIF_SIGPENDING @ delivering a signal?