From owner-p4-projects@FreeBSD.ORG  Mon Jan 31 17:06:33 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7A370106566C; Mon, 31 Jan 2011 17:06:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3C6BB106564A
	for <perforce@freebsd.org>; Mon, 31 Jan 2011 17:06:33 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 2993F8FC15
	for <perforce@freebsd.org>; Mon, 31 Jan 2011 17:06:33 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0VH6X23077279
	for <perforce@freebsd.org>; Mon, 31 Jan 2011 17:06:33 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0VH6XDc077276
	for perforce@freebsd.org; Mon, 31 Jan 2011 17:06:33 GMT
	(envelope-from trasz@freebsd.org)
Date: Mon, 31 Jan 2011 17:06:33 GMT
Message-Id: <201101311706.p0VH6XDc077276@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 188382 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Jan 2011 17:06:33 -0000

http://p4web.freebsd.org/@@188382?ac=10

Change 188382 by trasz@trasz_victim8 on 2011/01/31 17:05:57

	Fix build on i386.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#72 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#25 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#72 (text+ko) ====

@@ -479,8 +479,8 @@
 	mtx_lock(&container_lock);
 	KASSERT(amount <= p->p_container->c_resources[resource],
 	    ("rusage_sub: freeing %ju of resource %d, which is more than allocated "
-	    "%ld for %s (pid %d)", amount, resource,
-	    p->p_container->c_resources[resource], p->p_comm, p->p_pid));
+	    "%jd for %s (pid %d)", amount, resource,
+	    (intmax_t)p->p_container->c_resources[resource], p->p_comm, p->p_pid));
 
 	container_alloc_resource(p->p_container, resource, -amount);
 	rusage_sub_cred_locked(p->p_ucred, resource, amount);

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#25 (text+ko) ====

@@ -507,7 +507,7 @@
 }
 
 static int
-str2id(const char *str, long *value)
+str2id(const char *str, id_t *value)
 {
 	char *end;