aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorRadim Krčmář <rkrcmar@redhat.com>2015-07-01 15:31:49 +0200
committerBen Hutchings <ben@decadent.org.uk>2015-08-12 16:33:19 +0200
commit1fba7ba2fd5f40a09c39a2b8c39a199abc497790 (patch)
tree2696bdd684e7c2dfe9ca91d8297a60bb35d1874a /arch/x86/include
parentf17199d80d11c26da96b1de81c8f7806ed7304f6 (diff)
downloadkernel_samsung_smdk4412-1fba7ba2fd5f40a09c39a2b8c39a199abc497790.zip
kernel_samsung_smdk4412-1fba7ba2fd5f40a09c39a2b8c39a199abc497790.tar.gz
kernel_samsung_smdk4412-1fba7ba2fd5f40a09c39a2b8c39a199abc497790.tar.bz2
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> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 9171618..93ce7e4 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -472,7 +472,7 @@ struct kvm_arch {
struct kvm_pic *vpic;
struct kvm_ioapic *vioapic;
struct kvm_pit *vpit;
- int vapics_in_nmi_mode;
+ atomic_t vapics_in_nmi_mode;
unsigned int tss_addr;
struct page *apic_access_page;