aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby2013-03-03 16:09:07 -0600
committerGreg Kroah-Hartman2013-03-03 16:09:07 -0600
commitd81d788db85abd39fd7753e2482f748c48de202a (patch)
tree65bf7eab8c408bd276ddeace1cfad32464506fec
parent55bce39db26a3b1d6b18fc0ae5d57948946f0c49 (diff)
downloadkernel-common-d81d788db85abd39fd7753e2482f748c48de202a.tar.gz
kernel-common-d81d788db85abd39fd7753e2482f748c48de202a.tar.xz
kernel-common-d81d788db85abd39fd7753e2482f748c48de202a.zip
s390/kvm: Fix store status for ACRS/FPRS fix
In 3.0.67, commit 58c9ce6fad8e00d9726447f939fe7e78e2aec891 (s390/kvm: Fix store status for ACRS/FPRS), upstream commit 15bc8d8457875f495c59d933b05770ba88d1eacb, added a call to save_access_regs to save ACRS. But we do not have ARCS in kvm_run in 3.0 yet, so this results in: arch/s390/kvm/kvm-s390.c: In function 'kvm_s390_vcpu_store_status': arch/s390/kvm/kvm-s390.c:593: error: 'struct kvm_run' has no member named 's' Fix it by saving guest_acrs which is where ARCS are in 3.0. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/s390/kvm/kvm-s390.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 25ab200f4aa..f9804b7aec1 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -590,7 +590,7 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr)
590 * it into the save area 590 * it into the save area
591 */ 591 */
592 save_fp_regs(&vcpu->arch.guest_fpregs); 592 save_fp_regs(&vcpu->arch.guest_fpregs);
593 save_access_regs(vcpu->run->s.regs.acrs); 593 save_access_regs(vcpu->arch.guest_acrs);
594 594
595 if (__guestcopy(vcpu, addr + offsetof(struct save_area, fp_regs), 595 if (__guestcopy(vcpu, addr + offsetof(struct save_area, fp_regs),
596 vcpu->arch.guest_fpregs.fprs, 128, prefix)) 596 vcpu->arch.guest_fpregs.fprs, 128, prefix))