PERFORCE change 188382 for review

[Edward Tomasz Napierala]

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

Change 188382 by trasz at 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;