diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-05-13 20:12:39 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-05-13 20:12:39 -0400 |
commit | c18fe9a0467afaec7de05ec76cd994ae7c866760 (patch) | |
tree | 4f469753ff8829c50bd26b6be32526824040c508 /arch/sh64/kernel/entry.S | |
parent | 599c26d32950c33bdd2a5ac6939bfe15ecf057e0 (diff) |
sh64: ppoll/pselect6() and restartable syscalls.
This patch was hanging around for some time while we were waiting
for the compiler situation to improve.. now that all is well again,
finally merge it.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh64/kernel/entry.S')
-rw-r--r-- | arch/sh64/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh64/kernel/entry.S b/arch/sh64/kernel/entry.S index 40d45346248d..7013fcb6665c 100644 --- a/arch/sh64/kernel/entry.S +++ b/arch/sh64/kernel/entry.S | |||
@@ -947,14 +947,14 @@ ret_with_reschedule: | |||
947 | ! FIXME:!!! | 947 | ! FIXME:!!! |
948 | ! no handling of TIF_SYSCALL_TRACE yet!! | 948 | ! no handling of TIF_SYSCALL_TRACE yet!! |
949 | 949 | ||
950 | movi (1 << TIF_NEED_RESCHED), r8 | 950 | movi _TIF_NEED_RESCHED, r8 |
951 | and r8, r7, r8 | 951 | and r8, r7, r8 |
952 | pta work_resched, tr0 | 952 | pta work_resched, tr0 |
953 | bne r8, ZERO, tr0 | 953 | bne r8, ZERO, tr0 |
954 | 954 | ||
955 | pta restore_all, tr1 | 955 | pta restore_all, tr1 |
956 | 956 | ||
957 | movi (1 << TIF_SIGPENDING), r8 | 957 | movi (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), r8 |
958 | and r8, r7, r8 | 958 | and r8, r7, r8 |
959 | pta work_notifysig, tr0 | 959 | pta work_notifysig, tr0 |
960 | bne r8, ZERO, tr0 | 960 | bne r8, ZERO, tr0 |