aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorRadim Krčmář <rkrcmar@redhat.com>2015-07-01 09:31:49 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-10 12:49:37 -0400
commit8ed8b759437fadfd18202be9bb65a7f80c3c6d63 (patch)
tree8bf1fb02936940f659bdfe109ec3ae0275bbeb66 /arch/x86/include
parent58382447b9a9989da551a7b17e72756f6e238bb8 (diff)
KVM: x86: make vapics_in_nmi_mode atomic
commit 42720138b06301cc8a7ee8a495a6d021c4b6a9bc upstream. Writes were a bit racy, but hard to turn into a bug at the same time. (Particularly because modern Linux doesn't use this feature anymore.) Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> [Actually the next patch makes it much, much easier to trigger the race so I'm including this one for stable@ as well. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/kvm_host.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index f4a555beef19..41b06fca39f7 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -591,7 +591,7 @@ struct kvm_arch {
591 struct kvm_pic *vpic; 591 struct kvm_pic *vpic;
592 struct kvm_ioapic *vioapic; 592 struct kvm_ioapic *vioapic;
593 struct kvm_pit *vpit; 593 struct kvm_pit *vpit;
594 int vapics_in_nmi_mode; 594 atomic_t vapics_in_nmi_mode;
595 struct mutex apic_map_lock; 595 struct mutex apic_map_lock;
596 struct kvm_apic_map *apic_map; 596 struct kvm_apic_map *apic_map;
597 597