From 51ec188b7c5e4e1cbbe1de968fb554c8d6246e16 Mon Sep 17 00:00:00 2001
From: Stuart Menefy <stuart.menefy@st.com>
Date: Mon, 26 Nov 2007 21:32:40 +0900
Subject: [PATCH] --- yaml --- r: 77807 b: refs/heads/master c:
 eddeeb32fe303910c58c4e3c27fde4b6f1503350 h: refs/heads/master i:   77805:
 081a01827b15209c1b188dc23c45ea2d0f9ccb53   77803:
 b76dab60135893f6a801404d97b63b3f69a98cad   77799:
 ca5782b7b61561224faaf69bf75278b463518192   77791:
 ce2cd14ecd7efdb2ee0f2fc03e2b7d14d05a7788 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/sh/mm/pmb.c                     | 6 ++++++
 trunk/include/asm-sh/cpu-sh4/mmu_context.h | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e8f5906a9729..cc238aaddfa7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a2eacb75946e0ebb81dfb36b50b5bec1c3cb50f
+refs/heads/master: eddeeb32fe303910c58c4e3c27fde4b6f1503350
diff --git a/trunk/arch/sh/mm/pmb.c b/trunk/arch/sh/mm/pmb.c
index 1d45b82f0a63..b632051d6ce5 100644
--- a/trunk/arch/sh/mm/pmb.c
+++ b/trunk/arch/sh/mm/pmb.c
@@ -27,6 +27,7 @@
 #include <asm/pgtable.h>
 #include <asm/mmu.h>
 #include <asm/io.h>
+#include <asm/mmu_context.h>
 
 #define NR_PMB_ENTRIES	16
 
@@ -329,6 +330,11 @@ static int __init pmb_init(void)
 	/* PMB.SE and UB[7] */
 	ctrl_outl((1 << 31) | (1 << 7), PMB_PASCR);
 
+	/* Flush out the TLB */
+	i =  ctrl_inl(MMUCR);
+	i |= MMUCR_TI;
+	ctrl_outl(i, MMUCR);
+
 	back_to_P1();
 
 	return 0;
diff --git a/trunk/include/asm-sh/cpu-sh4/mmu_context.h b/trunk/include/asm-sh/cpu-sh4/mmu_context.h
index 979acddc0f8e..fdd56e3e3a3b 100644
--- a/trunk/include/asm-sh/cpu-sh4/mmu_context.h
+++ b/trunk/include/asm-sh/cpu-sh4/mmu_context.h
@@ -22,6 +22,8 @@
 #define MMU_UTLB_ADDRESS_ARRAY	0xF6000000
 #define MMU_PAGE_ASSOC_BIT	0x80
 
+#define MMUCR_TI		(1<<2)
+
 #ifdef CONFIG_X2TLB
 #define MMUCR_ME		(1 << 7)
 #else