---

yaml --- r: 334488 b: refs/heads/master c: fb944c9 h: refs/heads/master v: v3
git-mirror · Oct 16, 2012 · 61292d1 · 61292d1
1 parent 6f74bd5
commit 61292d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01422ff49135e0b747132686405ea8a58f760997
+refs/heads/master: fb944c9ba3f4838a64929a1926822e987b4e44c0
diff --git a/trunk/arch/mips/mm/tlb-r4k.c b/trunk/arch/mips/mm/tlb-r4k.c
@@ -320,6 +320,7 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)
 			tlb_write_random();
 		else
 			tlb_write_indexed();
+		tlbw_use_hazard();
 		write_c0_pagemask(PM_DEFAULT_MASK);
 	} else
 #endif