socsvn commit: r268999 - soc2014/op/freebsd-base/sys/amd64/amd64

[op at FreeBSD.org]

Author: op
Date: Tue Jun  3 09:39:51 2014
New Revision: 268999
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=268999

Log:
  SMAP AMD64: disable SMAP when running in hypervisor (like SMEP)
  
  git: https://github.com/opntr/opBSD/commits/op/gsoc2014/smap
  
  Signed-off-by: Oliver Pinter <oliver.pntr at gmail.com>
  
  

Modified:
  soc2014/op/freebsd-base/sys/amd64/amd64/identcpu.c

Modified: soc2014/op/freebsd-base/sys/amd64/amd64/identcpu.c
==============================================================================
--- soc2014/op/freebsd-base/sys/amd64/amd64/identcpu.c	Tue Jun  3 09:37:36 2014	(r268998)
+++ soc2014/op/freebsd-base/sys/amd64/amd64/identcpu.c	Tue Jun  3 09:39:51 2014	(r268999)
@@ -561,7 +561,7 @@
 		 */
 		if (cpu_feature2 & CPUID2_HV) {
 			cpu_stdext_disable = CPUID_STDEXT_FSGSBASE |
-			    CPUID_STDEXT_SMEP;
+			    CPUID_STDEXT_SMEP | CPUID_STDEXT_SMAP;
 		} else
 			cpu_stdext_disable = 0;
 		TUNABLE_INT_FETCH("hw.cpu_stdext_disable", &cpu_stdext_disable);