From nobody Wed Apr 16 03:18:57 2025 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 4ZcmTF6RD4z5str7; Wed, 16 Apr 2025 03:18:57 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZcmTF5hN7z3wck; Wed, 16 Apr 2025 03:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744773537; 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=h+trbHeRjzvzv9SdYIulAsx5sd+zIUyu45VJNXsuS0o=; b=mzyK1svdeZvhzXFLRtTUY+zVsCtfv9ieC404pv0Ga0S1CDqvm039cURfDZgrIf/o8dUcZX QDdu5EZ4DBYqsWTV/Ybe4mPu1SMIvhzMi05NzSUNMNvnntszD2mkdwj/1x/6yQ0sLQh3Jm mm5yndCmRXPTbNhJ2lj6smbNPbJqvtaSI3w+t6RydEQQEAz7AE9fbQ/7OhPOtagVJqtJdi Tq2FhTAaCK5LgIINlrcre9jTUsxL/gv1833lprK8QPqcbAYqyxfhS7obZt2nLAoqL+kmjr Jeopg3VA10JYnxoCph4ONRfTbTGJyUKZprvLZfaMrmuZF/3vPrkQLhauyrmnuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744773537; a=rsa-sha256; cv=none; b=CEwMcdlNto4QDcqBK338TFH2jcz36VCBO3Mce9aNIZO8L8LxqXXXc+CE/ktmO3yFNVZT9R kr/chNUCK3sB2C88mThT5mcDMV3anAG4HCesHO3olTwKDKu/BdzXCyC+QwEbn12Gq6q2or Gof08U0VQo39nd2OuAUisLOzYN99RW5hcZIpIyA1hCaIZvybTwkMJEkIIA6A+4JEhPV+2H UNfXxPnCHK90F1e1Qbzzr0Ga1FI9WsPoygb95MfuaPOeWc+GYmsE/Rb4ax628pPt+9I1Qr MdLC2p+2dLMnZR2Tf0vrMsG7tstbShHxJRHhmTwLLBmLhxnriudu89Q22CMi6A== 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=1744773537; 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=h+trbHeRjzvzv9SdYIulAsx5sd+zIUyu45VJNXsuS0o=; b=oWvWSVaN/iPUtOF/QUuogFsL3CryrjwxQ0Tx7RJiJzfaIXSExYidNruzViW9dd22vUpaJA aHXl7Xvi4XV5YcWAD2uVXxSBKH1XrcSDxl3+JhyJ3pY6w9dt6IY7RIBs6ktPyN4T6bDMvr ceVpAUs4uae+HDcKp619FhzI1GSMNUkxPVUKy2+5G1yPXYSn3fphi3t9mluX+Pbos3eu3K ShsqOe7f3wyXFfgo6ZseWRrJwUswgdzIMAfi/smxkZ+HpTrMTHTor3CDmoqQr2zpEWeajo 8i8rOw+SLYHhvZ+G7frqOhJhokRf5X7IDhEi7ZvYWj7qvxUEPdYh7PaOTHPABg== 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 4ZcmTF4zSCz11rT; Wed, 16 Apr 2025 03:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53G3IvsB009095; Wed, 16 Apr 2025 03:18:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53G3Iv6T009092; Wed, 16 Apr 2025 03:18:57 GMT (envelope-from git) Date: Wed, 16 Apr 2025 03:18:57 GMT Message-Id: <202504160318.53G3Iv6T009092@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1bd29261b9d0 - stable/14 - Correct CTLTYPE of SYSCTL_SBINTIME_MSEC etc 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1bd29261b9d0a1f64faa45bac531c62a4709dda9 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1bd29261b9d0a1f64faa45bac531c62a4709dda9 commit 1bd29261b9d0a1f64faa45bac531c62a4709dda9 Author: Colin Percival AuthorDate: 2025-03-31 04:05:33 +0000 Commit: Colin Percival CommitDate: 2025-04-16 03:13:13 +0000 Correct CTLTYPE of SYSCTL_SBINTIME_MSEC etc These should be CTLTYPE_S64, not CTLTYPE_INT, since they handle 64-bit values. Reviewed by: imp Fixes: 003ffd57fee1 ("Add sysctl_usec_to_sbintime [...]") MFC after: 2 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D49584 (cherry picked from commit e85aaed60eb061f31b2f1e5dc92b0ff0419b5fbf) --- sys/sys/sysctl.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 5955b704b7f9..5fce4b8e1713 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -866,7 +866,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); /* OID expressing a sbintime_t as microseconds */ #define SYSCTL_SBINTIME_USEC(parent, nbr, name, access, ptr, descr) \ SYSCTL_OID(parent, nbr, name, \ - CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ + CTLTYPE_S64 | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ (ptr), 0, sysctl_usec_to_sbintime, "Q", descr); \ CTASSERT(((access) & CTLTYPE) == 0 || \ ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_S64) @@ -876,7 +876,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); CTASSERT(((access) & CTLTYPE) == 0 || \ ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_S64); \ sysctl_add_oid(ctx, parent, nbr, name, \ - CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ + CTLTYPE_S64 | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ __ptr, 0, sysctl_usec_to_sbintime, "Q", __DESCR(descr), \ NULL); \ }) @@ -884,7 +884,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); /* OID expressing a sbintime_t as milliseconds */ #define SYSCTL_SBINTIME_MSEC(parent, nbr, name, access, ptr, descr) \ SYSCTL_OID(parent, nbr, name, \ - CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ + CTLTYPE_S64 | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ (ptr), 0, sysctl_msec_to_sbintime, "Q", descr); \ CTASSERT(((access) & CTLTYPE) == 0 || \ ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_S64) @@ -894,7 +894,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); CTASSERT(((access) & CTLTYPE) == 0 || \ ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_S64); \ sysctl_add_oid(ctx, parent, nbr, name, \ - CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ + CTLTYPE_S64 | CTLFLAG_MPSAFE | CTLFLAG_RD | (access), \ __ptr, 0, sysctl_msec_to_sbintime, "Q", __DESCR(descr), \ NULL); \ })