Date: Tue, 29 Aug 2006 05:32:20 GMT From: Chris Jones <cdjones@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 105246 for review Message-ID: <200608290532.k7T5WKYK043848@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608290532.k7T5WKYK043848>