diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-18 12:14:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 12:14:55 +0200 |
| commit | 1111b680d34bc19190f02a1b4479c3fcc592c22e (patch) | |
| tree | 9d45ad88b9354205a2d1fd76a338ab8693a16d86 /arch/x86/include | |
| parent | 37b6cb475a6d74bc047c53bc323d6eb3113e27a4 (diff) | |
| parent | 24223657806a0ebd0ae5c9caaf7b021091889cf2 (diff) | |
| download | op-kernel-dev-1111b680d34bc19190f02a1b4479c3fcc592c22e.zip op-kernel-dev-1111b680d34bc19190f02a1b4479c3fcc592c22e.tar.gz | |
Merge branch 'perf/urgent' into perf/core, to pick up PMU driver fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/kvm_host.h | 2 |
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 fcaf9c9..7de069af 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -60,7 +60,7 @@ | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE \ | X86_CR4_PGE | X86_CR4_PCE | X86_CR4_OSFXSR | X86_CR4_PCIDE \ | X86_CR4_OSXSAVE | X86_CR4_SMEP | X86_CR4_FSGSBASE \ - | X86_CR4_OSXMMEXCPT | X86_CR4_VMXE)) + | X86_CR4_OSXMMEXCPT | X86_CR4_VMXE | X86_CR4_SMAP)) #define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR) |
