From nobody Tue Aug 27 01:06:38 2024 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 4Wt8Wf3WXVz5TjR4; Tue, 27 Aug 2024 01:06:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wt8Wf1sDdz4m4n; Tue, 27 Aug 2024 01:06:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724720798; 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=YGBUtphMy2RwXXLc568Og9OdEkk9wNXf9TpWc1cQM8Q=; b=MiK1oPdwW/l6LZS9gT04NTHsTDlx9DrOZZQU7/jD9I/L2FtPhf/frxiW3PKz88x7MWku7l ENzFNpg4WBHJ7e8YAeRDez8McHjOSKpvQRkDfFV5hfiJir6RWkmb+cQ6JKmcpZRKMib2r1 wQOWPicT8fcYpV1lNAQb5rTVVvNF2OCofD3AergJo5RXRMrkjpZLqELqRThmuuK6MPOdf2 /7nRstycyO2PZnb3tT9VGU5caXfS/3MacIFlO4dCi/Id5W4O1JTx+w+PnZgqKQr717OFO7 cHVkPllQzetKMEjKeUDOGb9uZCCD/cvqWbMFR8WIpy0hvAUj6IySIfrTgCTe7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724720798; a=rsa-sha256; cv=none; b=Nw5HbZWUUyYyenOIZRYGsKE6rCeJuvqUryGEaEVxWNA2PZA10SDZbbNADS+dLIyU0ifEa2 Bl15cSU8EhC5x/fOaSws1KpwukI6bzLOArKnV0rpNz6/5cRfIYtw4CVjg7P+eM78zsapw/ DqanEu5qz3AoxYn1hWsr5FcLl/vH5MZ5wGhsrTz2us/eE1M3T7tw3rQ0TTvL4xFLf6hUr7 9PVUgQRALyTb4djuV3c1JzIrFZtt1gsgJIq5nvCH9zw1F4LZCG7Lih/wqAqBVNkGfBzGlW 0h3LdFkXuQrax8kVOP8skmgRScp3WsYhMhSvyIpgJEEEsePtaMbpKfrSlaVWow== 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=1724720798; 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=YGBUtphMy2RwXXLc568Og9OdEkk9wNXf9TpWc1cQM8Q=; b=CHVIKV1cef0e4qsYnDpXzPSMfz0puSALWjWPFRSxyBeJhz7dFHGzlNeO7ICiQS9fMoQwjU H8DXsxR4CyKKVMdTKuU8DUQkn2/eq4tHhM3w4MipB3KC8JyDoJUWofsaOAExWgRXHPCgFJ u9r4Q2R3Ih7gynAEqM6x1C6fo6Pu2J8GgmoZZqEV+hJfVZ02j8th/zAPWwXN9umNL/H7au NEPAeRGe5sxmMnMChu7a+g7REJXv7lh1ZYxq2IPkNwFGLacA8zNAW2bNg67w5n2MeDOhHg XSJm4JyjZsFV0yovOvzULRZJJRA2ldgGkUCXfEM4DOoKKau/UpcMccKWXc5cbQ== 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 4Wt8Wf1NZrzSkJ; Tue, 27 Aug 2024 01:06:38 +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 47R16ciC057046; Tue, 27 Aug 2024 01:06:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47R16cqr057043; Tue, 27 Aug 2024 01:06:38 GMT (envelope-from git) Date: Tue, 27 Aug 2024 01:06:38 GMT Message-Id: <202408270106.47R16cqr057043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 78e2c1882b2f - stable/14 - nvmecontrol: Have to truncate on all 32-bit architectures 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 78e2c1882b2fac00fabe9d362050213b35dd4a78 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=78e2c1882b2fac00fabe9d362050213b35dd4a78 commit 78e2c1882b2fac00fabe9d362050213b35dd4a78 Author: Warner Losh AuthorDate: 2024-04-16 22:35:53 +0000 Commit: John Baldwin CommitDate: 2024-08-26 18:31:02 +0000 nvmecontrol: Have to truncate on all 32-bit architectures armv7, powerpc, powerpcspe and i386 all lack 128-bit integer types. Adjust the comment and #ifdef. I don't think we support nvme on any of these other architectures at the moment, but it won't hurt to be more precise. Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D44650 (cherry picked from commit e098d24b5290a9f59734587ded783c19d4dc6e31) --- sbin/nvmecontrol/nvmecontrol.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/nvmecontrol/nvmecontrol.h b/sbin/nvmecontrol/nvmecontrol.h index a098da4c9c45..ed331327ae9e 100644 --- a/sbin/nvmecontrol/nvmecontrol.h +++ b/sbin/nvmecontrol/nvmecontrol.h @@ -92,12 +92,12 @@ void print_intel_add_smart(const struct nvme_controller_data *cdata __unused, vo /* Utility Routines */ /* * 128-bit integer augments to standard values. On i386 this - * doesn't exist, so we use 64-bit values. So, on 32-bit i386, + * doesn't exist, so we use 64-bit values. So, on 32-bit systems, * you'll get truncated values until someone implement 128bit * ints in software. */ #define UINT128_DIG 39 -#ifdef __i386__ +#ifdef __ILP32__ typedef uint64_t uint128_t; #else typedef __uint128_t uint128_t;