Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

[mv-sheeva.git] / arch / sh / kernel / signal_32.c

diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c
index 12815ce01ecd935022eb2f13779d26eb6e74e59a..579cd2ca358d8b786fa6c38e109238c5685807e2 100644 (file)
--- a/arch/sh/kernel/signal_32.c
+++ b/arch/sh/kernel/signal_32.c
@@ -150,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));
 }
 
@@ -175,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 */
@@ -528,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;
        }
 }
@@ -626,9 +626,9 @@ 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;
                }
        }