Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
  sh64: Add .gitignore entry for syscalltab.
  sh64: generic quicklist support.
  sh64: Update cayman defconfig.
  sh64: Fixup sh-sci build.
  sh64: ppoll/pselect6() and restartable syscalls.
  sh64: dma-mapping updates.
  sh64: Fixups for the irq_regs changes.
  sh64: Wire up many new syscalls.
  spelling fixes: arch/sh64/
  sh64: ROUND_UP macro cleanup in arch/sh64/kernel/pci_sh5.c

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:
         ! 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