Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[platform/kernel/linux-rpi.git] / arch / x86 / kvm / pmu.c

diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
index 8abdadb..261b39c 100644 (file)
--- a/arch/x86/kvm/pmu.c
+++ b/arch/x86/kvm/pmu.c
@@ -77,7 +77,7 @@ static inline void __kvm_perf_overflow(struct kvm_pmc *pmc, bool in_pmi)
         * woken up. So we should wake it, but this is impossible from
         * NMI context. Do it from irq work instead.
         */
-       if (in_pmi && !kvm_is_in_guest())
+       if (in_pmi && !kvm_handling_nmi_from_guest(pmc->vcpu))
                irq_work_queue(&pmc_to_pmu(pmc)->irq_work);
        else
                kvm_make_request(KVM_REQ_PMI, pmc->vcpu);