From nobody Tue Jul 21 20:23:29 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 4h4TNd35f6z6mPs6 for ; Tue, 21 Jul 2026 20:23:29 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h4TNd2H4lz3SjH for ; Tue, 21 Jul 2026 20:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784665409; 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=jrLdapNwWKsnbeRITmfviCTrA7a7QyGnhLr3kqMrBhY=; b=VllXJzLtDGVo521k28BjrNW2Z6SC//Ws7Gxhdfh6L9mM0mb8NcVCqBc9JqTNWAOZD6Gty8 5R7ZqPXIrQb5+Kq0oB1TFZ3Hs/Ra0+cw3y0vGdVrVo92ejRcfwRIpyQYyK+BOASSJd6tZL f95XZmuZ/ijOlCIII2fAd/3RqXDjSoMz9Rsbx1Mds3/su1B3/Nb59Lde5cvkSc7MfStmvi RiHv2DYLUF0YR1ONDoyO3mO59iT3kT1Q8wkWRQSJywdMt0qgRjW9g5wymOJhqezHifPfSC Nc7s/x/Jsi48FXexqbxXS/3TH8Odpyrype/IRzHmS4opQ8h1HqHr+izBmbbsHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784665409; a=rsa-sha256; cv=none; b=PvJF3d3L6ipMLLmAW9sMsHax0Rj/qzN7Lf88VUV66My30aIMsYbRVjJuTx1cy8oDN7+nGx SfXjIEwW9F3f8qtZuSvRvYP6zoDl1DPRCjeiohAgxudieW9nfDJkAWOYcvKviAaohq4pfZ fO+yVHd4vDfsQgGB8aF1lbFn/Sd0gTLRdRiO3vclSGZiCmylGtgXlD2gBW0T5s70e9aP7w lnFLTVEZpIvwSTi30QDBycjA9NUJfwWZS6VWeMm/0mRVKIfJjcVRbMyU5laoF8Fr2Dbua9 alSbi85cJcpjVO6VEbrPpjGmWhVLeqbuY8ZHsd4jdo9y5sRv6BHiFAVt6RDORw== 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=1784665409; 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=jrLdapNwWKsnbeRITmfviCTrA7a7QyGnhLr3kqMrBhY=; b=aceQF+Bc6/VUgvL08v54mI+2qfzW7Nvx49uu9/Pdu989pn4yDRzFYqCqobE2ZfliqswmgT 8+LWuIh7AEZ4bfTe+85MZNxx8/tUKctbMH7KN+npm13dif4iU2oPEh5w+5ArctGqUE0uK5 alvh0crIzd3K6C3j1Vl9Em5tMIy2oATWS4hdAAZpIOBWQjG4mMFiqPWEAS0vVULBWgMKpr 6Dpe/nOJLGHk/k6tYloMWb4WtWGccdK8zwP5EpRwEHCW5fMZ7tFVzG28isis56oAg+Cc1O q4NXXGkni+HI94hhLnMn+jXYmj0gEUOPe65tm3YlWd0h+7Eoqw8C+3E4oM4tHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h4TNd14YBz13rV for ; Tue, 21 Jul 2026 20:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22e2c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Jul 2026 20:23:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Justin Hibbits Subject: git: ced89d9c04d4 - stable/15 - watchdog: Fix a couple type issues 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ced89d9c04d450c1dad7fe5f21c1b2afca306046 Auto-Submitted: auto-generated Date: Tue, 21 Jul 2026 20:23:29 +0000 Message-Id: <6a5fd541.22e2c.13658a74@gitrepo.freebsd.org> The branch stable/15 has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=ced89d9c04d450c1dad7fe5f21c1b2afca306046 commit ced89d9c04d450c1dad7fe5f21c1b2afca306046 Author: Justin Hibbits AuthorDate: 2026-06-10 13:50:14 +0000 Commit: Justin Hibbits CommitDate: 2026-07-21 20:23:00 +0000 watchdog: Fix a couple type issues * Force the type of the literal `1` passed to nstosbt() to ensure it's a 64-bit type (or larger). Otherwise it gets inconveniently typed to int, resulting in truncation. * Use `flsll()` when converting sbt to power-of-2-nanoseconds to fix 32-bit compatibility. PR: 292616 Obtained from: Hewlett Packard Enterprise Fixes: 26d6617f3 ("watchdog: Convert to using sbintime_t format") (cherry picked from commit d08cb1dc17486920c1506f175d77259e0ac3f3a3) --- sys/dev/watchdog/watchdog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/watchdog/watchdog.c b/sys/dev/watchdog/watchdog.c index e1b2e08c3f10..7f0b457b89d1 100644 --- a/sys/dev/watchdog/watchdog.c +++ b/sys/dev/watchdog/watchdog.c @@ -110,7 +110,7 @@ wdog_kern_pat(u_int utim) if (utim == WD_TO_NEVER) sbt = 0; else - sbt = nstosbt(1 << utim); + sbt = nstosbt(1ULL << utim); return (wdog_kern_pat_sbt(sbt)); } @@ -142,7 +142,7 @@ wdog_kern_pat_sbt(sbintime_t sbt) /* legacy uses power-of-2-nanoseconds time. */ if (sbt != 0) { - pow2ns = flsl(sbttons(sbt)); + pow2ns = flsll(sbttons(sbt)); } if (wd_last_sbt != sbt) { wd_last_u = pow2ns;