diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 11:41:51 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 16:01:49 +0800 |
commit | 70e00db9eb8ffc4dcaf5f035ec6a4440ba428794 (patch) | |
tree | ea67e279adedc950c3d4d8e98546b3823a2b3e93 /arch/x86/kvm/vmx.c | |
parent | 34e0913e457f8469667faf5fa600447aa93371cf (diff) | |
parent | dfbed80c63bb8d965067da3a6dbcc4682edcce0c (diff) |
Merge remote-tracking branch 'lts/linux-3.14.y' into linux-linaro-lsk-v3.14lsk-v3.14-16.03linux-linaro-lsk-v3.14
Conflicts:
Most of conflicts are due to efivar_validate() change which
introduced a new parameter to check efi guid.
I added efi guid for this change in sanity_check()/efivar_create()
in drivers/firmware/efi/efivars.c
and keep new efivar_validate() in drivers/firmware/efi/vars.c,
since it's newer than LSK version.
nothing need mentioned in include/linux/efi.h
Diffstat (limited to 'arch/x86/kvm/vmx.c')
-rw-r--r-- | arch/x86/kvm/vmx.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 8b75f5f90a96..abc64844b06e 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -1555,6 +1555,13 @@ static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr, return; } break; + case MSR_IA32_PEBS_ENABLE: + /* PEBS needs a quiescent period after being disabled (to write + * a record). Disabling PEBS through VMX MSR swapping doesn't + * provide that period, so a CPU could write host's record into + * guest's memory. + */ + wrmsrl(MSR_IA32_PEBS_ENABLE, 0); } for (i = 0; i < m->nr; ++i) |