From ce366c77067f343de77f47d3003539578c4b55d5 Mon Sep 17 00:00:00 2001 From: Mihai Caraman Date: Thu, 11 Oct 2012 06:13:24 +0000 Subject: [PATCH] --- yaml --- r: 343585 b: refs/heads/master c: 9e2fa646936160eca525bcb80c2cce05faa9b208 h: refs/heads/master i: 343583: 882a261317be0f50e3bcfa9f4d02523352030955 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/e500_tlb.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e2b09f27117f..913ba16f5a97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8823a8fd0d730612f12a87102503622c01eb2468 +refs/heads/master: 9e2fa646936160eca525bcb80c2cce05faa9b208 diff --git a/trunk/arch/powerpc/kvm/e500_tlb.c b/trunk/arch/powerpc/kvm/e500_tlb.c index 7a1472163120..cf3f18012371 100644 --- a/trunk/arch/powerpc/kvm/e500_tlb.c +++ b/trunk/arch/powerpc/kvm/e500_tlb.c @@ -871,6 +871,8 @@ int kvmppc_e500_emul_tlbwe(struct kvm_vcpu *vcpu) gtlbe->mas1 = vcpu->arch.shared->mas1; gtlbe->mas2 = vcpu->arch.shared->mas2; + if (!(vcpu->arch.shared->msr & MSR_CM)) + gtlbe->mas2 &= 0xffffffffUL; gtlbe->mas7_3 = vcpu->arch.shared->mas7_3; trace_kvm_booke206_gtlb_write(vcpu->arch.shared->mas0, gtlbe->mas1,