diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2014-03-31 12:17:33 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-03-31 12:17:33 -0400 |
commit | ade63aada79c61bcd5f51cbd310f237399892268 (patch) | |
tree | 4f8605528bfd9b6261679883974b9ac4870223dd /arch/mips/math-emu/cp1emu.c | |
parent | 9a1724c7506bfa7d3d9dcab13f83e9e6446929f9 (diff) | |
parent | c14af233fbe279d0e561ecf84f1208b1bae087ef (diff) |
Merge branch '3.14-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/math-emu/cp1emu.c')
-rw-r--r-- | arch/mips/math-emu/cp1emu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c index 71a697c9d385..7b3c9acae689 100644 --- a/arch/mips/math-emu/cp1emu.c +++ b/arch/mips/math-emu/cp1emu.c | |||
@@ -1561,10 +1561,10 @@ static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx, | |||
1561 | break; | 1561 | break; |
1562 | } | 1562 | } |
1563 | 1563 | ||
1564 | case 0x7: /* 7 */ | 1564 | case 0x3: |
1565 | if (MIPSInst_FUNC(ir) != pfetch_op) { | 1565 | if (MIPSInst_FUNC(ir) != pfetch_op) |
1566 | return SIGILL; | 1566 | return SIGILL; |
1567 | } | 1567 | |
1568 | /* ignore prefx operation */ | 1568 | /* ignore prefx operation */ |
1569 | break; | 1569 | break; |
1570 | 1570 | ||