From c648eeba672dbc43666ef165c3a87b23115aaeea Mon Sep 17 00:00:00 2001
From: Elizabeth Oldham <beth@mips.com>
Date: Thu, 17 Aug 2006 12:39:21 +0100
Subject: [PATCH] --- yaml --- r: 36014 b: refs/heads/master c:
 a94d702049569401c65b579d0751ce282f962b41 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/mips/kernel/vpe.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 583ec4cc5635..4aaa8f91d6c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e74bae9a0c2fc59ffb0e25fec074b4ac0ac7048
+refs/heads/master: a94d702049569401c65b579d0751ce282f962b41
diff --git a/trunk/arch/mips/kernel/vpe.c b/trunk/arch/mips/kernel/vpe.c
index 9ee0ec2cd067..51ddd2166898 100644
--- a/trunk/arch/mips/kernel/vpe.c
+++ b/trunk/arch/mips/kernel/vpe.c
@@ -768,10 +768,16 @@ int vpe_run(struct vpe * v)
 	 */
  	write_tc_c0_tcbind((read_tc_c0_tcbind() & ~TCBIND_CURVPE) | v->minor);
 
+	write_vpe_c0_vpeconf0(read_vpe_c0_vpeconf0() & ~(VPECONF0_VPA));
+
+	back_to_back_c0_hazard();
+
         /* Set up the XTC bit in vpeconf0 to point at our tc */
         write_vpe_c0_vpeconf0( (read_vpe_c0_vpeconf0() & ~(VPECONF0_XTC))
                                | (t->index << VPECONF0_XTC_SHIFT));
 
+	back_to_back_c0_hazard();
+
         /* enable this VPE */
         write_vpe_c0_vpeconf0(read_vpe_c0_vpeconf0() | VPECONF0_VPA);