1 files changed, 11 insertions, 3 deletions

diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index 31fa856829cb..47d7583cd67f 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -374,12 +374,20 @@ NESTED(except_vec_nmi, 0, sp)
 NESTED(nmi_handler, PT_SIZE, sp)
         .set    push
         .set    noat
+        /*
+         * Clear ERL - restore segment mapping
+         * Clear BEV - required for page fault exception handler to work
+         */
+        mfc0    k0, CP0_STATUS
+        ori     k0, k0, ST0_EXL
+        li      k1, ~(ST0_BEV | ST0_ERL)
+        and     k0, k0, k1
+        mtc0    k0, CP0_STATUS
+        _ehb
         SAVE_ALL
         move    a0, sp
         jal     nmi_exception_handler
-        RESTORE_ALL
-        .set    mips3
-        eret
+        /* nmi_exception_handler never returns */
         .set    pop
         END(nmi_handler)