From: Christoffer Dall Date: Mon, 22 Sep 2014 21:33:08 +0000 (+0200) Subject: KVM: EVENTFD: Remove inclusion of irq.h X-Git-Tag: fixes-for-v3.18-merge-window~23^2~28 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29f1b65b5984c1e35e2d60d1416d03cee0b91ee2;p=pandora-kernel.git 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 Signed-off-by: Paolo Bonzini --- Reading git-diff-tree failed