summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2019-03-15 19:23:45 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2019-03-15 19:24:34 +0100
commit4a605bc08e98381d8df61c30a4acb2eac15eb7da (patch)
treedda5c8c5c3ad9964560f22a1c4daee87db3e5ad8
parenteca6be566d47029f945a5f8e1c94d374e31df2ca (diff)
downloadlinux-4a605bc08e98381d8df61c30a4acb2eac15eb7da.tar.bz2
kvm: vmx: fix formatting of a comment
Eliminate a gratuitous conflict with 5.0. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--arch/x86/kvm/vmx/vmx.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 4950bb20e06a..886930db77c5 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -1213,13 +1213,13 @@ static void vmx_vcpu_pi_load(struct kvm_vcpu *vcpu, int cpu)
new.control) != old.control);
/*
- * Clear SN before reading the bitmap; this ensures that any
- * interrupt that comes after the bitmap is read sets ON. The
- * VT-d firmware * writes the bitmap and reads SN atomically (5.2.3
- * in the spec), so it doesn't really have a memory barrier that
- * pairs with this. However, we cannot do that and we need one.
+ * Clear SN before reading the bitmap. The VT-d firmware
+ * writes the bitmap and reads SN atomically (5.2.3 in the
+ * spec), so it doesn't really have a memory barrier that
+ * pairs with this, but we cannot do that and we need one.
*/
smp_mb__after_atomic();
+
if (!bitmap_empty((unsigned long *)pi_desc->pir, NR_VECTORS))
pi_set_on(pi_desc);
}