Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / arch / sh / math-emu / math.c

diff --git a/arch/sh/math-emu/math.c b/arch/sh/math-emu/math.c
index a38e1eed9e77ea0f66a62ae7cfa8db241b97a6ab..d6c15cae0912b487549efc059a7370fb76cacc73 100644 (file)
--- a/arch/sh/math-emu/math.c
+++ b/arch/sh/math-emu/math.c
@@ -507,6 +507,7 @@ static int ieee_fpe_handler(struct pt_regs *regs)
        unsigned short insn = *(unsigned short *)regs->pc;
        unsigned short finsn;
        unsigned long nextpc;
+       siginfo_t info;
        int nib[4] = {
                (insn >> 12) & 0xf,
                (insn >> 8) & 0xf,
@@ -557,11 +558,13 @@ static int ieee_fpe_handler(struct pt_regs *regs)
                                            (finsn >> 8) & 0xf);
                        tsk->thread.fpu.hard.fpscr &=
                                ~(FPSCR_CAUSE_MASK | FPSCR_FLAG_MASK);
-                       set_tsk_thread_flag(tsk, TIF_USEDFPU);
+                       task_thread_info(tsk)->status |= TS_USEDFPU;
                } else {
-                       tsk->thread.trap_no = 11;
-                       tsk->thread.error_code = 0;
-                       force_sig(SIGFPE, tsk);
+                       info.si_signo = SIGFPE;
+                       info.si_errno = 0;
+                       info.si_code = FPE_FLTINV;
+                       info.si_addr = (void __user *)regs->pc;
+                       force_sig_info(SIGFPE, &info, tsk);
                }
 
                regs->pc = nextpc;
@@ -576,14 +579,17 @@ asmlinkage void do_fpu_error(unsigned long r4, unsigned long r5,
                             struct pt_regs regs)
 {
        struct task_struct *tsk = current;
+       siginfo_t info;
 
        if (ieee_fpe_handler (&regs))
                return;
 
        regs.pc += 2;
-       tsk->thread.trap_no = 11;
-       tsk->thread.error_code = 0;
-       force_sig(SIGFPE, tsk);
+       info.si_signo = SIGFPE;
+       info.si_errno = 0;
+       info.si_code = FPE_FLTINV;
+       info.si_addr = (void __user *)regs.pc;
+       force_sig_info(SIGFPE, &info, tsk);
 }
 
 /**
@@ -613,10 +619,10 @@ int do_fpu_inst(unsigned short inst, struct pt_regs *regs)
        struct task_struct *tsk = current;
        struct sh_fpu_soft_struct *fpu = &(tsk->thread.fpu.soft);
 
-       if (!test_tsk_thread_flag(tsk, TIF_USEDFPU)) {
+       if (!(task_thread_info(tsk)->status & TS_USEDFPU)) {
                /* initialize once. */
                fpu_init(fpu);
-               set_tsk_thread_flag(tsk, TIF_USEDFPU);
+               task_thread_info(tsk)->status |= TS_USEDFPU;
        }
 
        return fpu_emulate(inst, fpu, regs);