From 5c17585f50aa2d3b300f603e579933887deccf82 Mon Sep 17 00:00:00 2001
From: Kurt Martin <kurt@mips.com>
Date: Wed, 8 Jul 2009 19:22:35 -0700
Subject: [PATCH] --- yaml --- r: 156394 b: refs/heads/master c:
 d8e5f9fe5dab0e07985f2456cb6cc57788f53131 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a1a1e32212c8..3905cb81f6f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 008ee96f1204225503934cb57ac38c49f519c7ab
+refs/heads/master: d8e5f9fe5dab0e07985f2456cb6cc57788f53131
diff --git a/trunk/arch/mips/kernel/smtc.c b/trunk/arch/mips/kernel/smtc.c
index 8a0626cbb108..c16bb6d6c25c 100644
--- a/trunk/arch/mips/kernel/smtc.c
+++ b/trunk/arch/mips/kernel/smtc.c
@@ -465,11 +465,8 @@ void smtc_prepare_cpus(int cpus)
 	smtc_configure_tlb();
 
 	for (tc = 0, vpe = 0 ; (vpe < nvpe) && (tc < ntc) ; vpe++) {
-		/*
-		 * Set the MVP bits.
-		 */
-		settc(tc);
-		write_vpe_c0_vpeconf0(read_vpe_c0_vpeconf0() | VPECONF0_MVP);
+		if (tcpervpe[vpe] == 0)
+			continue;
 		if (vpe != 0)
 			printk(", ");
 		printk("VPE %d: TC", vpe);
@@ -487,6 +484,12 @@ void smtc_prepare_cpus(int cpus)
 			tc++;
 		}
 		if (vpe != 0) {
+			/*
+			 * Allow this VPE to control others.
+			 */
+			write_vpe_c0_vpeconf0(read_vpe_c0_vpeconf0() |
+					      VPECONF0_MVP);
+
 			/*
 			 * Clear any stale software interrupts from VPE's Cause
 			 */