The branch main has been updated by zlei:
URL:
https://cgit.FreeBSD.org/src/commit/?id=afbb8041a0633c97acb51ac895c9ae3cde4fe540
commit afbb8041a0633c97acb51ac895c9ae3cde4fe540
Author: Zhenlei Huang <z...@freebsd.org>
AuthorDate: 2023-10-19 15:23:33 +0000
Commit: Zhenlei Huang <z...@freebsd.org>
CommitDate: 2023-10-19 15:23:33 +0000
amd64: Fix two typos of loader tunables
To match the sysctl MIBs and document entries in security(7).
Fixes: 2dec2b4a34b4 amd64: flush L1 data cache on syscall return with an
error
Fixes: 17edf152e556 Control for Special Register Buffer Data Sampling
mitigation
Reviewed by: kib
MFC after: 1 day
Differential Revision: https://reviews.freebsd.org/D42249
---
sys/amd64/amd64/machdep.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 440c21c918be..f235d72519ae 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -1480,7 +1480,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
TUNABLE_INT_FETCH("hw.spec_store_bypass_disable", &hw_ssb_disable);
TUNABLE_INT_FETCH("machdep.mitigations.ssb.disable", &hw_ssb_disable);
- TUNABLE_INT_FETCH("machdep.syscall_ret_l1d_flush",
+ TUNABLE_INT_FETCH("machdep.syscall_ret_flush_l1d",
&syscall_ret_l1d_flush_mode);
TUNABLE_INT_FETCH("hw.mds_disable", &hw_mds_disable);
@@ -1488,7 +1488,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
TUNABLE_INT_FETCH("machdep.mitigations.taa.enable", &x86_taa_enable);
- TUNABLE_INT_FETCH("machdep.mitigations.rndgs.enable",
+ TUNABLE_INT_FETCH("machdep.mitigations.rngds.enable",
&x86_rngds_mitg_enable);
TUNABLE_INT_FETCH("machdep.mitigations.zenbleed.enable",
