From 61292d178cb39179c2522d0bfd4c0b8f9504924a Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 17 Oct 2012 01:01:21 +0200
Subject: [PATCH] --- yaml --- r: 334488 b: refs/heads/master c:
 fb944c9ba3f4838a64929a1926822e987b4e44c0 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/mips/mm/tlb-r4k.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5b0e76de5f59..a53dd81f5e94 100644
--- 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
index 87b9cfcc30ff..4b9b935a070e 100644
--- 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