---

yaml --- r: 264312 b: refs/heads/master c: 0f4ccbc h: refs/heads/master v: v3
git-mirror · Sep 21, 2011 · b01d537 · b01d537
1 parent 4aa4f19
commit b01d537
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d968275921f9fa7fbc602ac6618ffec6a062ee3c
+refs/heads/master: 0f4ccbc835036cbcc2513585bb2e93ee62e12674
diff --git a/trunk/arch/mips/mm/tlbex.c b/trunk/arch/mips/mm/tlbex.c
@@ -1962,7 +1962,8 @@ static void __cpuinit build_r4000_tlb_load_handler(void)
 			uasm_i_andi(&p, wr.r3, wr.r3, 2);
 			uasm_il_beqz(&p, &r, wr.r3, label_tlbl_goaround2);
 		}
-
+		if (PM_DEFAULT_MASK == 0)
+			uasm_i_nop(&p);
 		/*
 		 * We clobbered C0_PAGEMASK, restore it.  On the other branch
 		 * it is restored in build_huge_tlb_write_entry.