Merge branch '4.1-fp' into mips-for-linux-next

[cascardo/linux.git] / arch / mips / kernel / genex.S

diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index 86e2242..50e9db6 100644 (file)
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -360,7 +360,7 @@ NESTED(nmi_handler, PT_SIZE, sp)
        .set    mips1
        SET_HARDFLOAT
        cfc1    a1, fcr31
-       li      a2, ~(0x3f << 12)
+       li      a2, ~FPU_CSR_ALL_X
        and     a2, a1
        ctc1    a2, fcr31
        .set    pop