Date: Sat, 29 Jun 2002 17:19:48 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 13621 for review Message-ID: <200206300019.g5U0JmXd012572@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13621 Change 13621 by peter@peter_overcee on 2002/06/29 17:18:53 IFC @13620 - needed to use -i to get the $FreeBSD$'s in sync because p4 thought the two files were independently added and had no common merge point. Affected files ... .. //depot/projects/kse/sys/alpha/alpha/trap.c#31 integrate .. //depot/projects/kse/sys/alpha/include/kse.h#3 integrate .. //depot/projects/kse/sys/i386/i386/trap.c#58 integrate .. //depot/projects/kse/sys/i386/include/kse.h#6 integrate .. //depot/projects/kse/sys/ia64/ia64/trap.c#26 integrate .. //depot/projects/kse/sys/kern/kern_thread.c#82 integrate .. //depot/projects/kse/sys/sparc64/include/kse.h#2 integrate .. //depot/projects/kse/sys/sparc64/sparc64/trap.c#34 integrate .. //depot/projects/kse/sys/sys/event.h#9 integrate .. //depot/projects/kse/sys/sys/queue.h#8 integrate .. //depot/projects/kse/sys/sys/ucred.h#14 integrate .. //depot/projects/kse/sys/vm/vm_object.c#14 integrate Differences ... ==== //depot/projects/kse/sys/alpha/alpha/trap.c#31 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.96 2002/06/29 17:26:11 julian Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.97 2002/06/29 23:58:50 julian Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -301,8 +301,8 @@ if (td->td_ucred != p->p_ucred) cred_update_thread(td); if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { + PROC_LOCK(p); mtx_lock_spin(&sched_lock); - PROC_LOCK(p); thread_exit(); /* NOTREACHED */ } ==== //depot/projects/kse/sys/alpha/include/kse.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/alpha/include/kse.h,v 1.2 2002/06/29 17:26:11 julian Exp $ */ #ifndef MACHINE_KSE_H ==== //depot/projects/kse/sys/i386/i386/trap.c#58 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/trap.c,v 1.228 2002/06/29 17:26:16 julian Exp $ + * $FreeBSD: src/sys/i386/i386/trap.c,v 1.229 2002/06/29 23:58:50 julian Exp $ */ /* @@ -273,8 +273,8 @@ * But check if we are the single thread first! */ if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { + PROC_LOCK(p); /* check if thisis really needed */ mtx_lock_spin(&sched_lock); - PROC_LOCK(p); thread_exit(); /* NOTREACHED */ } ==== //depot/projects/kse/sys/i386/include/kse.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/i386/include/kse.h,v 1.2 2002/06/29 17:26:16 julian Exp $ */ #ifndef MACHINE_KSE_H ==== //depot/projects/kse/sys/ia64/ia64/trap.c#26 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.60 2002/06/29 18:26:18 julian Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.61 2002/06/29 23:58:50 julian Exp $ */ /* From: src/sys/alpha/alpha/trap.c,v 1.33 */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ @@ -337,7 +337,7 @@ cred_update_thread(td); if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { mtx_lock_spin(&sched_lock); - thread_exit(); + thread_exit(); /* XXXKSE need proc lock? */ /* NOTREACHED */ } } else { ==== //depot/projects/kse/sys/kern/kern_thread.c#82 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/kern/kern_thread.c,v 1.2 2002/06/29 17:26:18 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/sparc64/include/kse.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/sparc64/include/kse.h,v 1.2 2002/06/29 17:26:21 julian Exp $ */ #ifndef _MACHINE_KSE_H_ ==== //depot/projects/kse/sys/sparc64/sparc64/trap.c#34 (text+ko) ==== @@ -37,7 +37,7 @@ * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * from: FreeBSD: src/sys/i386/i386/trap.c,v 1.197 2001/07/19 - * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.42 2002/06/29 17:26:21 julian Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.43 2002/06/29 23:58:50 julian Exp $ */ #include "opt_ddb.h" @@ -193,7 +193,7 @@ cred_update_thread(td); if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { mtx_lock_spin(&sched_lock); - thread_exit(); + thread_exit(); /* XXXKSE need proc lock? */ /* NOTREACHED */ } } else { ==== //depot/projects/kse/sys/sys/event.h#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/event.h,v 1.20 2002/06/29 00:29:12 alfred Exp $ + * $FreeBSD: src/sys/sys/event.h,v 1.21 2002/06/29 19:14:52 bde Exp $ */ #ifndef _SYS_EVENT_H_ @@ -114,7 +114,7 @@ /* * This is currently visible to userland to work around broken - * programs which pull in <sys/proc.h> or <sys/select.h>. + * programs which pull in <sys/proc.h>. */ #include <sys/queue.h> struct knote; ==== //depot/projects/kse/sys/sys/queue.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $FreeBSD: src/sys/sys/queue.h,v 1.49 2002/06/29 17:26:22 julian Exp $ + * $FreeBSD: src/sys/sys/queue.h,v 1.50 2002/06/29 19:16:10 julian Exp $ */ #ifndef _SYS_QUEUE_H_ @@ -102,8 +102,9 @@ * _REMOVE + + + + * */ -#define QUEUE_MACRO_DEBUG 1 -#ifdef QUEUE_MACRO_DEBUG +#define QUEUE_MACRO_DEBUG 0 +#if QUEUE_MACRO_DEBUG +/* Store the last 2 places the queue element or head was altered */ struct qm_trace { char * lastfile; int lastline; ==== //depot/projects/kse/sys/sys/ucred.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ucred.h 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/ucred.h,v 1.38 2002/06/29 17:26:22 julian Exp $ + * $FreeBSD: src/sys/sys/ucred.h,v 1.39 2002/06/29 19:53:55 bde Exp $ */ #ifndef _SYS_UCRED_H_ @@ -44,15 +44,15 @@ * Only the suser() or suser_cred() function should be used for this. */ struct ucred { - u_int cr_ref; /* reference count */ + u_int cr_ref; /* reference count */ #define cr_startcopy cr_uid - uid_t cr_uid; /* effective user id */ - uid_t cr_ruid; /* real user id */ - uid_t cr_svuid; /* saved user id */ - short cr_ngroups; /* number of groups */ - gid_t cr_groups[NGROUPS]; /* groups */ - gid_t cr_rgid; /* real group id */ - gid_t cr_svgid; /* saved user id */ + uid_t cr_uid; /* effective user id */ + uid_t cr_ruid; /* real user id */ + uid_t cr_svuid; /* saved user id */ + short cr_ngroups; /* number of groups */ + gid_t cr_groups[NGROUPS]; /* groups */ + gid_t cr_rgid; /* real group id */ + gid_t cr_svgid; /* saved user id */ struct uidinfo *cr_uidinfo; /* per euid resource consumption */ struct uidinfo *cr_ruidinfo; /* per ruid resource consumption */ struct prison *cr_prison; /* jail(4) */ ==== //depot/projects/kse/sys/vm/vm_object.c#14 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_object.c,v 1.220 2002/06/26 20:32:48 iedowse Exp $ + * $FreeBSD: src/sys/vm/vm_object.c,v 1.221 2002/06/29 20:04:38 iedowse Exp $ */ /* @@ -676,7 +676,7 @@ * the size might be in the gigabytes or terrabytes. */ if (msync_flush_flags & MSYNC_FLUSH_HARDSEQ) { - vm_offset_t tscan; + vm_pindex_t tscan; int scanlimit; int scanreset; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206300019.g5U0JmXd012572>