diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-04-20 14:31:32 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-04-20 14:31:32 -0700 |
| commit | 5b9be6d71758967d5f24c91903ef3a1b22252a36 (patch) | |
| tree | 1c374b8413da4dab807d68298cbcf0e9021ab02f | |
| parent | 07410cfb6ec53720b547d0b037680444f4616566 (diff) | |
| parent | 69c11a1079700f80424805d8a40dabe436d37b46 (diff) | |
Merge branch 'v3.14/topic/kvm' into linux-linaro-lsk-v3.14
* v3.14/topic/kvm:
KVM: VFIO: resolve redeclaration error on x86/_64
KVM:EVENTFD: fix implicit declaration on x86/_64
| -rw-r--r-- | include/linux/kvm_host.h | 1 | ||||
| -rw-r--r-- | virt/kvm/eventfd.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 55d75a7cba73..bf933ba17529 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1054,7 +1054,6 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type); extern struct kvm_device_ops kvm_mpic_ops; extern struct kvm_device_ops kvm_xics_ops; -extern struct kvm_device_ops kvm_vfio_ops; #ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT 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 |