From nobody Wed Apr 17 03:33:43 2024 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 4VK62H4NLbz5Hj0y; Wed, 17 Apr 2024 03:33:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VK62H1jKWz4QlT; Wed, 17 Apr 2024 03:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713324823; 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=hHoS2RIjiuLBodeBW92pE2xdXtc+eBDhZT+A7qREs/c=; b=rdiX+k6jBVVGzdmBUL/Z7+DGEXEqIeVW93mZFxk/W7ZEF/ImF6funK0y2ovHlDoxS2ekcR rQBJccUd1imysUflBWbXEPHaW2KEzFqVELh5S8KLiw6l55w6NGZV6KZ8MmnfBt65L05SXo pVG0hp961JzFSyrPT348xm/5sZBOo2MVyzUl+SK5JRcNQWHiHrUWWxyElJKG801RnigXq/ AtVlt4Fx84WkxNyCeDd0WxZyp7U/1OyC39UdoP8gkdzvEH/i5Ca+unLETybi3w9VQiX4sI m+UDZXWEAg+6ngdj7LyyrFQQTx2z3cwjb1DeYiE3DwNqyfvlJ049S8TEdd5o4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713324823; a=rsa-sha256; cv=none; b=dX0T3Vr5B+sJW7xlm32cAKOYw32R6k8U4kTvmzTl+MC4ojUtSzag8/zXojPCHTBr4CsOEN DOsgWxIi+yLzbIFf0LhI4GlhHSI6wJ3g1UlqreV1Jvw/B9Fc1W7v7mXmeUwSdK9nZjwONS Gt9KcAgvefTwzHgkXHVUpnnMrnD0+7Jp9bROJCCUXd7Vx+veCPcrThU5crOfkV4fpH79rA 7Kfb8IwB9bBn22kubDO0/cOt5W4m3OBvBLU1KsgEqeV0TFtI0aBr8VVblw2PTXx+Wd4j1k n6UcpRAaHlJWp4pesgTnorNP7vygAgFom/DZ0Pov+wvn4K04WylQ0WjhRjyH8g== 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=1713324823; 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=hHoS2RIjiuLBodeBW92pE2xdXtc+eBDhZT+A7qREs/c=; b=TyS306s8cMpPJ9CPr+sNy3v8Dr1aYbHRodWCkA4xAmauI2hwqoslPxnGdoYmG1DIvDIZTY Yh0Z7kw0cgjGKlMkIE/5Djh2bO6GmHeS8LgqnLb32dPIjOmZWbJz7uHtR5uOcLbflkeEQD B5zIoU5Q+AQ/ch4bt5qwvX6xh51YK2iWKR7HkEMmdXvzsCLIL0uybCkC+EaIXCw/Xirutt f2RVTq04aiRCgzOBLMhLNpZBQkoUIov3z00lvl4hzjonC62TmEkSWDa0uXWcAlk3/5MyM7 S3+Hnm+OrCyB1FtkKRla0Y48/65eeC7rW8UTtn1IVtWgG8+eOKfEs9NActFLBw== 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 4VK62H1K15z19Sn; Wed, 17 Apr 2024 03:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43H3Xh5f086717; Wed, 17 Apr 2024 03:33:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H3Xh9v086715; Wed, 17 Apr 2024 03:33:43 GMT (envelope-from git) Date: Wed, 17 Apr 2024 03:33:43 GMT Message-Id: <202404170333.43H3Xh9v086715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e098d24b5290 - main - nvmecontrol: Have to truncate on all 32-bit architectures 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e098d24b5290a9f59734587ded783c19d4dc6e31 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e098d24b5290a9f59734587ded783c19d4dc6e31 commit e098d24b5290a9f59734587ded783c19d4dc6e31 Author: Warner Losh AuthorDate: 2024-04-16 22:35:53 +0000 Commit: Warner Losh CommitDate: 2024-04-17 03:30:17 +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 --- 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;