summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2015-04-07 18:10:03 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2015-04-07 18:10:03 +0200
commit7f22b45d66b8e603e2e85e78f209531779f8b1cc (patch)
tree6abed0cec23ed9c6bb5a1e3dbfd15b4345fa9b62 /virt
parentbf0fb67cf957fc8ecfaaa2819b7d6a0f795e2ef2 (diff)
parent816c7667ea97c61884e014cfeedaede5b67b0e58 (diff)
downloadop-kernel-dev-7f22b45d66b8e603e2e85e78f209531779f8b1cc.zip
op-kernel-dev-7f22b45d66b8e603e2e85e78f209531779f8b1cc.tar.gz
Merge tag 'kvm-s390-next-20150331' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
Features and fixes for 4.1 (kvm/next) 1. Assorted changes 1.1 allow more feature bits for the guest 1.2 Store breaking event address on program interrupts 2. Interrupt handling rework 2.1 Fix copy_to_user while holding a spinlock (cc stable) 2.2 Rework floating interrupts to follow the priorities 2.3 Allow to inject all local interrupts via new ioctl 2.4 allow to get/set the full local irq state, e.g. for migration and introspection
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index efe59ae..0d06b7b 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2113,7 +2113,7 @@ static long kvm_vcpu_ioctl(struct file *filp,
* Special cases: vcpu ioctls that are asynchronous to vcpu execution,
* so vcpu_load() would break it.
*/
- if (ioctl == KVM_S390_INTERRUPT || ioctl == KVM_INTERRUPT)
+ if (ioctl == KVM_S390_INTERRUPT || ioctl == KVM_S390_IRQ || ioctl == KVM_INTERRUPT)
return kvm_arch_vcpu_ioctl(filp, ioctl, arg);
#endif
OpenPOWER on IntegriCloud