diff options
| author | Robert Mustacchi <rm@joyent.com> | 2015-04-30 11:14:10 -0700 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2015-05-15 09:17:44 -0700 |
| commit | 799823bbed51a695d01e13511bbb1369980bb714 (patch) | |
| tree | 4016e57431f57ba63b814cc1e00ef89e36797721 /usr/src/uts/intel/sys/controlregs.h | |
| parent | 29f78cfa374064141c78641a37afda71a6408269 (diff) | |
| download | illumos-joyent-799823bbed51a695d01e13511bbb1369980bb714.tar.gz | |
5890 Enable Intel SMEP support when available
5891 want to be able to see x86 control regs with kmdb
Reviewed by: Joshua M. Clulow <jmc@joyent.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/uts/intel/sys/controlregs.h')
| -rw-r--r-- | usr/src/uts/intel/sys/controlregs.h | 4 |
1 files changed, 3 insertions, 1 deletions
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" /* |