From nobody Mon Apr 17 06:19:01 2023 X-Original-To: dev-commits-src-branches@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 4Q0H1x2nLTz45Qdn; Mon, 17 Apr 2023 06:19:01 +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 4Q0H1x28c0z3GFq; Mon, 17 Apr 2023 06:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712341; 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=cZna1/vJ0lPY7cemX/TrMT1//rUqCNIP8MIzXzaekPE=; b=XdAT2UMS+ssANaHipdHOi7e07TUi5MqfNOdaUBWlOfMkozBMWigPG87SfObLzAgjqRAiBN u28dLZPnHfYUgru5/h4CM69wtupPHBZorj0RS7AdQOJwURmDkgmJo4iTb4zBs9A7vgwuK1 c5EIEgXNaA8htSkbmUfzOuJkwFjo55DGa3jmSp1kaTLPMOXYggjpZg2cHThXRwYG3dGn6L dOoxKf4MjwXjQwdh6mSKFpN7MGKK6Gmw1483HhKwOVKA+wEOOi+J43PgB7vIK7QcYaKRKY hQ36Th5kLULHp3zIfqb0U++7osKlm5vtRXmFTmaVT9yKYt+AdIZlQWlb03afzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712341; 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=cZna1/vJ0lPY7cemX/TrMT1//rUqCNIP8MIzXzaekPE=; b=MrhCdf+e+RkoJsfwWBV0nL73krLNwLdUhzthR60p25J/1nkKiSs+uLb+VEqhkfpUd/TBWG E1IOrFkpoQqr3D9K7ub1QE8HFWh1bHuZk72u/xfaAP3yiVTMVsk5Gv9c0n6yvr9WlMAPEX ZpwlGEM3+l/xlhV+x2K1ZxK5NwEfv7mWVT94qVpN02i/VPjIsvmslUhUwqS29ZdAFvfk2N SZNOXaMnKrVBs7qauNM/mBriJAcNrVAXfauaScP1r1tvV6SN6paMZ4z/vxHnBmW16oGaru qvLKfnH0E685QjHmfYFzbMzonJl214uW6msUNf8lXwfcqJxSw4FrE8OH8daOxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681712341; a=rsa-sha256; cv=none; b=KfLHuW3ocQkFjQOmcHTaVsRiR2gNdFfXXHdfWAb03wBxyIz9YyMvsOEBZBNqQQeO2a5Lnq lZ14T/SeJJyW3IyJE+51yEQ+81ZiPxx0cay+E/kYJWJyKQ0XoGPffxpXmmsnwhDNEjkfHj DkiL34zuxlknVIAyzIanv4xy+fr2lGIjd96tDh/DIGLg2VMhHoOb5bExNyZ5ulVRPMj+IY O+atiXvo4xwdnNyeEIYQZ7MJ7U2ZQFzVGli6Y13xKoEVZvT7Uto5g1tKn1yEAPCD90d0Mg vHqEjJ+MRMQwgTGuKIlXHQWvbBVHuGEscJkedTRzkeEcSYivdd82Qz/Nd7G/tQ== 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 4Q0H1x1FGYzJNs; Mon, 17 Apr 2023 06:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33H6J1IR030685; Mon, 17 Apr 2023 06:19:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H6J1PU030684; Mon, 17 Apr 2023 06:19:01 GMT (envelope-from git) Date: Mon, 17 Apr 2023 06:19:01 GMT Message-Id: <202304170619.33H6J1PU030684@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 7124e665dac9 - stable/13 - powerpc: Use the existing CTLFLAG_RDTUN and CTLFLAG_RWTUN flag definitions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7124e665dac97258d5df4764ad81eb0563212a65 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7124e665dac97258d5df4764ad81eb0563212a65 commit 7124e665dac97258d5df4764ad81eb0563212a65 Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-17 06:17:48 +0000 powerpc: Use the existing CTLFLAG_RDTUN and CTLFLAG_RWTUN flag definitions Use them when possible, instead of separated flags. No functional change intended. Reviewed by: hselasky, erj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39466 (cherry picked from commit dc1c5138c3255cc9004a3842001ed6c5db8f4ea3) --- sys/powerpc/powermac/powermac_thermal.c | 2 +- sys/powerpc/powerpc/platform.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/powermac/powermac_thermal.c b/sys/powerpc/powermac/powermac_thermal.c index 2b1c383ded10..03dbb998559f 100644 --- a/sys/powerpc/powermac/powermac_thermal.c +++ b/sys/powerpc/powermac/powermac_thermal.c @@ -61,7 +61,7 @@ static struct kproc_desc pmac_therm_kp = { SYSINIT(pmac_therm_setup, SI_SUB_KTHREAD_IDLE, SI_ORDER_ANY, kproc_start, &pmac_therm_kp); -SYSCTL_INT(_machdep, OID_AUTO, manage_fans, CTLFLAG_RW | CTLFLAG_TUN, +SYSCTL_INT(_machdep, OID_AUTO, manage_fans, CTLFLAG_RWTUN, &enable_pmac_thermal, 1, "Enable automatic fan management"); static MALLOC_DEFINE(M_PMACTHERM, "pmactherm", "Powermac Thermal Management"); diff --git a/sys/powerpc/powerpc/platform.c b/sys/powerpc/powerpc/platform.c index 6f8f0361d11f..b9513c8f4e0c 100644 --- a/sys/powerpc/powerpc/platform.c +++ b/sys/powerpc/powerpc/platform.c @@ -68,7 +68,7 @@ static struct kobj_ops plat_kernel_kops; static struct platform_kobj plat_kernel_obj; static char plat_name[64] = ""; -SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RD | CTLFLAG_TUN, +SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RDTUN, plat_name, 0, "Platform currently in use"); static struct mem_affinity mem_info[VM_PHYSSEG_MAX + 1];