diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2019-07-05 19:13:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2019-07-05 19:13:24 -0700 |
| commit | 9fdb86c8cf9ae201d97334ecc2d1918800cac424 (patch) | |
| tree | 0121811d504f2772717baad77f8b5ddc01a37f10 /arch/x86/kvm/lapic.c | |
| parent | Merge tag 'mtd/fixes-for-5.2-final' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | KVM: arm64/sve: Fix vq_present() macro to yield a bool (diff) | |
| download | linux-9fdb86c8cf9ae201d97334ecc2d1918800cac424.tar.gz linux-9fdb86c8cf9ae201d97334ecc2d1918800cac424.tar.bz2 linux-9fdb86c8cf9ae201d97334ecc2d1918800cac424.zip | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull kvm fixes from Paolo Bonzini:
"x86 bugfix patches and one compilation fix for ARM"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: arm64/sve: Fix vq_present() macro to yield a bool
KVM: LAPIC: Fix pending interrupt in IRR blocked by software disable LAPIC
KVM: nVMX: Change KVM_STATE_NESTED_EVMCS to signal vmcs12 is copied from eVMCS
KVM: nVMX: Allow restore nested-state to enable eVMCS when vCPU in SMM
KVM: x86: degrade WARN to pr_warn_ratelimited
Diffstat (limited to 'arch/x86/kvm/lapic.c')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index a21c440ff356..4dabc318adb8 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -2339,7 +2339,7 @@ int kvm_apic_has_interrupt(struct kvm_vcpu *vcpu) struct kvm_lapic *apic = vcpu->arch.apic; u32 ppr; - if (!apic_enabled(apic)) + if (!kvm_apic_hw_enabled(apic)) return -1; __apic_update_ppr(apic, &ppr); |