summaryrefslogtreecommitdiffstats
path: root/arch/s390/kvm/interrupt.c
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2017-03-22 18:54:52 +0100
committerChristian Borntraeger <borntraeger@de.ibm.com>2017-03-22 18:54:52 +0100
commit7c2b3e0ddc063f61a201ccb70a121fecc8373a49 (patch)
tree6dfb348a27459cb2058124c1d8417680c194ed54 /arch/s390/kvm/interrupt.c
parent947b897204c417d22ad90e5f354858d78de15a07 (diff)
parent916cda1aa1b412d7cf2991c3af7479544942d121 (diff)
downloadlinux-stable-7c2b3e0ddc063f61a201ccb70a121fecc8373a49.tar.gz
linux-stable-7c2b3e0ddc063f61a201ccb70a121fecc8373a49.tar.bz2
linux-stable-7c2b3e0ddc063f61a201ccb70a121fecc8373a49.zip
Merge remote-tracking branch 's390/guarded-storage' into kvms390/next
Diffstat (limited to 'arch/s390/kvm/interrupt.c')
-rw-r--r--arch/s390/kvm/interrupt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 0f8f14199734..169558dc7daf 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -420,8 +420,8 @@ static int __write_machine_check(struct kvm_vcpu *vcpu,
save_access_regs(vcpu->run->s.regs.acrs);
/* Extended save area */
- rc = read_guest_lc(vcpu, __LC_VX_SAVE_AREA_ADDR, &ext_sa_addr,
- sizeof(unsigned long));
+ rc = read_guest_lc(vcpu, __LC_MCESAD, &ext_sa_addr,
+ sizeof(unsigned long));
/* Only bits 0-53 are used for address formation */
ext_sa_addr &= ~0x3ffUL;
if (!rc && mci.vr && ext_sa_addr && test_kvm_facility(vcpu->kvm, 129)) {