summaryrefslogtreecommitdiffstats
path: root/arch/m32r/kernel/entry.S
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-09-24 07:22:30 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-24 22:54:19 +0200
commita748102430f4dbbfca3ff81ac12db6e4f1243677 (patch)
tree0d71112ed450bd82d8656fcbdd0b4cc4fb2b68a8 /arch/m32r/kernel/entry.S
parentm32r: fix rt_sigsuspend() (diff)
downloadlinux-a748102430f4dbbfca3ff81ac12db6e4f1243677.tar.xz
linux-a748102430f4dbbfca3ff81ac12db6e4f1243677.zip
make m32r handle multiple pending signals
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m32r/kernel/entry.S')
-rw-r--r--arch/m32r/kernel/entry.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S
index 90149daa560f..225412bc227e 100644
--- a/arch/m32r/kernel/entry.S
+++ b/arch/m32r/kernel/entry.S
@@ -235,9 +235,9 @@ work_resched:
work_notifysig: ; deal with pending signals and
; notify-resume requests
mv r0, sp ; arg1 : struct pt_regs *regs
- ldi r1, r9 ; arg2 : __u32 thread_info_flags
+ mv r1, r9 ; arg2 : __u32 thread_info_flags
bl do_notify_resume
- bra restore_all
+ bra resume_userspace
; perform syscall exit tracing
ALIGN