powerpc/kvm: Fix magic page vs. 32-bit RTAS on ppc64

[karo-tx-linux.git] / arch / powerpc / kvm / book3s.c

diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
index c8ead7b9f03b21b62363f138543ce8c7bdbc6b4a..3f2a8360c857f1aae94a13631b2eb099a96795a0 100644 (file)
--- a/arch/powerpc/kvm/book3s.c
+++ b/arch/powerpc/kvm/book3s.c
@@ -291,6 +291,9 @@ pfn_t kvmppc_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn)
 {
        ulong mp_pa = vcpu->arch.magic_page_pa;
 
+       if (!(vcpu->arch.shared->msr & MSR_SF))
+               mp_pa = (uint32_t)mp_pa;
+
        /* Magic page override */
        if (unlikely(mp_pa) &&
            unlikely(((gfn << PAGE_SHIFT) & KVM_PAM) ==