summaryrefslogtreecommitdiffstats
path: root/arch/mips/mm/tlb-r4k.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-11-17 04:27:58 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2012-11-17 04:27:58 +0100
commitd05f06e60df4f56a70fb8a3e46335b40687169e9 (patch)
treec1eec6749fed86a21b08606e1e4acefe4b033253 /arch/mips/mm/tlb-r4k.c
parentMerge branch 'arch-s390' into no-rebases (diff)
parentfrv: fix the broken preempt (diff)
downloadlinux-d05f06e60df4f56a70fb8a3e46335b40687169e9.tar.xz
linux-d05f06e60df4f56a70fb8a3e46335b40687169e9.zip
Merge branch 'arch-frv' into no-rebases
Diffstat (limited to 'arch/mips/mm/tlb-r4k.c')
-rw-r--r--arch/mips/mm/tlb-r4k.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index 87b9cfcc30ff..4b9b935a070e 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/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