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 /include | |
| parent | db4b0dfab7b016f5514442046d86a9727ee87f12 (diff) | |
| parent | 5af50993850a48ba749b122173d789ea90976c72 (diff) | |
| download | linux-stable-fb7dcf723dd2cb1d5d8f2f49c3023130938848e3.tar.gz linux-stable-fb7dcf723dd2cb1d5d8f2f49c3023130938848e3.tar.bz2 linux-stable-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 'include')
| -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 397b7b5b1933..9de1d3ca83b2 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1149,7 +1149,6 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type); void kvm_unregister_device_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_arm_vgic_v2_ops; extern struct kvm_device_ops kvm_arm_vgic_v3_ops; |