* [PATCH] KVM: EVENTFD: Only conditionally remove inclusion of irq.h
@ 2014-09-22 21:33 Christoffer Dall
2014-09-23 9:37 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Christoffer Dall @ 2014-09-22 21:33 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kvmarm, kvm, Christoffer Dall
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
--
2.0.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] KVM: EVENTFD: Only conditionally remove inclusion of irq.h
2014-09-22 21:33 [PATCH] KVM: EVENTFD: Only conditionally remove inclusion of irq.h Christoffer Dall
@ 2014-09-23 9:37 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2014-09-23 9:37 UTC (permalink / raw)
To: Christoffer Dall; +Cc: kvmarm, kvm
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-09-23 9:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox