diff --git a/[refs] b/[refs] index c2baa3383906..f1f38be7c1d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76e7f79950b54eb17f4041d020811331b7ae1a9e +refs/heads/master: 4af2b1454da7a2feec071a6a50dd957df7d0b7a7 diff --git a/trunk/include/asm-mips/hazards.h b/trunk/include/asm-mips/hazards.h index 918a4894b587..6a5fa32f615b 100644 --- a/trunk/include/asm-mips/hazards.h +++ b/trunk/include/asm-mips/hazards.h @@ -172,6 +172,7 @@ ASMMACRO(tlb_probe_hazard, nop; nop; nop ) ASMMACRO(irq_enable_hazard, + _ssnop; _ssnop; _ssnop; ) ASMMACRO(irq_disable_hazard, nop; nop; nop