From nobody Mon Mar 30 09:36:32 2026 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 4fkmNJ51b4z6WhqQ for ; Mon, 30 Mar 2026 09:36:32 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fkmNJ4WXfz3HhN for ; Mon, 30 Mar 2026 09:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774863392; 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=WJVb39Hhd4+kXaKgCsf99FrnVO0loICJyca+o25UKqg=; b=g/lsHU91P5MQlzaOhV4mp/WUhUzeQvWuU9Zi6OH57JGWY2a92br0CZXIA+JMJlNEJYmLNe NSWdG1qDbBxtIpD1ksKhWuVkH1lLi3qdglFWiKb8YBq1gmiOicRb1YePmadfOMKlrUx/+x IBfxdZYpQjvurOHeX57sEFaVRyfT1+G/GzFHBmmtD4PQYMDBF5aACydrD77+j8ejcvmvPQ QbeQ5fX7aqIR3Z7tvmSF+YIAGNgSMh1OHoCfQLcKJmQFDqs+GK83v1yiPEivHXwmx86XID 8KJreH09Tq1C4VwnzwKI+xrDnpWPnlNAUtJ4WiD1npRMZvDylyV1tQFHzqOYfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774863392; a=rsa-sha256; cv=none; b=RDXJDqbRNPXcHDB8+Silf4rmppz2Yf+cgavy073oX+okL3dfSlgETSSIDTZqustA6N9Jfx 27u28yHE+1CMwLNCakVyeqYbx3zo90eMRQ9IHGbzR2++UFpk48n64hT/Tsl5A+YUGtstt3 U6DQX966W/5aIVbwnwFEvlWswHrQ7boSGU7ZahwoW58dcNxfehJab2h4yUklxvBRf7lRev /IOAO366FOSZ4wKhPoN/6f+B4rDjlXg7EDI/+R/duwWZpmzRv9uUrEW8rRNpQOGodDmrWW hoUgCn0k/hhVWq1Qte0jpXBDUb+8R2VpWX05nPjnPdQYbFl9USb5KMlwwt4s2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774863392; 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=WJVb39Hhd4+kXaKgCsf99FrnVO0loICJyca+o25UKqg=; b=u8RTL8rcm3aIXndWUpaCw+cl4wapT1agWqk8WGx7wusDOUid26UoY/aUvnxrGEA0n4+rhW bAHcaHoO1huNzJ1+42V7cEGLbWHspZ/+Ni8iedkd5Foa4Pf3uUsCLNaFzNRQzwa1JEa837 qSzpEWi6un4dUpomnKe2gX/GVkK+LJ687qcHr98QnwUKS9a7KXEwmf6dlgRu0+MFVGIwq/ UCvrQQlSEh+25CsAD1dyYf2KUj3KpTzAHgYMrtA+LxBmS3FeNnDR54aIguX8di+54z36Bu DZLaCk6p4C39C1mnJskco28yju9G91bGp331GQkvk9k1monNWXcecXyCB3TtNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fkmNJ44P3zd4S for ; Mon, 30 Mar 2026 09:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27eaf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 30 Mar 2026 09:36:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 25d0c5d4456f - stable/15 - cpufreq(4): cpufreq_levels_sysctl(): Remove always false NULL test 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 25d0c5d4456f2c9b01d43bd3717d2bc2d8a3b83d Auto-Submitted: auto-generated Date: Mon, 30 Mar 2026 09:36:32 +0000 Message-Id: <69ca4420.27eaf.4e1a044d@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=25d0c5d4456f2c9b01d43bd3717d2bc2d8a3b83d commit 25d0c5d4456f2c9b01d43bd3717d2bc2d8a3b83d Author: Olivier Certner AuthorDate: 2026-02-12 12:33:46 +0000 Commit: Olivier Certner CommitDate: 2026-03-30 09:36:02 +0000 cpufreq(4): cpufreq_levels_sysctl(): Remove always false NULL test 'sc->levels_buf' is initialized with malloc(M_WAITOK), so can never be NULL. Another sysctl handler function (cpufreq_curr_sysctl()) already relies on that. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation (cherry picked from commit 953b9164c3d93e820a53b4fdebbde7fabb7b7644) --- sys/kern/kern_cpu.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_cpu.c b/sys/kern/kern_cpu.c index 1fb3d8002c7f..03d2d38e1749 100644 --- a/sys/kern/kern_cpu.c +++ b/sys/kern/kern_cpu.c @@ -1002,16 +1002,12 @@ cpufreq_levels_sysctl(SYSCTL_HANDLER_ARGS) struct sbuf sb; int count, error, i; - sc = oidp->oid_arg1; sbuf_new(&sb, NULL, 128, SBUF_AUTOEXTEND); /* Get settings from the device and generate the output string. */ - count = CF_MAX_LEVELS; + sc = oidp->oid_arg1; levels = sc->levels_buf; - if (levels == NULL) { - sbuf_delete(&sb); - return (ENOMEM); - } + count = CF_MAX_LEVELS; error = CPUFREQ_LEVELS(sc->dev, levels, &count); if (error) { if (error == E2BIG)