From nobody Thu Jan 04 13:40:20 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T5SQF2NkLz56QFq; Thu, 4 Jan 2024 13:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T5SQF0pqgz41Zg; Thu, 4 Jan 2024 13:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704375621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nfu2vBH+ZguqWBBizv2DS/WDVyI6vGyBAcC5XjfLVr0=; b=EEb6duXJ0cIYdOVH6URpXHRn5fTUqArQ4dYk0s4OWEmaAn5p+QVevuaGzFJAKNpgqLaIkN 8NgOyouxZA5IkVglgwZNZkNxRlfdxA3yADZfq5s8s+eOM8z8kC/+DY7I6xLZDYjgGQ1qB3 Ij3Ba2+83GT/eSMp/46HafdWeXCLDq/T/C7KRXj5a8yDMup25w+IG5btwuVLFQeaU+hY1r 7u8e6bod0Q9eIWqcmH7B2L+m1oc/zrQHrtmO4wnNLy9fTHmynm8bPHMf7rh44+iXDCCaZF vTlzMtsQKNr6CpxwQR6X7g1uZpTIu+eTIJOJuz1Rsv1/F+kwVfMobWbRtVgkyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704375621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nfu2vBH+ZguqWBBizv2DS/WDVyI6vGyBAcC5XjfLVr0=; b=FTW9db/eKmAWEdTG7PwXdIYi25djg6jWbWctignOSKM2xF+u6C4lNKsAuuCvOZGbkIyYQ3 ktKO9JQp01VbrejOfLtCNFia2cireqlDP80q49xFtOFuunrOEpaJNECCiWZky/PCq2R0QT /NY5qEdfD3Br15brXbExYNRRn18CvrT/+GkJAuC6BTw+kK22GF3HlY/36A6HNSQpkxMEyx VoDH7e+gSy+8YWzl59fBzAXIDOXs7pKLJfR+PLswMtiMNNS2hZdleFiq+T4C/0uStiURlj k6HY0W8bF918RRiqp9AzLQg6BbT8O4Q6JuRuKFVYjyZDJf1XVEnZu8kFP7fSLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704375621; a=rsa-sha256; cv=none; b=BkUmrmwaOEuvs1iMeOAEX0mnJ7QTn6s7d46I4LyTwKlFdk+JeK6hLpLzHQmt4u0nrLHBr+ SGolonb26KlqQYkYLB3Svx+CL0fwLwutI6u+DbYRk75b0KEQ5KWP+FvY/ngMrkguXoU90l 1pFDMwQD0wp8eWiT1N8TNk959WQUmdYbwgbFeaeCus3BgrUiIVUmzEYMybFILkCglO1s7P 2pu4+L30bwNweWdkApNXRL7Om6gSFLukSeWPQsXIJdRyJFkNmT+i3U+bzjP6Wj72vX3XyQ tj43mHetsgFdez5W8iHGGlNGwjfou9992nDPquKefODq0CseUuF62o25iGd1qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T5SQD72N4zFfR; Thu, 4 Jan 2024 13:40:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 404DeKHv041979; Thu, 4 Jan 2024 13:40:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 404DeKYl041976; Thu, 4 Jan 2024 13:40:20 GMT (envelope-from git) Date: Thu, 4 Jan 2024 13:40:20 GMT Message-Id: <202401041340.404DeKYl041976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 969fc091343e - main - sysctl: Don't pass CTLFLAG_MPSAFE to SYSCTL_STRING List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 969fc091343e593f15f0f3326f65292b435423d5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=969fc091343e593f15f0f3326f65292b435423d5 commit 969fc091343e593f15f0f3326f65292b435423d5 Author: Mark Johnston AuthorDate: 2024-01-04 13:33:05 +0000 Commit: Mark Johnston CommitDate: 2024-01-04 13:39:53 +0000 sysctl: Don't pass CTLFLAG_MPSAFE to SYSCTL_STRING It is redundant. No functional change intended. MFC after: 1 week --- sys/kern/kern_mib.c | 16 ++++++++-------- sys/x86/x86/identcpu.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index b7a801cd53c0..e4f557a3461d 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -92,20 +92,20 @@ SYSCTL_ROOT_NODE(OID_AUTO, regression, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "Regression test MIB"); #endif -SYSCTL_STRING(_kern, OID_AUTO, ident, CTLFLAG_RD|CTLFLAG_MPSAFE, +SYSCTL_STRING(_kern, OID_AUTO, ident, CTLFLAG_RD, kern_ident, 0, "Kernel identifier"); -SYSCTL_INT(_kern, KERN_OSREV, osrevision, CTLFLAG_RD|CTLFLAG_CAPRD, +SYSCTL_INT(_kern, KERN_OSREV, osrevision, CTLFLAG_RD | CTLFLAG_CAPRD, SYSCTL_NULL_INT_PTR, BSD, "Operating system revision"); -SYSCTL_STRING(_kern, KERN_VERSION, version, CTLFLAG_RD|CTLFLAG_MPSAFE, +SYSCTL_STRING(_kern, KERN_VERSION, version, CTLFLAG_RD, version, 0, "Kernel version"); -SYSCTL_STRING(_kern, OID_AUTO, compiler_version, CTLFLAG_RD|CTLFLAG_MPSAFE, +SYSCTL_STRING(_kern, OID_AUTO, compiler_version, CTLFLAG_RD, compiler_version, 0, "Version of compiler used to compile kernel"); -SYSCTL_STRING(_kern, KERN_OSTYPE, ostype, CTLFLAG_RD|CTLFLAG_MPSAFE| - CTLFLAG_CAPRD, ostype, 0, "Operating system type"); +SYSCTL_STRING(_kern, KERN_OSTYPE, ostype, CTLFLAG_RD | CTLFLAG_CAPRD, + ostype, 0, "Operating system type"); SYSCTL_INT(_kern, KERN_MAXPROC, maxproc, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &maxproc, 0, "Maximum number of processes"); @@ -139,7 +139,7 @@ SYSCTL_INT(_kern, KERN_SAVED_IDS, saved_ids, CTLFLAG_RD|CTLFLAG_CAPRD, char kernelname[MAXPATHLEN] = PATH_KERNEL; /* XXX bloat */ -SYSCTL_STRING(_kern, KERN_BOOTFILE, bootfile, CTLFLAG_RW | CTLFLAG_MPSAFE, +SYSCTL_STRING(_kern, KERN_BOOTFILE, bootfile, CTLFLAG_RW, kernelname, sizeof kernelname, "Name of kernel file booted"); #ifdef COMPAT_FREEBSD12 @@ -456,7 +456,7 @@ SYSCTL_PROC(_kern, KERN_SECURELVL, securelevel, /* Actual kernel configuration options. */ extern char kernconfstring[]; -SYSCTL_STRING(_kern, OID_AUTO, conftxt, CTLFLAG_RD | CTLFLAG_MPSAFE, +SYSCTL_STRING(_kern, OID_AUTO, conftxt, CTLFLAG_RD, kernconfstring, 0, "Kernel configuration file"); #endif diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c index 3163053a123f..9c82f9f8a882 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -158,7 +158,7 @@ SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD | CTLFLAG_CAPRD, #endif char cpu_model[128]; -SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD | CTLFLAG_CAPRD | CTLFLAG_MPSAFE, +SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD | CTLFLAG_CAPRD, cpu_model, 0, "Machine model"); static int hw_clockrate; @@ -168,7 +168,7 @@ SYSCTL_INT(_hw, OID_AUTO, clockrate, CTLFLAG_RD, u_int hv_base; u_int hv_high; char hv_vendor[16]; -SYSCTL_STRING(_hw, OID_AUTO, hv_vendor, CTLFLAG_RD | CTLFLAG_MPSAFE, hv_vendor, +SYSCTL_STRING(_hw, OID_AUTO, hv_vendor, CTLFLAG_RD, hv_vendor, 0, "Hypervisor vendor"); static eventhandler_tag tsc_post_tag;