diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2014-05-15 14:46:57 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-15 14:46:57 +0200 |
| commit | a4e91d04b86504f145cc5f766c2609357a68b186 (patch) | |
| tree | 4578a55a253be7245ea294b68a07c82da820dfa4 | |
| parent | KVM: x86: disable master clock if TSC is reset during suspend (diff) | |
| parent | KVM: s390: announce irqfd capability (diff) | |
| download | wireguard-linux-a4e91d04b86504f145cc5f766c2609357a68b186.tar.xz wireguard-linux-a4e91d04b86504f145cc5f766c2609357a68b186.zip | |
Merge tag 'kvm-s390-for-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master
Here is a fix that aligns the irqfd code changes for 3.15
with the right capability number. irqfd for s390x was
introduced with 3.15-rc1, so this fix should still go into
Linus tree for 3.15
| -rw-r--r-- | Documentation/virtual/kvm/api.txt | 2 | ||||
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index a9380ba54c8e..b4f53653c106 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt @@ -2126,7 +2126,7 @@ into the hash PTE second double word). 4.75 KVM_IRQFD Capability: KVM_CAP_IRQFD -Architectures: x86 +Architectures: x86 s390 Type: vm ioctl Parameters: struct kvm_irqfd (in) Returns: 0 on success, -1 on error diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index b3ecb8f5b6ce..9ae6664ff08c 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -158,6 +158,7 @@ int kvm_dev_ioctl_check_extension(long ext) case KVM_CAP_ONE_REG: case KVM_CAP_ENABLE_CAP: case KVM_CAP_S390_CSS_SUPPORT: + case KVM_CAP_IRQFD: case KVM_CAP_IOEVENTFD: case KVM_CAP_DEVICE_CTRL: case KVM_CAP_ENABLE_CAP_VM: |