From nobody Thu Jan 11 14:35:24 2024 X-Original-To: dev-commits-src-all@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 4T9nJY1KDfz568JT; Thu, 11 Jan 2024 14:35:25 +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 4T9nJX4TWpz4XcV; Thu, 11 Jan 2024 14:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704983724; 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=qYYXMoKX1oFXt/K+8jgrwU2v/T5+n1SjrC5ddAiEJ74=; b=Nbw9WQoW2D1JKw6XC2eXIpQP1q1guguCxhvkwB2cCvkXKX0kKsCZt4wrWJvYMxEF2BWvGw rDyPAqWYsnS+kTEacHC8NrD9D7LFYLXzzzAYk93teO1wdCXtuBHDVReljB0FcVa4eVkU+l +ix9F2kAhKtdElp6RlTRaeUW8ku2mTjT5mvwhzwX19WU1g6uJGaS2RrHX/OrebPeuScLH+ wqdcKU4W8vtg8dk9IW/FEgUT921bYAn+ov6xAtXjG5Vx1v94mAEXIM0KWGC5y1m0EISYgp wvxLA+hFwCx3PN3KobxKRBZZysh9hrUZwQ4UqIzmP6Sd9IrTJP8XDgolLbUjag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704983724; 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=qYYXMoKX1oFXt/K+8jgrwU2v/T5+n1SjrC5ddAiEJ74=; b=Pcvrs5uh++kVHvxAoNZVrAcVlBeQ0Hhi8I/Wgv0Vo88tUJkd+XhvQ1pCCG7/scqi6bD/Hc bz3cQfep7d4p4lPi+elzbY5JyLGVTBNl7rE2YfFol/iC7FYBwJqxJjG5RdGNLcqWIRa60y B/qjpi3GZc/jrEkBkHacRnw5d6Waznwz/37A49KLEqANopBvVBBcBKT+9gP8Npnr+DQJF0 OtrZCOdtuksAeL6/+DQVyGjLgtiuZyEdpDDSacLz5aGqFy5DlWsskXOmz5W9CpBEQo/QYp qBPtzP2iKwWpqTfr2RvEYkyy2yTPJ0UD3gDwnJR4Dhyt0ShZGhud9pigYxiTeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704983724; a=rsa-sha256; cv=none; b=Qkk+9+QJMkMirmXifK6k0IHwWmiUf/qQ7+tCb9nbTwfCzOfzBfDRO977GfFC8DZfyY9RtJ fFRsWjlnP7r8XsBWf8NhIQ+Z2brCuSGMEmaALuGc/rAVbYVQ0g/TFraDSGTRIqM2j3RdaA +81PWUcBZq6XzrUsycY/fmVQwylEDaGipxc6858/qRaYQJwA68UyGCY6RXbhaH/9VQU1mn rXET9siDMmMNL6pEpzXqDUvWXVVovv8LWjEBzfcs6cHdDWngDngYzzoB+V+4b1IYrQNxoh GNJbNbWVWvr0kFVMlzpDtIAyLQYu5/uFf9mI2bqOCNHSNAARm0wlIQXSdUPs2w== 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 4T9nJX3b5tzMrM; Thu, 11 Jan 2024 14:35:24 +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 40BEZOgN025334; Thu, 11 Jan 2024 14:35:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BEZOle025331; Thu, 11 Jan 2024 14:35:24 GMT (envelope-from git) Date: Thu, 11 Jan 2024 14:35:24 GMT Message-Id: <202401111435.40BEZOle025331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a20522d9ae20 - stable/13 - sysctl: Don't pass CTLFLAG_MPSAFE to SYSCTL_STRING List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: a20522d9ae20610bd266c99dab75f58d7b3ee22b Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a20522d9ae20610bd266c99dab75f58d7b3ee22b commit a20522d9ae20610bd266c99dab75f58d7b3ee22b Author: Mark Johnston AuthorDate: 2024-01-04 13:33:05 +0000 Commit: Mark Johnston CommitDate: 2024-01-11 14:33:17 +0000 sysctl: Don't pass CTLFLAG_MPSAFE to SYSCTL_STRING It is redundant. No functional change intended. MFC after: 1 week (cherry picked from commit 969fc091343e593f15f0f3326f65292b435423d5) --- 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 37b7b46c87a2..c9056503925f 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -94,20 +94,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"); @@ -141,7 +141,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 @@ -449,7 +449,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 92a88ede5f79..1eb6bd6cac6f 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, #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;