From 578f9b1121f5581603e79f1f0beb804b633b5863 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 19 Jan 2007 14:35:14 +0000
Subject: [PATCH] --- yaml --- r: 45805 b: refs/heads/master c:
 a0b6218037b5cf50737a7dc0fc5464ea3f8781cd h: refs/heads/master i:   45803:
 9defeb65fee31709c9afcc2c8338d68e551eba6f v: v3

---
 [refs]                        | 2 +-
 trunk/arch/mips/kernel/smtc.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bf6d0c96a7b8..58bf8e1ea4b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89c07fd14fe857c223b042a857a08c3ea46b92eb
+refs/heads/master: a0b6218037b5cf50737a7dc0fc5464ea3f8781cd
diff --git a/trunk/arch/mips/kernel/smtc.c b/trunk/arch/mips/kernel/smtc.c
index 44238ab2fc99..c37e83b173e9 100644
--- a/trunk/arch/mips/kernel/smtc.c
+++ b/trunk/arch/mips/kernel/smtc.c
@@ -270,9 +270,12 @@ void smtc_configure_tlb(void)
 		 * of their initialization in smtc_cpu_setup().
 		 */
 
-		tlbsiz = tlbsiz & 0x3f;	/* MIPS32 limits TLB indices to 64 */
-		cpu_data[0].tlbsize = tlbsiz;
+		/* MIPS32 limits TLB indices to 64 */
+		if (tlbsiz > 64)
+			tlbsiz = 64;
+		cpu_data[0].tlbsize = current_cpu_data.tlbsize = tlbsiz;
 		smtc_status |= SMTC_TLB_SHARED;
+		local_flush_tlb_all();
 
 		printk("TLB of %d entry pairs shared by %d VPEs\n",
 			tlbsiz, vpes);