public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: Christoffer Dall <christoffer.dall@linaro.org>
Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org
Subject: Re: [PATCH] KVM: EVENTFD: Only conditionally remove inclusion of irq.h
Date: Tue, 23 Sep 2014 11:37:54 +0200	[thread overview]
Message-ID: <54213F72.2050800@redhat.com> (raw)
In-Reply-To: <1411421588-15997-1-git-send-email-christoffer.dall@linaro.org>

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.dall@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

      reply	other threads:[~2014-09-23  9:38 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-22 21:33 [PATCH] KVM: EVENTFD: Only conditionally remove inclusion of irq.h Christoffer Dall
2014-09-23  9:37 ` Paolo Bonzini [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=54213F72.2050800@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=christoffer.dall@linaro.org \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox