aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/entry.S
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2006-09-27 17:27:00 +0900
committerPaul Mundt <lethal@linux-sh.org>2006-09-27 17:27:00 +0900
commit9f23e7e94f7083d9705b595cbd6b30972be6fbbb (patch)
tree5fc6e90a9e361dca2e56bb03327078a2eb88cb4c /arch/sh/kernel/entry.S
parentsh: __addr_ok() and other misc nommu fixups. (diff)
downloadlinux-dev-9f23e7e94f7083d9705b595cbd6b30972be6fbbb.tar.xz
linux-dev-9f23e7e94f7083d9705b595cbd6b30972be6fbbb.zip
sh: pselect6 and ppoll, along with signal trampoline rework.
This implements support for ppoll() and pselect6().. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/entry.S')
-rw-r--r--arch/sh/kernel/entry.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/kernel/entry.S b/arch/sh/kernel/entry.S
index fcbf50d4ee10..fd5fe2349f20 100644
--- a/arch/sh/kernel/entry.S
+++ b/arch/sh/kernel/entry.S
@@ -371,12 +371,12 @@ work_pending:
! r8: current_thread_info
! t: result of "tst #_TIF_NEED_RESCHED, r0"
bf/s work_resched
- tst #_TIF_SIGPENDING, r0
+ tst #(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), r0
work_notifysig:
bt/s restore_all
mov r15, r4
- mov #0, r5
- mov r12, r6 ! set arg2(save_r0)
+ mov r12, r5 ! set arg1(save_r0)
+ mov r0, r6
mov.l 2f, r1
mova restore_all, r0
jmp @r1
@@ -414,7 +414,7 @@ work_resched:
.align 2
1: .long schedule
-2: .long do_signal
+2: .long do_notify_resume
.align 2
syscall_exit_work: