Re: [PATCH] KVM: EVENTFD: Only conditionally remove inclusion of irq.h
Il 22/09/2014 23:33, Christoffer Dall ha scritto: Commit c77dcac KVM: Move more code under CONFIG_HAVE_KVM_IRQFD added functionality that depends on definitions in ioapic.h when __KVM_HAVE_IOAPIC is defined. At the same time, 0ba0951 KVM: EVENTFD: remove inclusion of irq.h removed the inclusion of irq.h unconditionally, which happened to include ioapic.h. Instead, include ioapic.h directly in eventfd.c if __KVM_HAVE_IOAPIC is defined. Signed-off-by: Christoffer Dall christoffer.d...@linaro.org --- virt/kvm/eventfd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index 0c712a7..b0fb390 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -36,6 +36,9 @@ #include linux/seqlock.h #include trace/events/kvm.h +#ifdef __KVM_HAVE_IOAPIC +#include ioapic.h +#endif #include iodev.h #ifdef CONFIG_HAVE_KVM_IRQFD Applied, thanks. Paolo -- To unsubscribe from this list: send the line unsubscribe kvm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] KVM: EVENTFD: Only conditionally remove inclusion of irq.h
Commit c77dcac KVM: Move more code under CONFIG_HAVE_KVM_IRQFD added functionality that depends on definitions in ioapic.h when __KVM_HAVE_IOAPIC is defined. At the same time, 0ba0951 KVM: EVENTFD: remove inclusion of irq.h removed the inclusion of irq.h unconditionally, which happened to include ioapic.h. Instead, include ioapic.h directly in eventfd.c if __KVM_HAVE_IOAPIC is defined. Signed-off-by: Christoffer Dall christoffer.d...@linaro.org --- virt/kvm/eventfd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index 0c712a7..b0fb390 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -36,6 +36,9 @@ #include linux/seqlock.h #include trace/events/kvm.h +#ifdef __KVM_HAVE_IOAPIC +#include ioapic.h +#endif #include iodev.h #ifdef CONFIG_HAVE_KVM_IRQFD -- 2.0.0 -- To unsubscribe from this list: send the line unsubscribe kvm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html