Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Aug 2024 01:06:38 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 78e2c1882b2f - stable/14 - nvmecontrol: Have to truncate on all 32-bit architectures
Message-ID:  <202408270106.47R16cqr057043@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=78e2c1882b2fac00fabe9d362050213b35dd4a78

commit 78e2c1882b2fac00fabe9d362050213b35dd4a78
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-04-16 22:35:53 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408270106.47R16cqr057043>