diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2016-12-12 07:29:39 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-12-12 07:29:39 +0100 |
commit | f673b5b2a66332da5358def524dbfb3305c76d8c (patch) | |
tree | 9f55a133030bb236b7ecc48f776fefc688d243c3 /arch/arm64/kvm/reset.c | |
parent | KVM: x86: Handle the kthread worker using the new API (diff) | |
parent | arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest (diff) | |
download | linux-f673b5b2a66332da5358def524dbfb3305c76d8c.tar.xz linux-f673b5b2a66332da5358def524dbfb3305c76d8c.zip |
Merge tag 'kvm-arm-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM updates for 4.10:
- Support for the GICv3 ITS on 32bit platforms
- A handful of timer and GIC emulation fixes
- A PMU architecture fix
Diffstat (limited to 'arch/arm64/kvm/reset.c')
-rw-r--r-- | arch/arm64/kvm/reset.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index 5bc460884639..e95d4f68bf54 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -86,12 +86,6 @@ int kvm_arch_dev_ioctl_check_extension(struct kvm *kvm, long ext) case KVM_CAP_VCPU_ATTRIBUTES: r = 1; break; - case KVM_CAP_MSI_DEVID: - if (!kvm) - r = -EINVAL; - else - r = kvm->arch.vgic.msis_require_devid; - break; default: r = 0; } |