diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-04-08 16:28:11 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-04-08 16:29:07 -0500 |
| commit | 7842d0844b8b0b3d61d2436df9bf8794d065e039 (patch) | |
| tree | c111e3f8ae7307c89ea6cba917a3bc7d784a6dd7 | |
| parent | c0fdc1baa22e25c4b4b63e6e90b5865d78eee46e (diff) | |
KVM: VFIO: resolve redeclaration error on x86/_64linux-lng-3.14.36-2015.05linux-lng-3.14.36-2015.04
Compilation for x86 /x86_64 resulted in the following error:
virt/kvm/vfio.c:238:30: error:
static declaration of 'kvm_vfio_ops' follows non-static declaration
static struct kvm_device_ops kvm_vfio_ops
include/linux/kvm_host.h:1057:30:
note: previous declaration of 'kvm_vfio_ops' was here
extern struct kvm_device_ops kvm_vfio_ops;
Commit 80ce163 KVM: VFIO: register kvm_device_ops dynamically
by Will Deacon includes the removal of the declaration from
include/linux/kvm_host.h, but that portion of the change does not
seem to have made it into the 3.14 tree. This patch resolves
that omission to fix the x86 compilation problems.
Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
| -rw-r--r-- | include/linux/kvm_host.h | 1 |
1 files changed, 0 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 |