diff --git a/[refs] b/[refs] index b8b960336886..3c71f010e7b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e4dafd5d169ea2d5b066e38b5f8f9e416dc9eaa +refs/heads/master: 7b0fdaa6a193e0b07d9f72e942f51ce25d9e0387 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