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

Commit 55d7cad6 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

KVM: arm: vgic: Drop build compatibility hack for older kernel versions 



As kvm_set_routing_entry() was changing prototype between 4.7 and 4.8,
an ugly hack was put in place in order to survive both building in
-next and the merge window.

Now that everything has been merged, let's dump the compatibility
hack for good.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 68381b2b

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -46,15 +46,9 @@ static int vgic_irqfd_set_irq(struct kvm_kernel_irq_routing_entry *e, 
 * @ue: user api routing entry handle

 * @ue: user api routing entry handle

 * return 0 on success, -EINVAL on errors.

 * return 0 on success, -EINVAL on errors.

 */

 */

#ifdef KVM_CAP_X2APIC_API

int kvm_set_routing_entry(struct kvm *kvm,

int kvm_set_routing_entry(struct kvm *kvm,

			  struct kvm_kernel_irq_routing_entry *e,

			  struct kvm_kernel_irq_routing_entry *e,

			  const struct kvm_irq_routing_entry *ue)

			  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;

	int r = -EINVAL;