diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2014-10-29 13:31:32 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-10-29 13:31:32 +0100 |
| commit | f62c95fd4041d669159dd76ac0bb2a7f86b5b05d (patch) | |
| tree | 4cafca57508bd051e6320631dc8039b3ebdd4d84 /arch/s390/kvm/interrupt.c | |
| parent | KVM: nVMX: Disable preemption while reading from shadow VMCS (diff) | |
| parent | KVM: s390: sigp: split handling of SIGP STOP (AND STORE STATUS) (diff) | |
| download | linux-dev-f62c95fd4041d669159dd76ac0bb2a7f86b5b05d.tar.xz linux-dev-f62c95fd4041d669159dd76ac0bb2a7f86b5b05d.zip | |
Merge tag 'kvm-s390-next-20141028' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Fixes and cleanups
1. A small fix regarding program check handling (cc stable as it
overwrites the wrong guest memory)
2. Improve the ipte interlock scalability for older hardware
3. current->mm to mm cleanup (currently a no-op)
4. several SIGP rework patches (more to come)
Diffstat (limited to 'arch/s390/kvm/interrupt.c')
| -rw-r--r-- | arch/s390/kvm/interrupt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index a39838457f01..4fc3fed636dc 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -270,7 +270,7 @@ static int __must_check __deliver_prog_irq(struct kvm_vcpu *vcpu, break; case PGM_MONITOR: rc = put_guest_lc(vcpu, pgm_info->mon_class_nr, - (u64 *)__LC_MON_CLASS_NR); + (u16 *)__LC_MON_CLASS_NR); rc |= put_guest_lc(vcpu, pgm_info->mon_code, (u64 *)__LC_MON_CODE); break; |