aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-09-05 16:15:22 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2016-09-05 16:15:22 +0200
commit20218b86ad8adb4bf71db9425bb59680f345eafd (patch)
tree5309274811f0a8170388658707a8ce61c7933cb2
parente12c8f36f3f7a60d55938c5aed5999278fa92bcb (diff)
parent4d21cef3ea00ba3ac508eb61fb8db70e3e31df67 (diff)
downloadlinux-20218b86ad8adb4bf71db9425bb59680f345eafd.tar.gz
Merge tag 'kvm-s390-master-4.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master
A bugfix for the vsie code (setting the wrong field).
-rw-r--r--arch/s390/kvm/vsie.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
index c106488b41371b..d8673e243f13bf 100644
--- a/arch/s390/kvm/vsie.c
+++ b/arch/s390/kvm/vsie.c
@@ -584,7 +584,7 @@ static int pin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
/* Validity 0x0044 will be checked by SIE */
if (rc)
goto unpin;
- scb_s->gvrd = hpa;
+ scb_s->riccbd = hpa;
}
return 0;
unpin: