From owner-svn-src-head@FreeBSD.ORG  Sat Apr 14 13:39:40 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0B035106564A;
	Sat, 14 Apr 2012 13:39:40 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E9C878FC08;
	Sat, 14 Apr 2012 13:39:39 +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 q3EDddrK032269;
	Sat, 14 Apr 2012 13:39:39 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3EDddaP032267;
	Sat, 14 Apr 2012 13:39:39 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201204141339.q3EDddaP032267@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 14 Apr 2012 13:39:39 +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: r234283 - head/sys/dev/netmap
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2012 13:39:40 -0000

Author: bz
Date: Sat Apr 14 13:39:39 2012
New Revision: 234283
URL: http://svn.freebsd.org/changeset/base/234283

Log:
  Make compile on 64bit somehow for now after a first try at r234242 on
  maybe 32bit?

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 11:44:10 2012	(r234282)
+++ head/sys/dev/netmap/netmap_mem2.c	Sat Apr 14 13:39:39 2012	(r234283)
@@ -161,9 +161,11 @@ netmap_ofstophys(vm_offset_t offset)
 		return p[i]->lut[offset / p[i]->_objsize].paddr +
 			offset % p[i]->_objsize;
 	}
-	D("invalid ofs 0x%x out of 0x%x 0x%x 0x%x", o,
-		(u_int)p[0]->_memtotal, p[0]->_memtotal + p[1]->_memtotal,
-		p[0]->_memtotal + p[1]->_memtotal + p[2]->_memtotal);
+	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));
 	return 0;	// XXX bad address
 }