aboutsummaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2014-09-02 10:27:35 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2014-09-17 13:10:09 +0200
commit84877d93336de21a6251db00b841468a83c65906 (patch)
treed8a6943e3ea277b6188b0f20a0d47810a2983527 /virt
parentKVM: ARM: vgic: register kvm_device_ops dynamically (diff)
downloadlinux-dev-84877d93336de21a6251db00b841468a83c65906.tar.xz
linux-dev-84877d93336de21a6251db00b841468a83c65906.zip
KVM: s390: register flic ops dynamically
Using the new kvm_register_device_ops() interface makes us get rid of an #ifdef in common code. Cc: Gleb Natapov <gleb@kernel.org> Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 68d96f5dbfe2..f4e792fedb4f 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2285,10 +2285,6 @@ static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX] = {
#ifdef CONFIG_KVM_VFIO
[KVM_DEV_TYPE_VFIO] = &kvm_vfio_ops,
#endif
-
-#ifdef CONFIG_S390
- [KVM_DEV_TYPE_FLIC] = &kvm_flic_ops,
-#endif
};
int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type)