hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

KVM: EVENTFD: 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, kvm-arm commit 0ba0951 (KVM: EVENTFD: remove inclusion
of irq.h) removed the inclusion of irq.h, an architecture-specific header
that is not present on ARM but which happened to include ioapic.h on x86.

Include ioapic.h directly in eventfd.c if __KVM_HAVE_IOAPIC is defined.
This fixes x86 and lets ARM use eventfd.c.

Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Christoffer Dall 2014-09-22 23:33:08 +02:00 committed by Paolo Bonzini
parent f51770ed46
commit 29f1b65b59
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
virt/kvm/eventfd.c
View File

@ -36,7 +36,9 @@
#include <linux/seqlock.h>
#include <trace/events/kvm.h>
#include "irq.h"
#ifdef __KVM_HAVE_IOAPIC
#include "ioapic.h"
#endif
#include "iodev.h"
#ifdef CONFIG_HAVE_KVM_IRQFD