diff options
| author | Brian Bennett <brian.bennett@joyent.com> | 2022-06-01 20:27:46 +0000 |
|---|---|---|
| committer | Brian Bennett <brian.bennett@joyent.com> | 2022-06-01 20:27:46 +0000 |
| commit | 0ddc8565214a7df9c51c42b791e780223b5e176c (patch) | |
| tree | fdab5161dbe8263b1274cf579f2eff2d665b3650 /usr/src/uts/intel/sys | |
| parent | 3b388ac65f77d884c38b4f71ecbc03d937784094 (diff) | |
| parent | 3281964baf91e4061898a5490ee91e126e81116c (diff) | |
| download | illumos-joyent-0ddc8565214a7df9c51c42b791e780223b5e176c.tar.gz | |
[illumos-gate merge]
commit 3281964baf91e4061898a5490ee91e126e81116c
14684 want nvme-config-list property
commit e309284527479df5fbac1270f2abd4a739f1ab72
14041 Dell R650 Xeon Gold 5318Y not booting
Diffstat (limited to 'usr/src/uts/intel/sys')
| -rw-r--r-- | usr/src/uts/intel/sys/controlregs.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/uts/intel/sys/controlregs.h b/usr/src/uts/intel/sys/controlregs.h index 9c02a4b809..22d1f8c766 100644 --- a/usr/src/uts/intel/sys/controlregs.h +++ b/usr/src/uts/intel/sys/controlregs.h @@ -21,6 +21,7 @@ /* * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2018, Joyent, Inc. + * Copyright 2022 Tintri by DDN, Inc. All rights reserved. */ #ifndef _SYS_CONTROLREGS_H @@ -111,7 +112,7 @@ extern "C" { #define CR4_OSFXSR 0x0200 /* OS fxsave/fxrstor support */ #define CR4_OSXMMEXCPT 0x0400 /* OS unmasked exception support */ #define CR4_UMIP 0x0800 /* user-mode instruction prevention */ - /* 0x1000 reserved */ +#define CR4_LA57 0x1000 /* enable 57 bit Logical addressing */ #define CR4_VMXE 0x2000 /* VMX enable */ #define CR4_SMXE 0x4000 /* SMX enable */ /* 0x8000 reserved */ @@ -124,8 +125,8 @@ extern "C" { #define FMT_CR4 \ "\20\27pke\26smap\25smep\23osxsav" \ - "\22pcide\20fsgsbase\17smxe\16vmxe" \ - "\14umip\13xmme\12fxsr\11pce\10pge" \ + "\22pcide\21fsgsbase\17smxe\16vmxe" \ + "\15la57\14umip\13xmme\12fxsr\11pce\10pge" \ "\7mce\6pae\5pse\4de\3tsd\2pvi\1vme" /* |