summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/entry-common.S
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2005-11-19 10:01:07 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-11-19 10:01:07 +0000
commita6c61e9dfdd0adf8443932cfc43b0c1e25036ad5 (patch)
tree68e09d27ce1ef0aecbe11fb9eb139fba92e1afe9 /arch/arm/kernel/entry-common.S
parentd2c5b69099ff747f9757da2416383b9a999171b1 (diff)
downloadlinux-a6c61e9dfdd0adf8443932cfc43b0c1e25036ad5.tar.gz
linux-a6c61e9dfdd0adf8443932cfc43b0c1e25036ad5.tar.bz2
linux-a6c61e9dfdd0adf8443932cfc43b0c1e25036ad5.zip
[ARM] 3168/1: Update ARM signal delivery and masking
Patch from Daniel Jacobowitz After delivering a signal (creating its stack frame) we must check for additional pending unblocked signals before returning to userspace. Otherwise signals may be delayed past the next syscall or reschedule. Once that was fixed it became obvious that the ARM signal mask manipulation was broken. It was a little bit broken before the recent SA_NODEFER changes, and then very broken after them. We must block the requested signals before starting the handler or the same signal can be delivered again before the handler even gets a chance to run. Signed-off-by: Daniel Jacobowitz <dan@codesourcery.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.S3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 066597f4345a..f7f183075237 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -48,8 +48,7 @@ work_pending:
mov r0, sp @ 'regs'
mov r2, why @ 'syscall'
bl do_notify_resume
- disable_irq @ disable interrupts
- b no_work_pending
+ b ret_slow_syscall @ Check work again
work_resched:
bl schedule