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

Commit 3f312db6 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm: vgic-irqfd: Workaround changing kvm_set_routing_entry prototype 



kvm_set_routing_entry is changing in -next, and causes things to
explode. Add a temporary workaround that should be dropped when
we hit 4.8-rc1

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 995a0ee9

virt/kvm/arm/vgic/vgic-irqfd.c

+8 −0
Original line number Diff line number Diff line
@@ -41,12 +41,20 @@ static int vgic_irqfd_set_irq(struct kvm_kernel_irq_routing_entry *e, 
 * kvm_set_routing_entry: populate a kvm routing entry

 * from a user routing entry

 *

 * @kvm: the VM this entry is applied to

 * @e: kvm kernel routing entry handle

 * @ue: user api routing entry handle

 * return 0 on success, -EINVAL on errors.

 */

#ifdef KVM_CAP_X2APIC_API

int kvm_set_routing_entry(struct kvm *kvm,

			  struct kvm_kernel_irq_routing_entry *e,

			  const struct kvm_irq_routing_entry *ue)

#else

/* Remove this version and the ifdefery once merged into 4.8 */

int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,

			  const struct kvm_irq_routing_entry *ue)

#endif

{

	int r = -EINVAL;