From owner-p4-projects@FreeBSD.ORG Wed Aug 20 11:08:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D327B16A4C2; Wed, 20 Aug 2003 11:08:04 -0700 (PDT) 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 7FB1A16A4BF for ; Wed, 20 Aug 2003 11:08:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7D8443FAF for ; Wed, 20 Aug 2003 11:08:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7KI830U081731 for ; Wed, 20 Aug 2003 11:08:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7KI82Wn081726 for perforce@freebsd.org; Wed, 20 Aug 2003 11:08:02 -0700 (PDT) Date: Wed, 20 Aug 2003 11:08:02 -0700 (PDT) Message-Id: <200308201808.h7KI82Wn081726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 36493 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Aug 2003 18:08:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=36493 Change 36493 by rwatson@rwatson_paprika on 2003/08/20 11:07:09 Resolve a few more conflicts missed in the previous pass. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/sys/param.h#4 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/proc.h#4 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/socketvar.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/sys/param.h#4 (text+ko) ==== @@ -36,13 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 ->>>> ORIGINAL param.h#16 - * $FreeBSD: src/sys/sys/param.h,v 1.139 2002/11/01 09:38:33 dfr Exp $ -==== THEIRS param.h#26 * $FreeBSD: src/sys/sys/param.h,v 1.164 2003/08/05 22:59:01 ps Exp $ -==== YOURS param.h - * $FreeBSD: src/sys/sys/param.h,v 1.163 2003/07/31 01:45:35 kan Exp $ -<<<< */ #ifndef _SYS_PARAM_H_ @@ -63,13 +57,7 @@ * scheme is: <0 if release branch, otherwise 1>xx */ #undef __FreeBSD_version ->>>> ORIGINAL param.h#16 -#define __FreeBSD_version 500043 /* Master, propagated to newvers */ -==== THEIRS param.h#26 #define __FreeBSD_version 501104 /* Master, propagated to newvers */ -==== YOURS param.h -#define __FreeBSD_version 501103 /* Master, propagated to newvers */ -<<<< #ifndef NULL #define NULL 0 ==== //depot/projects/trustedbsd/sebsd/sys/sys/proc.h#4 (text+ko) ==== @@ -36,13 +36,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 ->>>> ORIGINAL proc.h#33 - * $FreeBSD: src/sys/sys/proc.h,v 1.284 2002/12/10 02:33:45 julian Exp $ -==== THEIRS proc.h#45 * $FreeBSD: src/sys/sys/proc.h,v 1.344 2003/08/04 20:28:20 jhb Exp $ -==== YOURS proc.h - * $FreeBSD: src/sys/sys/proc.h,v 1.343 2003/07/18 13:51:15 tjr Exp $ -<<<< */ #ifndef _SYS_PROC_H_ @@ -293,25 +287,6 @@ struct kse_thr_mailbox *td_mailbox; /* (*) Userland mailbox address */ struct ucred *td_ucred; /* (k) Reference to credentials. */ void (*td_switchin)(void); /* (k) Switchin special func. */ ->>>> ORIGINAL proc.h#33 - struct thread *td_standin; /* (?) use this for an upcall */ - u_int td_usticks; /* Statclock hits in kernel, for UTS */ - u_int td_critnest; /* (k) Critical section nest level. */ -==== THEIRS proc.h#45 - struct thread *td_standin; /* (*) Use this for an upcall */ - u_int td_prticks; /* (*) Profclock hits in sys for user */ - struct kse_upcall *td_upcall; /* (*) Upcall structure. */ - u_int64_t td_sticks; /* (j) Statclock hits in system mode. */ - u_int td_uuticks; /* (*) Statclock in user, for UTS */ - u_int td_usticks; /* (*) Statclock in kernel, for UTS */ - int td_intrval; /* (*) Return value of TDF_INTERRUPT */ - sigset_t td_oldsigmask; /* (k) Saved mask from pre sigpause. */ - sigset_t td_sigmask; /* (c) Current signal mask. */ - sigset_t td_siglist; /* (c) Sigs arrived, not delivered. */ - sigset_t *td_waitset; /* (c) Wait set for sigwait */ - TAILQ_ENTRY(thread) td_umtx; /* (c?) Link for when we're blocked. */ - -==== YOURS proc.h struct thread *td_standin; /* (*) Use this for an upcall */ u_int td_prticks; /* (*) Profclock hits in sys for user */ struct kse_upcall *td_upcall; /* (*) Upcall structure. */ @@ -319,14 +294,12 @@ u_int td_uuticks; /* (*) Statclock in user, for UTS */ u_int td_usticks; /* (*) Statclock in kernel, for UTS */ int td_intrval; /* (*) Return value of TDF_INTERRUPT */ - u_int td_critnest; /* (k) Critical section nest level. */ sigset_t td_oldsigmask; /* (k) Saved mask from pre sigpause. */ sigset_t td_sigmask; /* (c) Current signal mask. */ sigset_t td_siglist; /* (c) Sigs arrived, not delivered. */ sigset_t *td_waitset; /* (c) Wait set for sigwait */ TAILQ_ENTRY(thread) td_umtx; /* (c?) Link for when we're blocked. */ -<<<< #define td_endzero td_base_pri /* Copied during fork1() or thread_sched_upcall() */ @@ -354,17 +327,9 @@ vm_offset_t td_kstack; /* (a) Kernel VA of kstack. */ int td_kstack_pages; /* (a) Size of the kstack */ struct vm_object *td_altkstack_obj;/* (a) Alternate kstack object. */ ->>>> ORIGINAL proc.h#33 - vm_offset_t td_altkstack; /* Kernel VA of alternate kstack. */ - int td_altkstack_pages; /* Size of the alternate kstack */ -==== THEIRS proc.h#45 vm_offset_t td_altkstack; /* (a) Kernel VA of alternate kstack. */ int td_altkstack_pages; /* (a) Size of the alternate kstack */ u_int td_critnest; /* (k) Critical section nest level. */ -==== YOURS proc.h - vm_offset_t td_altkstack; /* (a) Kernel VA of alternate kstack. */ - int td_altkstack_pages; /* (a) Size of the alternate kstack */ -<<<< struct mdthread td_md; /* (k) Any machine-dependent fields. */ struct td_sched *td_sched; /* (*) Scheduler specific data */ }; @@ -489,19 +454,6 @@ * The upcall is used when returning to userland. If a thread does not have * an upcall on return to userland the thread exports its context and exits. */ ->>>> ORIGINAL proc.h#33 -==== THEIRS proc.h#45 -struct kse_upcall { - TAILQ_ENTRY(kse_upcall) ku_link; /* List of upcalls in KSEG. */ - struct ksegrp *ku_ksegrp; /* Associated KSEG. */ - struct thread *ku_owner; /* owning thread */ - int ku_flags; /* KUF_* flags. */ - struct kse_mailbox *ku_mailbox; /* userland mailbox address. */ - stack_t ku_stack; /* userland upcall stack. */ - void *ku_func; /* userland upcall function. */ - unsigned int ku_mflags; /* cached upcall mailbox flags */ -}; -==== YOURS proc.h struct kse_upcall { TAILQ_ENTRY(kse_upcall) ku_link; /* List of upcalls in KSEG. */ struct ksegrp *ku_ksegrp; /* Associated KSEG. */ @@ -515,10 +467,6 @@ #define KUF_DOUPCALL 0x00001 /* Do upcall now, don't wait */ #define KUF_EXITING 0x00002 /* Upcall structure is exiting */ -<<<< - -#define KUF_DOUPCALL 0x00001 /* Do upcall now, don't wait */ -#define KUF_EXITING 0x00002 /* Upcall structure is exiting */ /* * Kernel-scheduled entity group (KSEG). The scheduler considers each KSEG to ==== //depot/projects/trustedbsd/sebsd/sys/sys/socketvar.h#4 (text+ko) ==== @@ -31,13 +31,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.3 (Berkeley) 2/19/95 ->>>> ORIGINAL socketvar.h#26 - * $FreeBSD: src/sys/sys/socketvar.h,v 1.96 2002/11/02 05:14:31 alc Exp $ -==== THEIRS socketvar.h#32 * $FreeBSD: src/sys/sys/socketvar.h,v 1.105 2003/08/05 00:27:54 hsu Exp $ -==== YOURS socketvar.h - * $FreeBSD: src/sys/sys/socketvar.h,v 1.104 2003/07/17 23:49:10 robert Exp $ -<<<< */ #ifndef _SYS_SOCKETVAR_H_