From owner-svn-src-all@FreeBSD.ORG  Sat Apr 14 16:44:19 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5CE91106566B;
	Sat, 14 Apr 2012 16:44:19 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 489D18FC17;
	Sat, 14 Apr 2012 16:44:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3EGiJ2i038634;
	Sat, 14 Apr 2012 16:44:19 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3EGiJ3h038632;
	Sat, 14 Apr 2012 16:44:19 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201204141644.q3EGiJ3h038632@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Sat, 14 Apr 2012 16:44:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234290 - head/sys/dev/netmap
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2012 16:44:19 -0000

Author: luigi
Date: Sat Apr 14 16:44:18 2012
New Revision: 234290
URL: http://svn.freebsd.org/changeset/base/234290

Log:
  i prefer this fix for the -Wformat warning (just one cast,
  all the other variables are already correct for %x).
  My previous attempt put the cast in the wrong place.

Modified:
  head/sys/dev/netmap/netmap_mem2.c

Modified: head/sys/dev/netmap/netmap_mem2.c
==============================================================================
--- head/sys/dev/netmap/netmap_mem2.c	Sat Apr 14 16:42:17 2012	(r234289)
+++ head/sys/dev/netmap/netmap_mem2.c	Sat Apr 14 16:44:18 2012	(r234290)
@@ -161,11 +161,9 @@ netmap_ofstophys(vm_offset_t offset)
 		return p[i]->lut[offset / p[i]->_objsize].paddr +
 			offset % p[i]->_objsize;
 	}
-	D("invalid ofs 0x%jx out of 0x%jx 0x%jx 0x%jx", (uintmax_t)o,
-		(uintmax_t)p[0]->_memtotal,
-		(uintmax_t)(p[0]->_memtotal + p[1]->_memtotal),
-		(uintmax_t)(p[0]->_memtotal + p[1]->_memtotal +
-		    p[2]->_memtotal));
+	D("invalid ofs 0x%x out of 0x%x 0x%x 0x%x", (u_int)o,
+		p[0]->_memtotal, p[0]->_memtotal + p[1]->_memtotal,
+		p[0]->_memtotal + p[1]->_memtotal + p[2]->_memtotal);
 	return 0;	// XXX bad address
 }