From owner-p4-projects@FreeBSD.ORG  Tue Aug 29 04:51:30 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E643816A4DE; Tue, 29 Aug 2006 04:51:29 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BCE2416A4DD
	for <perforce@FreeBSD.org>; Tue, 29 Aug 2006 04:51:29 +0000 (UTC)
	(envelope-from cdjones@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 33FCE43D62
	for <perforce@FreeBSD.org>; Tue, 29 Aug 2006 04:51:29 +0000 (GMT)
	(envelope-from cdjones@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7T4pTfo040672
	for <perforce@FreeBSD.org>; Tue, 29 Aug 2006 04:51:29 GMT
	(envelope-from cdjones@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7T4pTx4040669
	for perforce@freebsd.org; Tue, 29 Aug 2006 04:51:29 GMT
	(envelope-from cdjones@FreeBSD.org)
Date: Tue, 29 Aug 2006 04:51:29 GMT
Message-Id: <200608290451.k7T4pTx4040669@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cdjones@FreeBSD.org using -f
From: Chris Jones <cdjones@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 105245 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Tue, 29 Aug 2006 04:51:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=105245

Change 105245 by cdjones@cdjones_meanook on 2006/08/29 04:50:28

	Back out unneeded comments and #include (discovered while creating patches against -RELENG_6).

Affected files ...

.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#7 edit

Differences ...

==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/imgact_elf.c#7 (text+ko) ====

@@ -58,7 +58,6 @@
 #include <sys/sysctl.h>
 #include <sys/sysent.h>
 #include <sys/vnode.h>
-#include <sys/jail.h>
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
@@ -763,10 +762,6 @@
 	if (data_size > lim_cur(imgp->proc, RLIMIT_DATA) ||
 	    text_size > maxtsiz ||
 	    total_size > lim_cur(imgp->proc, RLIMIT_VMEM)) {
-/* ||
-	    (jailed(imgp->proc->p_ucred) && 
-	     total_size > (prison_memory_limit(imgp->proc->p_ucred) 
-			   - prison_memory(imgp->proc->p_ucred)))) { */
 		PROC_UNLOCK(imgp->proc);
 		return (ENOMEM);
 	}