p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
Marc Zyngier 2016-07-24 10:34:08 +01:00
parent 995a0ee980
commit 3f312db6b6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
virt/kvm/arm/vgic/vgic-irqfd.c
View File

@ -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 * kvm_set_routing_entry: populate a kvm routing entry
* from a user routing entry * from a user routing entry
* *
* @kvm: the VM this entry is applied to
* @e: kvm kernel routing entry handle * @e: kvm kernel routing entry handle
* @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,
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, int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,
const struct kvm_irq_routing_entry *ue) const struct kvm_irq_routing_entry *ue)
#endif
{ {
int r = -EINVAL; int r = -EINVAL;