MIPS: Switch FPU emulator trap to BREAK instruction.

Arguably using the address error handler has always been ugly.  But with
processors that handle unaligned loads and stores in hardware the
current mechanism ceases to work so switch it to a BREAK instruction and
allocate break code 514 to the FPU emulator.

Yoichi Yuasa provided a build fix for CONFIG_BUG=n.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

1 files changed, 0 insertions, 12 deletions

diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index 20709669e59..bf4c4a979ab 100644
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -499,22 +499,10 @@ sigill:
 
 asmlinkage void do_ade(struct pt_regs *regs)
 {
-        extern int do_dsemulret(struct pt_regs *);
         unsigned int __user *pc;
         mm_segment_t seg;
 
         /*
-         * Address errors may be deliberately induced by the FPU emulator to
-         * retake control of the CPU after executing the instruction in the
-         * delay slot of an emulated branch.
-         */
-        /* Terminate if exception was recognized as a delay slot return */
-        if (do_dsemulret(regs))
-                return;
-
-        /* Otherwise handle as normal */
-
-        /*
          * Did we catch a fault trying to load an instruction?
          * Or are we running in MIPS16 mode?
          */