summaryrefslogtreecommitdiff
path: root/usr/src/uts/i86pc/os/mlsetup.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/i86pc/os/mlsetup.c')
-rw-r--r--usr/src/uts/i86pc/os/mlsetup.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr/src/uts/i86pc/os/mlsetup.c b/usr/src/uts/i86pc/os/mlsetup.c
index 8cb56d9682..045adbcb7b 100644
--- a/usr/src/uts/i86pc/os/mlsetup.c
+++ b/usr/src/uts/i86pc/os/mlsetup.c
@@ -269,7 +269,10 @@ mlsetup(struct regs *rp)
(void) wrmsr(MSR_AMD_TSCAUX, 0);
/*
- * Let's get the other %cr4 stuff while we're here.
+ * Let's get the other %cr4 stuff while we're here. Note, we defer
+ * enabling CR4_SMAP until startup_end(); however, that's importantly
+ * before we start other CPUs. That ensures that it will be synced out
+ * to other CPUs.
*/
if (is_x86_feature(x86_featureset, X86FSET_DE))
setcr4(getcr4() | CR4_DE);