9 files changed, 27 insertions, 26 deletions

diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index a9c6de1b9542..457565162dd5 100644
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -87,7 +87,7 @@ FEXPORT(restore_all)			# restore full frame
         ori     v1, v0, TCSTATUS_IXMT
         mtc0    v1, CP0_TCSTATUS
         andi    v0, TCSTATUS_IXMT
-        ehb
+        _ehb
         mfc0    t0, CP0_TCCONTEXT
         DMT     9                               # dmt t1
         jal     mips_ihb
@@ -95,7 +95,7 @@ FEXPORT(restore_all)			# restore full frame
         andi    t3, t0, 0xff00
         or      t2, t2, t3
         mtc0    t2, CP0_STATUS
-        ehb
+        _ehb
         andi    t1, t1, VPECONTROL_TE
         beqz    t1, 1f
         EMT
@@ -105,7 +105,7 @@ FEXPORT(restore_all)			# restore full frame
         xori    v1, v1, TCSTATUS_IXMT
         or      v1, v0, v1
         mtc0    v1, CP0_TCSTATUS
-        ehb
+        _ehb
         xor     t0, t0, t3
         mtc0    t0, CP0_TCCONTEXT
 #endif /* CONFIG_MIPS_MT_SMTC */
diff --git a/arch/mips/kernel/gdb-low.S b/arch/mips/kernel/gdb-low.S
index 5fd7a8af0c62..8760131f89d9 100644
--- a/arch/mips/kernel/gdb-low.S
+++ b/arch/mips/kernel/gdb-low.S
@@ -291,7 +291,7 @@
                 ori     t1, t2, TCSTATUS_IXMT
                 mtc0    t1, CP0_TCSTATUS
                 andi    t2, t2, TCSTATUS_IXMT
-                ehb
+                _ehb
                 DMT     9                               # dmt   t1
                 jal     mips_ihb
                 nop
@@ -310,7 +310,7 @@
                 xori    t1, t1, TCSTATUS_IXMT
                 or      t1, t1, t2
                 mtc0    t1, CP0_TCSTATUS
-                ehb
+                _ehb
 #endif /* CONFIG_MIPS_MT_SMTC */
                 LONG_L  v0, GDB_FR_STATUS(sp)
                 LONG_L  v1, GDB_FR_EPC(sp)
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index ff7af369f286..6888cde560af 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -214,7 +214,7 @@ NESTED(except_vec_vi_handler, 0, sp)
         mtc0    t0, CP0_TCCONTEXT
         xor     t1, t1, t0
         mtc0    t1, CP0_STATUS
-        ehb
+        _ehb
 #endif /* CONFIG_MIPS_MT_SMTC */
         CLI
         move    a0, sp
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
index bdf6f6eff721..c018098c9a56 100644
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -96,7 +96,7 @@
         /* Clear TKSU, leave IXMT */
         xori    t0, 0x00001800
         mtc0    t0, CP0_TCSTATUS
-        ehb
+        _ehb
         /* We need to leave the global IE bit set, but clear EXL...*/
         mfc0    t0, CP0_STATUS
         or      t0, ST0_CU0 | ST0_EXL | ST0_ERL | \set | \clr
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S
index db94e556fc97..e1b85e6c486a 100644
--- a/arch/mips/kernel/r4k_switch.S
+++ b/arch/mips/kernel/r4k_switch.S
@@ -94,7 +94,7 @@
         ori     t1, t2, TCSTATUS_IXMT
         mtc0    t1, CP0_TCSTATUS
         andi    t2, t2, TCSTATUS_IXMT
-        ehb
+        _ehb
         DMT     8                               # dmt   t0
         move    t1,ra
         jal     mips_ihb
@@ -109,7 +109,7 @@
         or      a2, t1
         mtc0    a2, CP0_STATUS
 #ifdef CONFIG_MIPS_MT_SMTC
-        ehb
+        _ehb
         andi    t0, t0, VPECONTROL_TE
         beqz    t0, 1f
         emt
@@ -118,7 +118,7 @@
         xori    t1, t1, TCSTATUS_IXMT
         or      t1, t1, t2
         mtc0    t1, CP0_TCSTATUS
-        ehb
+        _ehb
 #endif /* CONFIG_MIPS_MT_SMTC */
         move    v0, a0
         jr      ra
diff --git a/arch/mips/kernel/smtc-asm.S b/arch/mips/kernel/smtc-asm.S
index c9d65196d917..72c6d98f8854 100644
--- a/arch/mips/kernel/smtc-asm.S
+++ b/arch/mips/kernel/smtc-asm.S
@@ -52,12 +52,12 @@ FEXPORT(__smtc_ipi_vector)
         .set    noat
         /* Disable thread scheduling to make Status update atomic */
         DMT     27                                      # dmt   k1
-        ehb
+        _ehb
         /* Set EXL */
         mfc0    k0,CP0_STATUS
         ori     k0,k0,ST0_EXL
         mtc0    k0,CP0_STATUS
-        ehb
+        _ehb
         /* Thread scheduling now inhibited by EXL. Restore TE state. */
         andi    k1,k1,VPECONTROL_TE
         beqz    k1,1f
@@ -82,7 +82,7 @@ FEXPORT(__smtc_ipi_vector)
         li      k1,ST0_CU0
         or      k1,k1,k0
         mtc0    k1,CP0_STATUS
-        ehb
+        _ehb
         get_saved_sp
         /* Interrupting TC will have pre-set values in slots in the new frame */
 2:      subu    k1,k1,PT_SIZE
@@ -90,7 +90,7 @@ FEXPORT(__smtc_ipi_vector)
         lw      k0,PT_TCSTATUS(k1)
         /* Write it to TCStatus to restore CU/KSU/IXMT state */
         mtc0    k0,$2,1
-        ehb
+        _ehb
         lw      k0,PT_EPC(k1)
         mtc0    k0,CP0_EPC
         /* Save all will redundantly recompute the SP, but use it for now */
@@ -116,7 +116,7 @@ LEAF(self_ipi)
         mfc0    t0,CP0_TCSTATUS
         ori     t1,t0,TCSTATUS_IXMT
         mtc0    t1,CP0_TCSTATUS
-        ehb
+        _ehb
         /* We know we're in kernel mode, so prepare stack frame */
         subu    t1,sp,PT_SIZE
         sw      ra,PT_EPC(t1)
diff --git a/include/asm-mips/asmmacro.h b/include/asm-mips/asmmacro.h
index 2c42f6b00a49..92e62ef711ed 100644
--- a/include/asm-mips/asmmacro.h
+++ b/include/asm-mips/asmmacro.h
@@ -26,14 +26,14 @@
         ori     \reg, \reg, TCSTATUS_IXMT
         xori    \reg, \reg, TCSTATUS_IXMT
         mtc0    \reg, CP0_TCSTATUS
-        ehb
+        _ehb
         .endm
 
         .macro  local_irq_disable reg=t0
         mfc0    \reg, CP0_TCSTATUS
         ori     \reg, \reg, TCSTATUS_IXMT
         mtc0    \reg, CP0_TCSTATUS
-        ehb
+        _ehb
         .endm
 #else
         .macro  local_irq_enable reg=t0
diff --git a/include/asm-mips/mipsregs.h b/include/asm-mips/mipsregs.h
index 673977901ed3..9192d76c133d 100644
--- a/include/asm-mips/mipsregs.h
+++ b/include/asm-mips/mipsregs.h
@@ -1459,7 +1459,8 @@ static inline void __emt(unsigned int previous)
 static inline void __ehb(void)
 {
         __asm__ __volatile__(
-        "       ehb                                                     \n");
+        "       .set    mips32r2                                        \n"
+        "       ehb                                                     \n"             "       .set    mips0                                           \n");
 }
 
 /*
diff --git a/include/asm-mips/stackframe.h b/include/asm-mips/stackframe.h
index 513aa5133830..158a4cd12e46 100644
--- a/include/asm-mips/stackframe.h
+++ b/include/asm-mips/stackframe.h
@@ -304,7 +304,7 @@
                 mfc0    v0, CP0_TCSTATUS
                 ori     v0, TCSTATUS_IXMT
                 mtc0    v0, CP0_TCSTATUS
-                ehb
+                _ehb
                 DMT     5                               # dmt a1
                 jal     mips_ihb
 #endif /* CONFIG_MIPS_MT_SMTC */
@@ -325,14 +325,14 @@
  * restore TCStatus.IXMT.
  */
                 LONG_L  v1, PT_TCSTATUS(sp)
-                ehb
+                _ehb
                 mfc0    v0, CP0_TCSTATUS
                 andi    v1, TCSTATUS_IXMT
                 /* We know that TCStatua.IXMT should be set from above */
                 xori    v0, v0, TCSTATUS_IXMT
                 or      v0, v0, v1
                 mtc0    v0, CP0_TCSTATUS
-                ehb
+                _ehb
                 andi    a1, a1, VPECONTROL_TE
                 beqz    a1, 1f
                 emt
@@ -411,7 +411,7 @@
                 /* Clear TKSU, leave IXMT */
                 xori    t0, 0x00001800
                 mtc0    t0, CP0_TCSTATUS
-                ehb
+                _ehb
                 /* We need to leave the global IE bit set, but clear EXL...*/
                 mfc0    t0, CP0_STATUS
                 ori     t0, ST0_EXL | ST0_ERL
@@ -438,7 +438,7 @@
                  * and enable interrupts only for the
                  * current TC, using the TCStatus register.
                  */
-                ehb
+                _ehb
                 mfc0    t0,CP0_TCSTATUS
                 /* Fortunately CU 0 is in the same place in both registers */
                 /* Set TCU0, TKSU (for later inversion) and IXMT */
@@ -447,7 +447,7 @@
                 /* Clear TKSU *and* IXMT */
                 xori    t0, 0x00001c00
                 mtc0    t0, CP0_TCSTATUS
-                ehb
+                _ehb
                 /* We need to leave the global IE bit set, but clear EXL...*/
                 mfc0    t0, CP0_STATUS
                 ori     t0, ST0_EXL
@@ -479,7 +479,7 @@
                 andi    v1, v0, TCSTATUS_IXMT
                 ori     v0, TCSTATUS_IXMT
                 mtc0    v0, CP0_TCSTATUS
-                ehb
+                _ehb
                 DMT     2                               # dmt   v0
                 /*
                  * We don't know a priori if ra is "live"
@@ -495,7 +495,7 @@
                 xori    t0, 0x1e
                 mtc0    t0, CP0_STATUS
 #ifdef CONFIG_MIPS_MT_SMTC
-                ehb
+                _ehb
                 andi    v0, v0, VPECONTROL_TE
                 beqz    v0, 2f
                 nop     /* delay slot */