aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary S. Robertson <gary.robertson@linaro.org>2015-04-13 11:31:30 -0500
committerKevin Hilman <khilman@linaro.org>2015-04-20 14:18:42 -0700
commita519f1a554cdeea7aaddce8cfa177e453a273955 (patch)
tree978111f20e0e35e3f486be2ee977ff4e2ffca1ca
parent05fc265939403d2a0789cd071de9f26152842309 (diff)
downloadlinux-linaro-stable-a519f1a554cdeea7aaddce8cfa177e453a273955.tar.gz
KVM:EVENTFD: fix implicit declaration on x86/_64
During compilation for x86 and x86_64, received the following warning: virt/kvm/eventfd.c:493:2: error: implicit declaration of function 'kvm_vcpu_request_scan_ioapic' [-Werror=implicit-function-declaration] kvm_vcpu_request_scan_ioapic(kvm); In the kernel.org linux-stable tree, commit 29f1b65 KVM:EVENTFD: Remove inclusion of irq.h by Christoffer Dall addresses this issue. This backport incudes those portions of that patch which are relevant in the 3.14 tree. Acked-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org> Signed-off-by: Kevin Hilman <khilman@linaro.org>
-rw-r--r--virt/kvm/eventfd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index 0ab1411eb007..ce3ca4c54534 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