aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary S. Robertson <gary.robertson@linaro.org>2015-04-13 11:31:31 -0500
committerKevin Hilman <khilman@linaro.org>2015-04-20 14:18:42 -0700
commit69c11a1079700f80424805d8a40dabe436d37b46 (patch)
tree4d2fe9485685083982f9811d235c0d6bfba7b051
parenta519f1a554cdeea7aaddce8cfa177e453a273955 (diff)
downloadlinux-linaro-stable-v3.14/topic/kvm.tar.gz
KVM: VFIO: resolve redeclaration error on x86/_64v3.14/topic/kvm
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; In the kernel.org linux-stable tree, 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 - while the rest of that commit does seem to have been backported. This patch resolves that omission to fix the x86 compilation problems. 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--include/linux/kvm_host.h1
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