Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4e91d04 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-for-3.15-1' of... 

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
parents 16a96021 ebc32262

Documentation/virtual/kvm/api.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -2126,7 +2126,7 @@ into the hash PTE second double word). 
4.75 KVM_IRQFD

4.75 KVM_IRQFD





Capability: KVM_CAP_IRQFD

Capability: KVM_CAP_IRQFD

Architectures: x86

Architectures: x86 s390

Type: vm ioctl

Type: vm ioctl

Parameters: struct kvm_irqfd (in)

Parameters: struct kvm_irqfd (in)

Returns: 0 on success, -1 on error

Returns: 0 on success, -1 on error

arch/s390/kvm/kvm-s390.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -158,6 +158,7 @@ int kvm_dev_ioctl_check_extension(long ext) 
	case KVM_CAP_ONE_REG:

	case KVM_CAP_ONE_REG:

	case KVM_CAP_ENABLE_CAP:

	case KVM_CAP_ENABLE_CAP:

	case KVM_CAP_S390_CSS_SUPPORT:

	case KVM_CAP_S390_CSS_SUPPORT:

	case KVM_CAP_IRQFD:

	case KVM_CAP_IOEVENTFD:

	case KVM_CAP_IOEVENTFD:

	case KVM_CAP_DEVICE_CTRL:

	case KVM_CAP_DEVICE_CTRL:

	case KVM_CAP_ENABLE_CAP_VM:

	case KVM_CAP_ENABLE_CAP_VM: