KVM: PPC: e500: MMU API

[cascardo/linux.git] / arch / powerpc / kvm / e500.c

diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c
index 8c0d45a..f17d7e7 100644 (file)
--- a/arch/powerpc/kvm/e500.c
+++ b/arch/powerpc/kvm/e500.c
@@ -121,7 +121,7 @@ void kvmppc_core_get_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
        sregs->u.e.mas0 = vcpu_e500->mas0;
        sregs->u.e.mas1 = vcpu_e500->mas1;
        sregs->u.e.mas2 = vcpu_e500->mas2;
-       sregs->u.e.mas7_3 = ((u64)vcpu_e500->mas7 << 32) | vcpu_e500->mas3;
+       sregs->u.e.mas7_3 = vcpu_e500->mas7_3;
        sregs->u.e.mas4 = vcpu_e500->mas4;
        sregs->u.e.mas6 = vcpu_e500->mas6;
 
@@ -154,8 +154,7 @@ int kvmppc_core_set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
                vcpu_e500->mas0 = sregs->u.e.mas0;
                vcpu_e500->mas1 = sregs->u.e.mas1;
                vcpu_e500->mas2 = sregs->u.e.mas2;
-               vcpu_e500->mas7 = sregs->u.e.mas7_3 >> 32;
-               vcpu_e500->mas3 = (u32)sregs->u.e.mas7_3;
+               vcpu_e500->mas7_3 = sregs->u.e.mas7_3;
                vcpu_e500->mas4 = sregs->u.e.mas4;
                vcpu_e500->mas6 = sregs->u.e.mas6;
        }