From owner-p4-projects@FreeBSD.ORG  Mon Jan 31 16:06:11 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2897F1065673; Mon, 31 Jan 2011 16:06:11 +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 DF3C61065670
	for <perforce@freebsd.org>; Mon, 31 Jan 2011 16:06:10 +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 CCA1A8FC17
	for <perforce@freebsd.org>; Mon, 31 Jan 2011 16:06:10 +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 p0VG6AtA063861
	for <perforce@freebsd.org>; Mon, 31 Jan 2011 16:06:10 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0VG6ALD063858
	for perforce@freebsd.org; Mon, 31 Jan 2011 16:06:10 GMT
	(envelope-from trasz@freebsd.org)
Date: Mon, 31 Jan 2011 16:06:10 GMT
Message-Id: <201101311606.p0VG6ALD063858@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 188379 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 16:06:11 -0000

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

Change 188379 by trasz@trasz_victim on 2011/01/31 16:05:56

	Fix duplicated entry for RUSAGE_SHMSIZE.  (Shouldn't compiler
	warn about this?)

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#71 edit

Differences ...

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

@@ -111,8 +111,7 @@
 	[RUSAGE_NSHM] =		RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE | RUSAGE_SLOPPY,
 	[RUSAGE_SHMSIZE] =	RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE | RUSAGE_SLOPPY,
 	[RUSAGE_WALLCLOCK] =	RUSAGE_IN_THOUSANDS,
-	[RUSAGE_PCTCPU] =	RUSAGE_IN_THOUSANDS | RUSAGE_RECLAIMABLE | RUSAGE_DAMPENED,
-	[RUSAGE_SHMSIZE] =	RUSAGE_RECLAIMABLE | RUSAGE_INHERITABLE | RUSAGE_DENIABLE };
+	[RUSAGE_PCTCPU] =	RUSAGE_IN_THOUSANDS | RUSAGE_RECLAIMABLE | RUSAGE_DAMPENED };
 
 static void
 container_add(struct container *dest, const struct container *src)