From owner-svn-src-projects@freebsd.org  Sat Nov 19 22:02:00 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 244CAC4B60B
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sat, 19 Nov 2016 22:02:00 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E5AAD19F;
 Sat, 19 Nov 2016 22:01:59 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAJM1wKo099062;
 Sat, 19 Nov 2016 22:01:58 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAJM1wMg099061;
 Sat, 19 Nov 2016 22:01:58 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201611192201.uAJM1wMg099061@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 19 Nov 2016 22:01:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r308870 - projects/clang390-import/sbin/nvmecontrol
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Nov 2016 22:02:00 -0000

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)