svn commit: r308870 - projects/clang390-import/sbin/nvmecontrol

[Dimitry Andric]

Author: dim
Date: Sat Nov 19 22:01:58 2016
New Revision: 308870
URL: https://svnweb.freebsd.org/changeset/base/308870

Log:
  Merge ^/head r308868 through r308869.

Modified:
  projects/clang390-import/sbin/nvmecontrol/logpage.c
Directory Properties:
  projects/clang390-import/   (props changed)

Modified: projects/clang390-import/sbin/nvmecontrol/logpage.c
==============================================================================
--- projects/clang390-import/sbin/nvmecontrol/logpage.c	Sat Nov 19 21:46:13 2016	(r308869)
+++ projects/clang390-import/sbin/nvmecontrol/logpage.c	Sat Nov 19 22:01:58 2016	(r308870)
@@ -75,10 +75,18 @@ kv_lookup(const struct kv_name *kv, size
 }
 
 /*
- * 128-bit integer augments to standard values
+ * 128-bit integer augments to standard values. On i386 this
+ * doesn't exist, so we use 64-bit values. The 128-bit counters
+ * are crazy anyway, since for this purpose, you'd need a
+ * billion IOPs for billions of seconds to overflow them.
+ * So, on 32-bit i386, you'll get truncated values.
  */
 #define UINT128_DIG	39
+#ifdef __i386__
+typedef uint64_t uint128_t;
+#else
 typedef __uint128_t uint128_t;
+#endif
 
 static inline uint128_t
 to128(void *p)