From owner-svn-src-all@FreeBSD.ORG  Thu Jun 17 16:12:07 2010
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 332EF1065672;
	Thu, 17 Jun 2010 16:12:07 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 226D98FC13;
	Thu, 17 Jun 2010 16:12:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5HGC7Ak082420;
	Thu, 17 Jun 2010 16:12:07 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5HGC6Lq082419;
	Thu, 17 Jun 2010 16:12:06 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201006171612.o5HGC6Lq082419@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Thu, 17 Jun 2010 16:12:06 +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: r209256 - head/sys/kern
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: Thu, 17 Jun 2010 16:12:07 -0000

Author: jh
Date: Thu Jun 17 16:12:06 2010
New Revision: 209256
URL: http://svn.freebsd.org/changeset/base/209256

Log:
  - Fix compilation of the subr_unit.c user space test program.
  - Use %zu for size_t in a few format strings.

Modified:
  head/sys/kern/subr_unit.c

Modified: head/sys/kern/subr_unit.c
==============================================================================
--- head/sys/kern/subr_unit.c	Thu Jun 17 14:37:47 2010	(r209255)
+++ head/sys/kern/subr_unit.c	Thu Jun 17 16:12:06 2010	(r209256)
@@ -153,6 +153,7 @@ mtx_assert(struct mtx *mp, int flag)
 }
 
 #define CTASSERT(foo)
+#define WITNESS_WARN(flags, lock, fmt, ...)	(void)0
 
 #endif /* USERLAND */
 
@@ -825,9 +826,9 @@ main(int argc __unused, const char **arg
 
 	memset(a, 0, sizeof a);
 
-	fprintf(stderr, "sizeof(struct unr) %d\n", sizeof (struct unr));
-	fprintf(stderr, "sizeof(struct unrb) %d\n", sizeof (struct unrb));
-	fprintf(stderr, "sizeof(struct unrhdr) %d\n", sizeof (struct unrhdr));
+	fprintf(stderr, "sizeof(struct unr) %zu\n", sizeof(struct unr));
+	fprintf(stderr, "sizeof(struct unrb) %zu\n", sizeof(struct unrb));
+	fprintf(stderr, "sizeof(struct unrhdr) %zu\n", sizeof(struct unrhdr));
 	fprintf(stderr, "NBITS %d\n", NBITS);
 	x = 1;
 	for (m = 0; m < NN * 100; m++) {