Merge branch '4.0-fixes' into mips-for-linux-next

[karo-tx-linux.git] / arch / mips / kernel / unaligned.c

diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index 7659da224fcdd18fe96c87c6b3e7d1f2cc4a241c..af84bef0c90de4bc65e14669dca132ebb7147846 100644 (file)
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -89,8 +89,6 @@
 #include <asm/fpu_emulator.h>
 #include <asm/inst.h>
 #include <asm/uaccess.h>
-#include <asm/fpu.h>
-#include <asm/fpu_emulator.h>
 
 #define STR(x) __STR(x)
 #define __STR(x)  #x
@@ -1198,7 +1196,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                own_fpu(1);     /* Restore FPU state. */
 
                /* Signal if something went wrong. */
-               process_fpemu_return(res, fault_addr);
+               process_fpemu_return(res, fault_addr, 0);
 
                if (res == 0)
                        break;
@@ -1633,7 +1631,7 @@ fpu_emul:
                own_fpu(1);     /* restore FPU state */
 
                /* If something went wrong, signal */
-               process_fpemu_return(res, fault_addr);
+               process_fpemu_return(res, fault_addr, 0);
 
                if (res == 0)
                        goto success;