diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-09-05 10:15:22 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-09-05 10:15:22 -0400 |
| commit | 20218b86ad8adb4bf71db9425bb59680f345eafd (patch) | |
| tree | 5309274811f0a8170388658707a8ce61c7933cb2 | |
| parent | e12c8f36f3f7a60d55938c5aed5999278fa92bcb (diff) | |
| parent | 4d21cef3ea00ba3ac508eb61fb8db70e3e31df67 (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index c106488b4137..d8673e243f13 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) | |||
| 584 | /* Validity 0x0044 will be checked by SIE */ | 584 | /* Validity 0x0044 will be checked by SIE */ |
| 585 | if (rc) | 585 | if (rc) |
| 586 | goto unpin; | 586 | goto unpin; |
| 587 | scb_s->gvrd = hpa; | 587 | scb_s->riccbd = hpa; |
| 588 | } | 588 | } |
| 589 | return 0; | 589 | return 0; |
| 590 | unpin: | 590 | unpin: |