From owner-p4-projects@FreeBSD.ORG  Wed Jan 19 17:21:26 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4C6321065672; Wed, 19 Jan 2011 17:21:26 +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 0E82E106566B
	for <perforce@freebsd.org>; Wed, 19 Jan 2011 17:21:26 +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 EF9578FC0C
	for <perforce@freebsd.org>; Wed, 19 Jan 2011 17:21:25 +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 p0JHLP6h089539
	for <perforce@freebsd.org>; Wed, 19 Jan 2011 17:21:25 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0JHLP50089536
	for perforce@freebsd.org; Wed, 19 Jan 2011 17:21:25 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 19 Jan 2011 17:21:25 GMT
Message-Id: <201101191721.p0JHLP50089536@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 187958 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: Wed, 19 Jan 2011 17:21:26 -0000

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

Change 187958 by trasz@trasz_victim on 2011/01/19 17:20:43

	Disable this piece of code; it's not really neccessary and might
	cause an ugly race condition.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#30 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#30 (text+ko) ====

@@ -3295,7 +3295,9 @@
 	rlim_t stacklim, vmemlim;
 	int is_procstack, rv;
 	struct ucred *cred;
+#ifdef notyet
 	uint64_t limit;
+#endif
 	int error;
 
 Retry:
@@ -3409,9 +3411,11 @@
 		grow_amount = trunc_page((vm_size_t)stacklim) -
 		    ctob(vm->vm_ssize);
 	}
-	limit = rusage_get_limit(p, RUSAGE_STACK);
+#ifdef notyet
+	limit = rusage_get_available(p, RUSAGE_STACK);
 	if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > limit))
 		grow_amount = limit - ctob(vm->vm_ssize);
+#endif
 
 	/* If we would blow our VMEM resource limit, no go */
 	if (map->size + grow_amount > vmemlim) {