From nobody Mon Apr 17 06:24:42 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 4Q0H8W1FPJz45R6w; Mon, 17 Apr 2023 06:24:43 +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 4Q0H8W0r9pz3hN4; Mon, 17 Apr 2023 06:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712683; 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=DpPAgaXhky8HGPfDubTnMjCTP3EsxoIrV3Hft1patmM=; b=UYLE9wD+KsT2tJtzAHj+mpowAgoXh+VfS9BfILg6ugrV+OgBDI3NYVZLX+9aAVAEOP4+Xm /FZfyXTOHtymD8BOu0cDLWn9PJaaEl6bi1Vqa95GA7ZKGEoVTkWHvF4eQo6g4pE4rFNiHW Qog93Ojv5pJTtPlsp0lflsvP78t8oM7gTQ0Nad4lj3ZcUzztRiC2fKvXa+hsyaZE0whvLf zpS1phmLVKJwK2DckIlekN/ck/Gq73JgZI0o8fLeeTimyAhHBUfBqmfP8hfaRycyXD1Vo1 Z9xK3E7Pnf82C+IEgJ6qjo8ims/PHgWIG1j83MzANoPJ4bni3j3DDe/0ebf3bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681712683; 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=DpPAgaXhky8HGPfDubTnMjCTP3EsxoIrV3Hft1patmM=; b=C9N29FCcApjwKCMCSjO87noRhvkwLXo7gMqxzOBhqABfqgXyEiqCBvy/JBtwaTX7BQEcLC iB792O69+vEr+70Oq7qhtRTuNjibN/q6hqm3pgl4SeKmqBFHNaBZHBVuIkp9huW5psBovq 3e/InRodWr+v7ffpnioWNiSYkrOJkpVLOCmY3aCoiY+Le9MqWPYyUMQKTdMJeUAPUkOyq0 Bs9FX46yI90q4g6lpMkZbx91zbULAoWk2qggUCGFSE89MTa5ffwPMAg30OJpuCMrqO2VZg DJn1y+ilqR+Akpf9xXJLibq/tNy1NlW/nlrzG0DOwuCZjOzegvANoQyipyrOuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681712683; a=rsa-sha256; cv=none; b=TPw4s871jbu3JJqCvWiufnly21J6sd6H/42NB+sYa6Qyt/Z8X7Jif3pTFFmzMCh6xKp0qp L33RGiyS6w/oo2DtqDSLsQ0WKLjA5BEMuLveVpM6xJLGZYCUjrWDKshNdJubSammoaGTUr 2QKbsl2e5pPawylFos78jbmpvx6NWUIqtDdOoasGEOSCbDz9no2Au7NACRnlfi5Il0XYsd 1IiXqXB7XeGeF7rztPD6ZNOwovpv2euvE9jwigr3sQBrPhBV519pN0IfrwYtQFusqNZ0O/ lFH0zTQCpDYvevndgSk/1r4GTPI/dZbyS3QIS2u0LhtwUoEh9HQ/k6ogTDO0zA== 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 4Q0H8V6sdWzJPk; Mon, 17 Apr 2023 06:24:42 +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 33H6OgfO046079; Mon, 17 Apr 2023 06:24:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33H6Og1E046078; Mon, 17 Apr 2023 06:24:42 GMT (envelope-from git) Date: Mon, 17 Apr 2023 06:24:42 GMT Message-Id: <202304170624.33H6Og1E046078@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: f0274efa336b - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: f0274efa336b59bcadf733537250de0c8a935b08 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f0274efa336b59bcadf733537250de0c8a935b08 commit f0274efa336b59bcadf733537250de0c8a935b08 Author: Zhenlei Huang AuthorDate: 2023-04-12 04:20:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-17 06:22:55 +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) (cherry picked from commit 7124e665dac97258d5df4764ad81eb0563212a65) --- 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 1a5db378daf8..2db5ec436d3b 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 252978f47a31..5c1bf2dd8057 100644 --- a/sys/powerpc/powerpc/platform.c +++ b/sys/powerpc/powerpc/platform.c @@ -64,7 +64,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_region pregions[PHYS_AVAIL_SZ];