The branch main has been updated by mav:
URL:
https://cgit.FreeBSD.org/src/commit/?id=67f508db84b8b789db37c60972f255574417b8ed
commit 67f508db84b8b789db37c60972f255574417b8ed
Author: Alexander Motin <m...@freebsd.org>
AuthorDate: 2021-08-11 02:17:53 +0000
Commit: Alexander Motin <m...@freebsd.org>
CommitDate: 2021-08-11 02:18:26 +0000
Mark some sysctls as CTLFLAG_MPSAFE.
MFC after: 2 weeks
---
sys/kern/kern_intr.c | 4 ++--
sys/kern/kern_shutdown.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index afaf8466a1df..1660414a50ef 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -1612,7 +1612,7 @@ sysctl_intrnames(SYSCTL_HANDLER_ARGS)
}
SYSCTL_PROC(_hw, OID_AUTO, intrnames,
- CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_NEEDGIANT, NULL, 0,
+ CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0,
sysctl_intrnames, "",
"Interrupt Names");
@@ -1641,7 +1641,7 @@ sysctl_intrcnt(SYSCTL_HANDLER_ARGS)
}
SYSCTL_PROC(_hw, OID_AUTO, intrcnt,
- CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_NEEDGIANT, NULL, 0,
+ CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0,
sysctl_intrcnt, "",
"Interrupt Counts");
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index e200b6d8a4b4..fb2a69401801 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -740,7 +740,7 @@ SYSCTL_INT(_debug_kassert, OID_AUTO, suppress_in_panic,
KASSERT_RWTUN,
static int kassert_sysctl_kassert(SYSCTL_HANDLER_ARGS);
SYSCTL_PROC(_debug_kassert, OID_AUTO, kassert,
- CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE | CTLFLAG_NEEDGIANT, NULL, 0,
+ CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE | CTLFLAG_MPSAFE, NULL, 0,
kassert_sysctl_kassert, "I",
"set to trigger a test kassert");
@@ -1021,7 +1021,7 @@ dumpdevname_sysctl_handler(SYSCTL_HANDLER_ARGS)
return (error);
}
SYSCTL_PROC(_kern_shutdown, OID_AUTO, dumpdevname,
- CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_NEEDGIANT, &dumper_configs, 0,
+ CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, &dumper_configs, 0,
dumpdevname_sysctl_handler, "A",
"Device(s) for kernel dumps");
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
