diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-16 16:50:37 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-16 16:50:37 -0400 |
| commit | 55d3ecab2d16be3525ba24a96ba3a67692af1f09 (patch) | |
| tree | 7e81977adbd73e154f53861d8577d3ab92611c8c /arch/sh64/kernel/entry.S | |
| parent | 6684e323a236d40461f27d36b38c6b70aabc9e71 (diff) | |
| parent | 7b104bcb8e460e45a1aebe3da9b86aacdb4cab12 (diff) | |
| download | kernel-crypto-55d3ecab2d16be3525ba24a96ba3a67692af1f09.tar.gz kernel-crypto-55d3ecab2d16be3525ba24a96ba3a67692af1f09.tar.xz kernel-crypto-55d3ecab2d16be3525ba24a96ba3a67692af1f09.zip | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
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 40d45346248..7013fcb6665 100644 --- a/arch/sh64/kernel/entry.S +++ b/arch/sh64/kernel/entry.S @@ -947,14 +947,14 @@ ret_with_reschedule: ! FIXME:!!! ! no handling of TIF_SYSCALL_TRACE yet!! - movi (1 << TIF_NEED_RESCHED), r8 + movi _TIF_NEED_RESCHED, r8 and r8, r7, r8 pta work_resched, tr0 bne r8, ZERO, tr0 pta restore_all, tr1 - movi (1 << TIF_SIGPENDING), r8 + movi (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), r8 and r8, r7, r8 pta work_notifysig, tr0 bne r8, ZERO, tr0 |