Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / include / asm-mips / hazards.h

diff --git a/include/asm-mips/hazards.h b/include/asm-mips/hazards.h
index 0fe02945feba0b8a18868126a99d977558294d33..e50c77e69cb5c11c9ef99a9253102d89d047e62f 100644 (file)
--- a/include/asm-mips/hazards.h
+++ b/include/asm-mips/hazards.h
@@ -52,6 +52,7 @@ ASMMACRO(tlb_probe_hazard,
         _ehb
        )
 ASMMACRO(irq_enable_hazard,
+        _ehb
        )
 ASMMACRO(irq_disable_hazard,
        _ehb
@@ -157,7 +158,7 @@ ASMMACRO(back_to_back_c0_hazard,
  * processors.
  */
 ASMMACRO(mtc0_tlbw_hazard,
-       nop
+       nop; nop
        )
 ASMMACRO(tlbw_use_hazard,
        nop; nop; nop