From owner-p4-projects@FreeBSD.ORG  Tue Aug 29 05:32:21 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 D8B0516A4E0; Tue, 29 Aug 2006 05:32:20 +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 9ABDA16A4DD
	for <perforce@FreeBSD.org>; Tue, 29 Aug 2006 05:32:20 +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 632D943D46
	for <perforce@FreeBSD.org>; Tue, 29 Aug 2006 05:32:20 +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 k7T5WKZA043851
	for <perforce@FreeBSD.org>; Tue, 29 Aug 2006 05:32:20 GMT
	(envelope-from cdjones@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7T5WKYK043848
	for perforce@freebsd.org; Tue, 29 Aug 2006 05:32:20 GMT
	(envelope-from cdjones@FreeBSD.org)
Date: Tue, 29 Aug 2006 05:32:20 GMT
Message-Id: <200608290532.k7T5WKYK043848@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 105246 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 05:32:21 -0000

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

Change 105246 by cdjones@cdjones_meanook on 2006/08/29 05:32:04

	Cosmetic cleanup of unnecessary differences from -RELENG_6.

Affected files ...

.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#27 edit
.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_switch.c#8 edit
.. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#21 edit
.. //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_pageout.c#4 edit

Differences ...

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

@@ -424,6 +424,7 @@
 void
 prison_free(struct prison *pr)
 {
+
 	mtx_lock(&allprison_mtx);
 	mtx_lock(&pr->pr_mtx);
 	pr->pr_ref--;

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

@@ -234,7 +234,7 @@
 	}
 }
 
-#if defined(SCHED_4BSD)
+#ifdef	SCHED_4BSD
 /*
  * Remove a thread from its KSEGRP's run queue.
  * This in turn may remove it from a KSE if it was already assigned

==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#21 (text+ko) ====

@@ -74,11 +74,6 @@
  *   (d) set only during destruction of jail, no mutex needed
  */
 #if defined(_KERNEL) || defined(_WANT_PRISON)
-
-#include <sys/proc.h>
-/*struct proc; */
-
-
 struct prison {
 	LIST_ENTRY(prison) pr_list;			/* (a) all prisons */
 	int		 pr_id;				/* (c) prison id */

==== //depot/projects/soc2006/cdjones_jail/src/sys/vm/vm_pageout.c#4 (text+ko) ====

@@ -205,7 +205,6 @@
 int vm_page_max_wired;		/* XXX max # of wired pages system-wide */
 
 #if !defined(NO_SWAPPING)
-/* static void vm_pageout_map_deactivate_pages(vm_map_t, long); */
 static void vm_pageout_object_deactivate_pages(pmap_t, vm_object_t, long);
 static void vm_req_vmdaemon(void);
 #endif