From 799823bbed51a695d01e13511bbb1369980bb714 Mon Sep 17 00:00:00 2001 From: Robert Mustacchi Date: Thu, 30 Apr 2015 11:14:10 -0700 Subject: 5890 Enable Intel SMEP support when available 5891 want to be able to see x86 control regs with kmdb Reviewed by: Joshua M. Clulow Reviewed by: Igor Kozhukhov Reviewed by: Josef 'Jeff' Sipek Approved by: Richard Lowe --- usr/src/uts/intel/sys/controlregs.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'usr/src/uts/intel/sys/controlregs.h') diff --git a/usr/src/uts/intel/sys/controlregs.h b/usr/src/uts/intel/sys/controlregs.h index d84bba7d3a..98615937b2 100644 --- a/usr/src/uts/intel/sys/controlregs.h +++ b/usr/src/uts/intel/sys/controlregs.h @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2015, Joyent, Inc. */ #ifndef _SYS_CONTROLREGS_H @@ -108,9 +109,10 @@ extern "C" { #define CR4_VMXE 0x2000 #define CR4_SMXE 0x4000 #define CR4_OSXSAVE 0x40000 /* OS xsave/xrestore support */ +#define CR4_SMEP 0x100000 /* NX for user pages in kernel */ #define FMT_CR4 \ - "\20\23osxsav\17smxe\16vmxe\13xmme\12fxsr\11pce\10pge" \ + "\20\25smep\23osxsav\17smxe\16vmxe\13xmme\12fxsr\11pce\10pge" \ "\7mce\6pae\5pse\4de\3tsd\2pvi\1vme" /* -- cgit v1.2.3