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

[op at FreeBSD.org]

Author: op
Date: Fri Jul 25 15:22:48 2014
New Revision: 271372
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271372

Log:
  KSP SMAP: removed safety check, after the KSP merge
  
  Signed-off-by: Oliver Pinter <oliver.pntr at gmail.com>
  
  git: https://github.com/opntr/opBSD/tree/op/gsoc2014/smap+kpatch

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

Modified: soc2014/op/freebsd-base/sys/amd64/amd64/pmap.c
==============================================================================
--- soc2014/op/freebsd-base/sys/amd64/amd64/pmap.c	Fri Jul 25 15:22:35 2014	(r271371)
+++ soc2014/op/freebsd-base/sys/amd64/amd64/pmap.c	Fri Jul 25 15:22:48 2014	(r271372)
@@ -834,15 +834,12 @@
 	load_cr3(KPML4phys);
 	if (cpu_stdext_feature & CPUID_STDEXT_SMEP)
 		load_cr4(rcr4() | CR4_SMEP);
-	/*
-	 * XXXOP - handle properly the situation, when the kernel
-	 * compiled with SMAP, but the CPU does not support it
-	 */
+
 	if (cpu_stdext_feature & CPUID_STDEXT_SMAP) {
 		printf("Intel SMAP: enable\n");
 		load_cr4(rcr4() | CR4_SMAP);
 	} else {
-		panic("Intel SMAP: not supported...");
+		printf("Intel SMAP: not supported or disabled\n");
 	}
 
 	/*