summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/entry-common.S
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-07-19 17:47:55 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-07-28 11:11:52 +0100
commit0a267fa6a15d41c4061358bf2e67c633fdbffc90 (patch)
treee54ebbdd2c38824d154e7c0574fd563ef8072f9e /arch/arm/kernel/entry-common.S
parent8d4150ccbb63419649a69fe04b46120a46d60da2 (diff)
downloadlinux-0a267fa6a15d41c4061358bf2e67c633fdbffc90.tar.bz2
ARM: 7472/1: pull all work_pending logics into C function
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/entry-common.S')
-rw-r--r--arch/arm/kernel/entry-common.S17
1 files changed, 2 insertions, 15 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 49d9f9305247..1873f653641c 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -51,23 +51,10 @@ ret_fast_syscall:
fast_work_pending:
str r0, [sp, #S_R0+S_OFF]! @ returned r0
work_pending:
- tst r1, #_TIF_NEED_RESCHED
- bne work_resched
- /*
- * TIF_SIGPENDING or TIF_NOTIFY_RESUME must've been set if we got here
- */
- ldr r2, [sp, #S_PSR]
mov r0, sp @ 'regs'
- tst r2, #15 @ are we returning to user mode?
- bne no_work_pending @ no? just leave, then...
mov r2, why @ 'syscall'
- tst r1, #_TIF_SIGPENDING @ delivering a signal?
- movne why, #0 @ prevent further restarts
- bl do_notify_resume
- b ret_slow_syscall @ Check work again
-
-work_resched:
- bl schedule
+ bl do_work_pending
+ b no_work_pending
/*
* "slow" syscall return path. "why" tells us if this was a real syscall.
*/