summaryrefslogtreecommitdiffstats
path: root/arch/frv/kernel/entry.S
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-01-06 09:11:44 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 17:33:33 +0100
commit8efc0ab50edbac5c65191b8a58dfdab3741b7901 (patch)
tree3598a874f715e89d475a9bc8a435a1096f19c58d /arch/frv/kernel/entry.S
parent[PATCH] FRV: Make futex code compilable on nommu [try #2] (diff)
downloadlinux-8efc0ab50edbac5c65191b8a58dfdab3741b7901.tar.xz
linux-8efc0ab50edbac5c65191b8a58dfdab3741b7901.zip
[PATCH] frv: fix signal handling
The attached patch makes FRV signal handling work properly: (1) After do_notify_resume() has been called, the work flags must be checked again (there may be another signal to deliver or the process might require rescheduling for instance). (2) After the signal frame is set up on the userspace stack, ptrace() should be given an opportunity to single-step into the signal handler. (3) The error state from setting up a signal frame should be passed back up the call chain. (4) The segfault handler shouldn't be preemptively reset in the arch if we fail to deliver a SEGV signal: force_sig() will take care of that. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/frv/kernel/entry.S')
-rw-r--r--arch/frv/kernel/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S
index ad10ea595459..5f6548388b74 100644
--- a/arch/frv/kernel/entry.S
+++ b/arch/frv/kernel/entry.S
@@ -1076,7 +1076,7 @@ __entry_work_notifysig:
LEDS 0x6410
ori.p gr4,#0,gr8
call do_notify_resume
- bra __entry_return_direct
+ bra __entry_resume_userspace
# perform syscall entry tracing
__syscall_trace_entry: