diff options
Diffstat (limited to 'arch/mips/math-emu/dsemul.c')
| -rw-r--r-- | arch/mips/math-emu/dsemul.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/mips/math-emu/dsemul.c b/arch/mips/math-emu/dsemul.c index 653e325849e..df7b9d928ef 100644 --- a/arch/mips/math-emu/dsemul.c +++ b/arch/mips/math-emu/dsemul.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <asm/fpu_emulator.h> | 18 | #include <asm/fpu_emulator.h> |
| 19 | 19 | ||
| 20 | #include "ieee754.h" | 20 | #include "ieee754.h" |
| 21 | #include "dsemul.h" | ||
| 22 | 21 | ||
| 23 | /* Strap kernel emulator for full MIPS IV emulation */ | 22 | /* Strap kernel emulator for full MIPS IV emulation */ |
| 24 | 23 | ||
| @@ -94,7 +93,7 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc) | |||
| 94 | return SIGBUS; | 93 | return SIGBUS; |
| 95 | 94 | ||
| 96 | err = __put_user(ir, &fr->emul); | 95 | err = __put_user(ir, &fr->emul); |
| 97 | err |= __put_user((mips_instruction)BADINST, &fr->badinst); | 96 | err |= __put_user((mips_instruction)BREAK_MATH, &fr->badinst); |
| 98 | err |= __put_user((mips_instruction)BD_COOKIE, &fr->cookie); | 97 | err |= __put_user((mips_instruction)BD_COOKIE, &fr->cookie); |
| 99 | err |= __put_user(cpc, &fr->epc); | 98 | err |= __put_user(cpc, &fr->epc); |
| 100 | 99 | ||
| @@ -130,13 +129,13 @@ int do_dsemulret(struct pt_regs *xcp) | |||
| 130 | /* | 129 | /* |
| 131 | * Do some sanity checking on the stackframe: | 130 | * Do some sanity checking on the stackframe: |
| 132 | * | 131 | * |
| 133 | * - Is the instruction pointed to by the EPC an BADINST? | 132 | * - Is the instruction pointed to by the EPC an BREAK_MATH? |
| 134 | * - Is the following memory word the BD_COOKIE? | 133 | * - Is the following memory word the BD_COOKIE? |
| 135 | */ | 134 | */ |
| 136 | err = __get_user(insn, &fr->badinst); | 135 | err = __get_user(insn, &fr->badinst); |
| 137 | err |= __get_user(cookie, &fr->cookie); | 136 | err |= __get_user(cookie, &fr->cookie); |
| 138 | 137 | ||
| 139 | if (unlikely(err || (insn != BADINST) || (cookie != BD_COOKIE))) { | 138 | if (unlikely(err || (insn != BREAK_MATH) || (cookie != BD_COOKIE))) { |
| 140 | fpuemustats.errors++; | 139 | fpuemustats.errors++; |
| 141 | return 0; | 140 | return 0; |
| 142 | } | 141 | } |
