提交 d3efbdd6 编写于 作者: P Paul Mundt

sh: Fix up the math-emu build.

math-emu wasn't converted for the trap_no/errno_code changes,
get it building again.
Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
上级 a1e2833d
...@@ -507,6 +507,7 @@ static int ieee_fpe_handler(struct pt_regs *regs) ...@@ -507,6 +507,7 @@ static int ieee_fpe_handler(struct pt_regs *regs)
unsigned short insn = *(unsigned short *)regs->pc; unsigned short insn = *(unsigned short *)regs->pc;
unsigned short finsn; unsigned short finsn;
unsigned long nextpc; unsigned long nextpc;
siginfo_t info;
int nib[4] = { int nib[4] = {
(insn >> 12) & 0xf, (insn >> 12) & 0xf,
(insn >> 8) & 0xf, (insn >> 8) & 0xf,
...@@ -559,9 +560,11 @@ static int ieee_fpe_handler(struct pt_regs *regs) ...@@ -559,9 +560,11 @@ static int ieee_fpe_handler(struct pt_regs *regs)
~(FPSCR_CAUSE_MASK | FPSCR_FLAG_MASK); ~(FPSCR_CAUSE_MASK | FPSCR_FLAG_MASK);
set_tsk_thread_flag(tsk, TIF_USEDFPU); set_tsk_thread_flag(tsk, TIF_USEDFPU);
} else { } else {
tsk->thread.trap_no = 11; info.si_signo = SIGFPE;
tsk->thread.error_code = 0; info.si_errno = 0;
force_sig(SIGFPE, tsk); info.si_code = FPE_FLTINV;
info.si_addr = (void __user *)regs->pc;
force_sig_info(SIGFPE, &info, tsk);
} }
regs->pc = nextpc; regs->pc = nextpc;
...@@ -576,14 +579,17 @@ asmlinkage void do_fpu_error(unsigned long r4, unsigned long r5, ...@@ -576,14 +579,17 @@ asmlinkage void do_fpu_error(unsigned long r4, unsigned long r5,
struct pt_regs regs) struct pt_regs regs)
{ {
struct task_struct *tsk = current; struct task_struct *tsk = current;
siginfo_t info;
if (ieee_fpe_handler (&regs)) if (ieee_fpe_handler (&regs))
return; return;
regs.pc += 2; regs.pc += 2;
tsk->thread.trap_no = 11; info.si_signo = SIGFPE;
tsk->thread.error_code = 0; info.si_errno = 0;
force_sig(SIGFPE, tsk); info.si_code = FPE_FLTINV;
info.si_addr = (void __user *)regs.pc;
force_sig_info(SIGFPE, &info, tsk);
} }
/** /**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册