From nobody Wed Jun 10 14:08:17 2026 X-Original-To: dev-commits-src-main@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 4gb70d2qK5z6gV2W for ; Wed, 10 Jun 2026 14:08:17 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gb70d24Dbz3SJW for ; Wed, 10 Jun 2026 14:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781100497; 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=YfbHSTbtc4zsES+EZcIP/dk2o3y/wl8rVR21WBlORfs=; b=QVA1N66IKPoCaCOlZ6xY1L+GcuOjDbLfNkS+y4Edh93/HSmBxvYG+dfexiZBHiYg5CRTLN 91tLwKGFf+SwY6TPV5F8k1bOgJj5DsEDGS8VHbvKG6WZr4UHe2maNfbkhJhWCy7TMVLvi8 Ux8Q0YUpwtgNWTT7htXyQAMZWBSHhsZAOdpCM1zOkvikagfJ05QAXBneDFe8dKRVsp+Cbl Cpl60tYodSbWiB4Mjs1H/qDdCDgU12lfeLLgswB2F1/AfTtfLUedTZ/AVIzefNuuxCQ6bS BcJoZ3DokcdMSNtNgWEEeBAZr1iu9rIktibTpPIeE6fSgq4fGXiwmRKCF2dbhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781100497; a=rsa-sha256; cv=none; b=VieUtV08kXfANucd5pyVfvQOCpBZ0JSlEPb40U0i7j23AW//uLhoiWhP7CMtDsR/Ac6Lk1 4LvbI0iJoTsAMbVPzknLS70OtEHDUtJYT2/Axl8mbJk0r9yw6GXZe0Fs8hEldDGXMpaJkW gFvQth/pXLMTg9Dclw4WIdG9L+cjNLQJUeSAZqB2numi7h5+2MkKUDee/DPkWnh4aSboOU hfuV40UjLpcV98/Mpx3J/3sycKGVDwoNh6Zye/NsPwEcii1/ZJwffxqCWQ1po8JMNwSQdY ayRqjq5ZCsUb4MfkJj5MfY3flwwwd6Oz9E2o4XM4NyZGBIP4ojzbAAUixXPQJw== 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=1781100497; 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=YfbHSTbtc4zsES+EZcIP/dk2o3y/wl8rVR21WBlORfs=; b=vQmTB57Binp8L7ZGUwy6ga30cmFcZl2m4sxPS9gHrAErpP9mjWls8qn05OdK3wJX2QM0uc 9YLo6RxSHNbgTCKfUtQhBtW0ioAmpFHd9gRxbbSPHjnJVgoMdV3Yq8o9Vp+ChNGo8HA6VE glDQ5vrp11o52P6B/vx5H2qhpo6wwGX0E4lJPeIzhWnF5cSHvC7IEEl5XxwWUpuZO8VSEy iAvYlh7qEhC/SfmwDSIxvhd43M7BDpnhprjnGpWXYZumiAq3TmFtubMvCQqflbZs2lG0sn CpSXLeu+iloF62eZQDa7x4SIT3tURPxsB9JXK3wEmYz/UmmNH7qpbF2DBFk9eA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gb70d1Xwrz1MdW for ; Wed, 10 Jun 2026 14:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e7fe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Jun 2026 14:08:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: d08cb1dc1748 - main - watchdog: Fix a couple type issues List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d08cb1dc17486920c1506f175d77259e0ac3f3a3 Auto-Submitted: auto-generated Date: Wed, 10 Jun 2026 14:08:17 +0000 Message-Id: <6a296fd1.1e7fe.1fd619e6@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=d08cb1dc17486920c1506f175d77259e0ac3f3a3 commit d08cb1dc17486920c1506f175d77259e0ac3f3a3 Author: Justin Hibbits AuthorDate: 2026-06-10 13:50:14 +0000 Commit: Justin Hibbits CommitDate: 2026-06-10 14:04:40 +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") MFC after: 3 days --- 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 c599db56bf95..4c166a2bd7e9 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;