1 files changed, 2 insertions, 0 deletions

diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c
index 7a1472163120..cf3f18012371 100644
--- a/arch/powerpc/kvm/e500_tlb.c
+++ b/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,