From owner-svn-src-all@freebsd.org  Sun Apr 17 21:29:45 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 E0CDEB12BD3;
 Sun, 17 Apr 2016 21:29:45 +0000 (UTC) (envelope-from imp@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 B24D41CE6;
 Sun, 17 Apr 2016 21:29:45 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3HLTils076124;
 Sun, 17 Apr 2016 21:29:44 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3HLTi9D076123;
 Sun, 17 Apr 2016 21:29:44 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201604172129.u3HLTi9D076123@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 17 Apr 2016 21:29:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298164 - head/sys/cam
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Apr 2016 21:29:46 -0000

Author: imp
Date: Sun Apr 17 21:29:44 2016
New Revision: 298164
URL: https://svnweb.freebsd.org/changeset/base/298164

Log:
  Do the intmax_t dance for debug so CAM_NETFLIX_IOSCHED builds on
  i386.
  
  Sponsored by: Netflix, Inc

Modified:
  head/sys/cam/cam_iosched.c

Modified: head/sys/cam/cam_iosched.c
==============================================================================
--- head/sys/cam/cam_iosched.c	Sun Apr 17 21:26:55 2016	(r298163)
+++ head/sys/cam/cam_iosched.c	Sun Apr 17 21:29:44 2016	(r298164)
@@ -606,10 +606,10 @@ cam_iosched_cl_maybe_steer(struct contro
 			isc->write_stats.current = isc->write_stats.min;
 		if (isc->write_stats.current > isc->write_stats.max)
 			isc->write_stats.current = isc->write_stats.max;
-		if (old != isc->write_stats.current)
-			printf("Steering write from %d kBps to %d kBps due to latency of %ldus\n",
+		if (old != isc->write_stats.current && 	iosched_debug)
+			printf("Steering write from %d kBps to %d kBps due to latency of %jdms\n",
 			    old, isc->write_stats.current,
-			    ((uint64_t)1000000 * (uint32_t)lat) >> 32);
+			    (uintmax_t)((uint64_t)1000000 * (uint32_t)lat) >> 32);
 		break;
 	case cl_max:
 		break;