diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2017-04-28 08:23:16 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2017-04-28 08:23:16 +1000 |
| commit | fb7dcf723dd2cb1d5d8f2f49c3023130938848e3 (patch) | |
| tree | dc26c9f9616a06b88b34689f3a5b44a73738b52f /virt | |
| parent | db4b0dfab7b016f5514442046d86a9727ee87f12 (diff) | |
| parent | 5af50993850a48ba749b122173d789ea90976c72 (diff) | |
| download | linux-fb7dcf723dd2cb1d5d8f2f49c3023130938848e3.tar.gz linux-fb7dcf723dd2cb1d5d8f2f49c3023130938848e3.tar.bz2 linux-fb7dcf723dd2cb1d5d8f2f49c3023130938848e3.zip | |
Merge remote-tracking branch 'remotes/powerpc/topic/xive' into kvm-ppc-next
This merges in the powerpc topic/xive branch to bring in the code for
the in-kernel XICS interrupt controller emulation to use the new XIVE
(eXternal Interrupt Virtualization Engine) hardware in the POWER9 chip
directly, rather than via a XICS emulation in firmware.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 357e67cba32e..4e19bc812c29 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2825,10 +2825,6 @@ static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX] = { [KVM_DEV_TYPE_FSL_MPIC_20] = &kvm_mpic_ops, [KVM_DEV_TYPE_FSL_MPIC_42] = &kvm_mpic_ops, #endif - -#ifdef CONFIG_KVM_XICS - [KVM_DEV_TYPE_XICS] = &kvm_xics_ops, -#endif }; int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type) |