From nobody Wed Jun 10 14:08:17 2026 X-Original-To: dev-commits-src-all@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 4gb70k3cvmz6gTb8 for ; Wed, 10 Jun 2026 14:08:22 +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 4gb70k338qz3SdV for ; Wed, 10 Jun 2026 14:08:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781100502; 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=QeqjIwb4bexFm9H/jdi56F6kfx0bin7q1l0J5CRzMTcW9PvdOrwCCEMMjY8L6YnXAN9gHF npZBTOiN/skmDxa3RXAuoJeHeEfg84L+aRl5j78DJjpanMgx/mzM1+2BXnUANP1rjfodGO 9HtxzB5qhvJbSe2tvA9tMj6Y4TGtDvJFF4WK/kblyuNx155V1s2UDqx/y+qqjCeJc89k6e 9KSohct8dsE2OvfHfX97Ei3HaV7Wih8zoGbgV9Bfm7n0JkzW92SpZhiza5dl6l151OcQLp m9hh8lOsN9EUA8mSkNMWPQHsgwVJw5SwFVFOPWAzmJCnkLDjdQ1o9HQNcnQjZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781100502; a=rsa-sha256; cv=none; b=q2Y3xd7c5K65zLKmqs5qYqzeIq5pN3wHeTGJtv2Wtoa05L9HKs41Gdu6nL5Sm1URJbAczE llZHD3nHXtjGBcZfE0uMeFayQihV0JgZn0kECs/MeBuXXNe4z/wdxGgJ9knFeOFCHZ4F1G WkQ+hi8NmHU6xSJ2mNE32Zc6HyHXO55CcLKz04NBOsSDmKnAFZi7xhLQbOUBnZEb6GieWv Piikt0Rk2Xkk4DivcHwNiMDxMe1PYftXIVj+70KpdTYmIhOJgTVKpAvtfGkIhGpOQuzUMx ARuunUxye4BDypORgA26Z9/oqFswZDK2jGCPxyYdEAEZfvAkNvl3IP6ovIcadQ== 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=1781100502; 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=Po//3smvvm1BY7VectynHfcxIRNMY7PF2KFZtIBh1vXxvG57rEH8Kp244kyLVDgNkBbqkS 7g5j+sUtT696IAfNvV+eyDa9WJ3nAJrdVRvBLrf184y24TSSDyli4vZYD01AMo/nA+miKz E6QNC0KSDmGptGO2asBSf0fTGQm4EjVZ3Uql556wEu70Cqh1baDg2JhE01ks3SHTQdYdno xiqyHIpuOOrsrk5ET24B469339WN3LB3aXUG+9hVEm0QS0reWXlCscV/NKwi1nT12pAZ3x EIxmp8WjxfATKVrZqZmjm+aBPz2u1tjRusEyofDAPC5/ZPXwxpk9D6slgp7MQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gb70k2KhJz1N8D for ; Wed, 10 Jun 2026 14:08:22 +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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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;