Hi,
On 30/08/2016 19:54, Marc Zyngier wrote:
> 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: Marc Zyngier <marc.zyngier@xxxxxxx>
> ---
> virt/kvm/arm/vgic/vgic-irqfd.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/virt/kvm/arm/vgic/vgic-irqfd.c b/virt/kvm/arm/vgic/vgic-irqfd.c
> index b31a51a..d918dcf 100644
> --- a/virt/kvm/arm/vgic/vgic-irqfd.c
> +++ b/virt/kvm/arm/vgic/vgic-irqfd.c
> @@ -46,15 +46,9 @@ static int vgic_irqfd_set_irq(struct kvm_kernel_irq_routing_entry *e,
> * @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;
>
>
Reviewed-by: Eric Auger <eric.auger@xxxxxxxxxx>
Thanks
Eric
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
