Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 Jan 2020 05:25:06 +0000 (UTC)
From:      Mateusz Guzik <mjg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r356654 - head/sys/sys
Message-ID:  <202001120525.00C5P6rh026454@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mjg
Date: Sun Jan 12 05:25:06 2020
New Revision: 356654
URL: https://svnweb.freebsd.org/changeset/base/356654

Log:
  sysctl: add missing CLTFLAG_MPSAFE annotation to CONST_STRING

Modified:
  head/sys/sys/sysctl.h

Modified: head/sys/sys/sysctl.h
==============================================================================
--- head/sys/sys/sysctl.h	Sun Jan 12 05:08:57 2020	(r356653)
+++ head/sys/sys/sysctl.h	Sun Jan 12 05:25:06 2020	(r356654)
@@ -357,7 +357,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry);
 
 /* Oid for a constant '\0' terminated string. */
 #define	SYSCTL_CONST_STRING(parent, nbr, name, access, arg, descr)	\
-	SYSCTL_OID(parent, nbr, name, CTLTYPE_STRING|(access),		\
+	SYSCTL_OID(parent, nbr, name, CTLTYPE_STRING | CTLFLAG_MPSAFE | (access),\
 	    __DECONST(char *, arg), 0, sysctl_handle_string, "A", descr); \
 	CTASSERT(!(access & CTLFLAG_WR));				\
 	CTASSERT(((access) & CTLTYPE) == 0 ||				\
@@ -369,9 +369,9 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry);
 	CTASSERT(!(access & CTLFLAG_WR));				\
 	CTASSERT(((access) & CTLTYPE) == 0 ||				\
 	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_STRING);	\
-	sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_STRING|(access),	\
-	    __arg, 0, sysctl_handle_string, "A", __DESCR(descr),	\
-	    NULL); \
+	sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_STRING | 	\
+	    CTLFLAG_MPSAFE | (access), __arg, 0, sysctl_handle_string, "A",\
+	    __DESCR(descr), NULL); 					\
 })
 
 /* Oid for a bool.  If ptr is NULL, val is returned. */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001120525.00C5P6rh026454>