From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [PATCH] KVM: EVENTFD: Only conditionally remove inclusion of irq.h Date: Tue, 23 Sep 2014 11:37:54 +0200 Message-ID: <54213F72.2050800@redhat.com> References: <1411421588-15997-1-git-send-email-christoffer.dall@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org To: Christoffer Dall Return-path: Received: from mx1.redhat.com ([209.132.183.28]:22471 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754604AbaIWJiD (ORCPT ); Tue, 23 Sep 2014 05:38:03 -0400 In-Reply-To: <1411421588-15997-1-git-send-email-christoffer.dall@linaro.org> Sender: kvm-owner@vger.kernel.org List-ID: 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 > --- > 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 > #include > > +#ifdef __KVM_HAVE_IOAPIC > +#include "ioapic.h" > +#endif > #include "iodev.h" > > #ifdef CONFIG_HAVE_KVM_IRQFD > Applied, thanks. Paolo