1 files changed, 19 insertions, 15 deletions

diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c
index 3db37425210d..579cd2ca358d 100644
--- a/arch/sh/kernel/signal_32.c
+++ b/arch/sh/kernel/signal_32.c
@@ -67,7 +67,8 @@ sys_sigsuspend(old_sigset_t mask,
 
         current->state = TASK_INTERRUPTIBLE;
         schedule();
-        set_thread_flag(TIF_RESTORE_SIGMASK);
+        set_restore_sigmask();
+
         return -ERESTARTNOHAND;
 }
 
@@ -149,7 +150,7 @@ static inline int restore_sigcontext_fpu(struct sigcontext __user *sc)
                 return 0;
 
         set_used_math();
-        return __copy_from_user(&tsk->thread.fpu.hard, &sc->sc_fpregs[0],
+        return __copy_from_user(&tsk->thread.xstate->hardfpu, &sc->sc_fpregs[0],
                                 sizeof(long)*(16*2+2));
 }
 
@@ -174,7 +175,7 @@ static inline int save_sigcontext_fpu(struct sigcontext __user *sc,
         clear_used_math();
 
         unlazy_fpu(tsk, regs);
-        return __copy_to_user(&sc->sc_fpregs[0], &tsk->thread.fpu.hard,
+        return __copy_to_user(&sc->sc_fpregs[0], &tsk->thread.xstate->hardfpu,
                               sizeof(long)*(16*2+2));
 }
 #endif /* CONFIG_SH_FPU */
@@ -527,7 +528,7 @@ handle_syscall_restart(unsigned long save_r0, struct pt_regs *regs,
                 /* fallthrough */
                 case -ERESTARTNOINTR:
                         regs->regs[0] = save_r0;
-                        regs->pc -= instruction_size(ctrl_inw(regs->pc - 4));
+                        regs->pc -= instruction_size(__raw_readw(regs->pc - 4));
                         break;
         }
 }
@@ -590,7 +591,7 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0)
         if (try_to_freeze())
                 goto no_signal;
 
-        if (test_thread_flag(TIF_RESTORE_SIGMASK))
+        if (current_thread_info()->status & TS_RESTORE_SIGMASK)
                 oldset = &current->saved_sigmask;
         else
                 oldset = &current->blocked;
@@ -602,12 +603,13 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0)
                 /* Whee!  Actually deliver the signal.  */
                 if (handle_signal(signr, &ka, &info, oldset,
                                   regs, save_r0) == 0) {
-                        /* a signal was successfully delivered; the saved
+                        /*
+                         * A signal was successfully delivered; the saved
                          * sigmask will have been stored in the signal frame,
                          * and will be restored by sigreturn, so we can simply
-                         * clear the TIF_RESTORE_SIGMASK flag */
-                        if (test_thread_flag(TIF_RESTORE_SIGMASK))
-                                clear_thread_flag(TIF_RESTORE_SIGMASK);
+                         * clear the TS_RESTORE_SIGMASK flag
+                         */
+                        current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
 
                         tracehook_signal_handler(signr, &info, &ka, regs,
                                         test_thread_flag(TIF_SINGLESTEP));
@@ -624,17 +626,19 @@ no_signal:
                     regs->regs[0] == -ERESTARTSYS ||
                     regs->regs[0] == -ERESTARTNOINTR) {
                         regs->regs[0] = save_r0;
-                        regs->pc -= instruction_size(ctrl_inw(regs->pc - 4));
+                        regs->pc -= instruction_size(__raw_readw(regs->pc - 4));
                 } else if (regs->regs[0] == -ERESTART_RESTARTBLOCK) {
-                        regs->pc -= instruction_size(ctrl_inw(regs->pc - 4));
+                        regs->pc -= instruction_size(__raw_readw(regs->pc - 4));
                         regs->regs[3] = __NR_restart_syscall;
                 }
         }
 
-        /* if there's no signal to deliver, we just put the saved sigmask
-         * back */
-        if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
-                clear_thread_flag(TIF_RESTORE_SIGMASK);
+        /*
+         * If there's no signal to deliver, we just put the saved sigmask
+         * back.
+         */
+        if (current_thread_info()->status & TS_RESTORE_SIGMASK) {
+                current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
                 sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
         }
 }