From ac41f93cf9bf3c7befdcdda5105c3c8656fe6a75 Mon Sep 17 00:00:00 2001 From: "Yang, Wei Y" Date: Fri, 3 Jun 2011 11:13:35 +0800 Subject: [PATCH] --- yaml --- r: 258029 b: refs/heads/master c: 8d9c975fc5b825cb76953a1b45a84195ffc6f4ab h: refs/heads/master i: 258027: 95ace9495cdd0fb4ea9c6a0be051fb8a2dab523f v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/kvm_host.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index eb90b069d2da..157f14da487f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 509c75ea198fe524adaf90ca1021487b733447ce +refs/heads/master: 8d9c975fc5b825cb76953a1b45a84195ffc6f4ab diff --git a/trunk/arch/x86/include/asm/kvm_host.h b/trunk/arch/x86/include/asm/kvm_host.h index d167039ecdf4..fc38eca116c0 100644 --- a/trunk/arch/x86/include/asm/kvm_host.h +++ b/trunk/arch/x86/include/asm/kvm_host.h @@ -48,7 +48,7 @@ (~(unsigned long)(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | X86_CR4_DE\ | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE \ | X86_CR4_PGE | X86_CR4_PCE | X86_CR4_OSFXSR \ - | X86_CR4_OSXSAVE \ + | X86_CR4_OSXSAVE | X86_CR4_SMEP \ | X86_CR4_OSXMMEXCPT | X86_CR4_VMXE)) #define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR)