From 4069dd5a3d34606d7a4a3e837bf5df8c9bba8d24 Mon Sep 17 00:00:00 2001
From: Hollis Blanchard <hollisb@us.ibm.com>
Date: Mon, 10 Nov 2008 14:57:34 -0600
Subject: [PATCH] --- yaml --- r: 125226 b: refs/heads/master c:
 bf5d4025c9fe8a64c5905c00bf4292319d634903 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/kvm/44x_tlb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cebda5a679a1..05c9a9da3d0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7cacd40d20849f69c908f1290c714145073685a
+refs/heads/master: bf5d4025c9fe8a64c5905c00bf4292319d634903
diff --git a/trunk/arch/powerpc/kvm/44x_tlb.c b/trunk/arch/powerpc/kvm/44x_tlb.c
index 8b65fbd6c57d..260fa8bc4608 100644
--- a/trunk/arch/powerpc/kvm/44x_tlb.c
+++ b/trunk/arch/powerpc/kvm/44x_tlb.c
@@ -339,7 +339,7 @@ int kvmppc_44x_emul_tlbwe(struct kvm_vcpu *vcpu, u8 ra, u8 rs, u8 ws)
 
 	switch (ws) {
 	case PPC44x_TLB_PAGEID:
-		tlbe->tid = vcpu->arch.mmucr & 0xff;
+		tlbe->tid = get_mmucr_stid(vcpu);
 		tlbe->word0 = vcpu->arch.gpr[rs];
 		break;