summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/amd64/machdep.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/amd64/amd64/machdep.c')
-rw-r--r--sys/arch/amd64/amd64/machdep.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index 5acacb4..9b65d6e 100644
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -61,6 +61,12 @@
#define SPECTRE_IBRS 0
#endif
+#if defined(__CPU_SMEP)
+#define CPU_SMEP __CPU_SMEP
+#else
+#define CPU_SMEP 0
+#endif
+
int ibrs_enable(void);
int simd_init(void);
void syscall_isr(void);
@@ -319,6 +325,11 @@ cpu_enable_smep(void)
struct cpu_info *ci;
uint64_t cr4;
+ /* Don't bother if not enabled */
+ if (!CPU_SMEP) {
+ return;
+ }
+
ci = this_cpu();
if (!ISSET(ci->feat, CPU_FEAT_SMEP)) {
pr_trace_bsp("SMEP not supported\n");
@@ -336,6 +347,10 @@ cpu_disable_smep(void)
struct cpu_info *ci;
uint64_t cr4;
+ if (!CPU_SMEP) {
+ return;
+ }
+
ci = this_cpu();
if (!ISSET(ci->feat, CPU_FEAT_SMEP)) {
return;