Date: Sat, 29 Jun 2002 12:18:38 -0700 (PDT) From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 13609 for review Message-ID: <200206291918.g5TJIcuk062804@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13609 Change 13609 by julian@julian_ref on 2002/06/29 12:17:47 MFC should nullify most of the diff Affected files ... .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#1 branch .. //depot/projects/kse/lib/libkvm/kvm_proc.c#17 integrate .. //depot/projects/kse/sys/alpha/alpha/genassym.c#16 integrate .. //depot/projects/kse/sys/alpha/alpha/pmap.c#30 integrate .. //depot/projects/kse/sys/alpha/alpha/swtch.s#12 integrate .. //depot/projects/kse/sys/alpha/alpha/trap.c#30 integrate .. //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#27 integrate .. //depot/projects/kse/sys/alpha/linux/linux_machdep.c#11 integrate .. //depot/projects/kse/sys/compat/linprocfs/linprocfs.c#18 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_misc.c#15 integrate .. //depot/projects/kse/sys/conf/files#42 integrate .. //depot/projects/kse/sys/ddb/db_ps.c#21 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_ctl.c#22 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_dbregs.c#15 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_fpregs.c#15 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_ioctl.c#7 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_regs.c#15 integrate .. //depot/projects/kse/sys/i386/i386/genassym.c#29 integrate .. //depot/projects/kse/sys/i386/i386/machdep.c#49 integrate .. //depot/projects/kse/sys/i386/i386/pmap.c#40 integrate .. //depot/projects/kse/sys/i386/i386/swtch.s#35 integrate .. //depot/projects/kse/sys/i386/i386/trap.c#57 integrate .. //depot/projects/kse/sys/i386/i386/vm_machdep.c#60 integrate .. //depot/projects/kse/sys/i386/linux/linux_machdep.c#15 integrate .. //depot/projects/kse/sys/i386/linux/linux_ptrace.c#4 integrate .. //depot/projects/kse/sys/ia64/ia64/genassym.c#21 integrate .. //depot/projects/kse/sys/ia64/ia64/swtch.s#18 integrate .. //depot/projects/kse/sys/ia64/ia64/trap.c#25 integrate .. //depot/projects/kse/sys/ia64/ia64/vm_machdep.c#20 integrate .. //depot/projects/kse/sys/ia64/include/kse.h#1 branch .. //depot/projects/kse/sys/kern/init_main.c#44 integrate .. //depot/projects/kse/sys/kern/init_sysent.c#21 integrate .. //depot/projects/kse/sys/kern/kern_condvar.c#38 integrate .. //depot/projects/kse/sys/kern/kern_exec.c#32 integrate .. //depot/projects/kse/sys/kern/kern_exit.c#58 integrate .. //depot/projects/kse/sys/kern/kern_fork.c#74 integrate .. //depot/projects/kse/sys/kern/kern_idle.c#15 integrate .. //depot/projects/kse/sys/kern/kern_intr.c#26 integrate .. //depot/projects/kse/sys/kern/kern_kthread.c#13 integrate .. //depot/projects/kse/sys/kern/kern_mutex.c#30 integrate .. //depot/projects/kse/sys/kern/kern_poll.c#8 integrate .. //depot/projects/kse/sys/kern/kern_proc.c#75 integrate .. //depot/projects/kse/sys/kern/kern_shutdown.c#30 integrate .. //depot/projects/kse/sys/kern/kern_sig.c#58 integrate .. //depot/projects/kse/sys/kern/kern_subr.c#16 integrate .. //depot/projects/kse/sys/kern/kern_switch.c#62 integrate .. //depot/projects/kse/sys/kern/kern_synch.c#75 integrate .. //depot/projects/kse/sys/kern/subr_smp.c#12 integrate .. //depot/projects/kse/sys/kern/subr_trap.c#74 integrate .. //depot/projects/kse/sys/kern/subr_witness.c#28 integrate .. //depot/projects/kse/sys/kern/sys_generic.c#29 integrate .. //depot/projects/kse/sys/kern/sys_process.c#27 integrate .. //depot/projects/kse/sys/kern/syscalls.master#20 integrate .. //depot/projects/kse/sys/kern/tty.c#29 integrate .. //depot/projects/kse/sys/kern/vfs_export.c#6 integrate .. //depot/projects/kse/sys/posix4/ksched.c#11 integrate .. //depot/projects/kse/sys/sparc64/sparc64/genassym.c#27 integrate .. //depot/projects/kse/sys/sparc64/sparc64/swtch.s#18 integrate .. //depot/projects/kse/sys/sparc64/sparc64/trap.c#33 integrate .. //depot/projects/kse/sys/sparc64/sparc64/vm_machdep.c#26 integrate .. //depot/projects/kse/sys/sys/condvar.h#7 integrate .. //depot/projects/kse/sys/sys/proc.h#118 integrate .. //depot/projects/kse/sys/sys/queue.h#7 integrate .. //depot/projects/kse/sys/sys/signalvar.h#14 integrate .. //depot/projects/kse/sys/sys/systm.h#27 integrate .. //depot/projects/kse/sys/sys/ucred.h#13 integrate .. //depot/projects/kse/sys/vm/uma_int.h#6 integrate .. //depot/projects/kse/sys/vm/vm_glue.c#34 integrate .. //depot/projects/kse/sys/vm/vm_meter.c#15 integrate .. //depot/projects/kse/sys/vm/vm_pageout.c#16 integrate .. //depot/projects/kse/sys/vm/vm_zeroidle.c#10 integrate Differences ... ==== //depot/projects/kse/lib/libkvm/kvm_proc.c#17 (text+ko) ==== @@ -34,11 +34,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.46 2002/04/07 04:47:58 dd Exp $ + * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.47 2002/06/29 17:26:10 julian Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.46 2002/04/07 04:47:58 dd Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.47 2002/06/29 17:26:10 julian Exp $"); #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93"; ==== //depot/projects/kse/sys/alpha/alpha/genassym.c#16 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.37 2002/03/29 16:35:25 jake Exp $ + * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.38 2002/06/29 17:26:10 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/alpha/alpha/pmap.c#30 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.93 2002/06/27 04:08:45 jeff Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.94 2002/06/29 17:26:11 julian Exp $ */ /* ==== //depot/projects/kse/sys/alpha/alpha/swtch.s#12 (text+ko) ==== @@ -25,7 +25,7 @@ * rights to redistribute these changes. * * $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ - * $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.31 2001/12/11 23:33:38 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.32 2002/06/29 17:26:11 julian Exp $ */ #define _LOCORE ==== //depot/projects/kse/sys/alpha/alpha/trap.c#30 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.95 2002/06/24 06:21:52 mini Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.96 2002/06/29 17:26:11 julian Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* ==== //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#27 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.67 2002/06/24 15:48:00 jake Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.68 2002/06/29 17:26:11 julian Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. ==== //depot/projects/kse/sys/alpha/linux/linux_machdep.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.21 2002/02/08 08:56:00 peter Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.22 2002/06/29 17:26:12 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/compat/linprocfs/linprocfs.c#18 (text+ko) ==== @@ -38,7 +38,7 @@ * * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 * - * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.52 2002/05/19 00:14:47 jhb Exp $ + * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.53 2002/06/29 17:26:13 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/compat/svr4/svr4_misc.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.46 2002/05/25 10:48:03 bde Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.47 2002/06/29 17:26:13 julian Exp $ */ /* ==== //depot/projects/kse/sys/conf/files#42 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.655 2002/06/27 23:02:17 luigi Exp $ +# $FreeBSD: src/sys/conf/files,v 1.656 2002/06/29 17:26:14 julian Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/kse/sys/ddb/db_ps.c#21 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/db_ps.c,v 1.28 2002/04/11 21:01:34 jhb Exp $ + * $FreeBSD: src/sys/ddb/db_ps.c,v 1.29 2002/06/29 17:26:14 julian Exp $ */ #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/kse/sys/fs/procfs/procfs_ctl.c#22 (text+ko) ==== @@ -38,7 +38,7 @@ * * From: * $Id: procfs_ctl.c,v 3.2 1993/12/15 09:40:17 jsp Exp $ - * $FreeBSD: src/sys/fs/procfs/procfs_ctl.c,v 1.40 2002/05/19 00:14:47 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_ctl.c,v 1.41 2002/06/29 17:26:14 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/fs/procfs/procfs_dbregs.c#15 (text+ko) ==== @@ -44,7 +44,7 @@ * * From: * $Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $ - * $FreeBSD: src/sys/fs/procfs/procfs_dbregs.c,v 1.20 2002/05/19 00:14:47 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_dbregs.c,v 1.21 2002/06/29 17:26:15 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/fs/procfs/procfs_fpregs.c#15 (text+ko) ==== @@ -38,7 +38,7 @@ * * From: * $Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $ - * $FreeBSD: src/sys/fs/procfs/procfs_fpregs.c,v 1.26 2002/05/19 00:14:47 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_fpregs.c,v 1.27 2002/06/29 17:26:15 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/fs/procfs/procfs_ioctl.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/procfs/procfs_ioctl.c,v 1.4 2002/04/01 21:30:39 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_ioctl.c,v 1.5 2002/06/29 17:26:15 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/fs/procfs/procfs_regs.c#15 (text+ko) ==== @@ -38,7 +38,7 @@ * * From: * $Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $ - * $FreeBSD: src/sys/fs/procfs/procfs_regs.c,v 1.25 2002/05/19 00:14:47 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_regs.c,v 1.26 2002/06/29 17:26:15 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/i386/i386/genassym.c#29 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.124 2002/03/27 05:39:18 dillon Exp $ + * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.125 2002/06/29 17:26:16 julian Exp $ */ #include "opt_kstack_pages.h" ==== //depot/projects/kse/sys/i386/i386/machdep.c#49 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.520 2002/06/24 21:31:57 peter Exp $ + * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.521 2002/06/29 17:26:16 julian Exp $ */ #include "opt_atalk.h" ==== //depot/projects/kse/sys/i386/i386/pmap.c#40 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.326 2002/06/27 06:34:03 arr Exp $ + * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.327 2002/06/29 17:26:16 julian Exp $ */ /* ==== //depot/projects/kse/sys/i386/i386/swtch.s#35 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.131 2002/03/27 05:39:19 dillon Exp $ + * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.132 2002/06/29 17:26:16 julian Exp $ */ #include "opt_npx.h" ==== //depot/projects/kse/sys/i386/i386/trap.c#57 (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.227 2002/06/24 06:23:41 mini Exp $ + * $FreeBSD: src/sys/i386/i386/trap.c,v 1.228 2002/06/29 17:26:16 julian Exp $ */ /* ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#60 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.188 2002/06/24 15:48:00 jake Exp $ + * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.189 2002/06/29 17:26:16 julian Exp $ */ #include "opt_npx.h" ==== //depot/projects/kse/sys/i386/linux/linux_machdep.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.26 2002/04/01 21:30:46 jhb Exp $ + * $FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.27 2002/06/29 17:26:17 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/i386/linux/linux_ptrace.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/linux/linux_ptrace.c,v 1.2 2002/05/19 19:35:36 marcel Exp $ + * $FreeBSD: src/sys/i386/linux/linux_ptrace.c,v 1.3 2002/06/29 17:26:17 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/ia64/ia64/genassym.c#21 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/ia64/ia64/genassym.c,v 1.28 2002/03/29 16:35:25 jake Exp $ + * $FreeBSD: src/sys/ia64/ia64/genassym.c,v 1.29 2002/06/29 18:26:18 julian Exp $ */ #include <sys/param.h> @@ -76,9 +76,11 @@ ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); +ASSYM(TD_STATE, offsetof(struct thread, td_state)); ASSYM(TD_KSE, offsetof(struct thread, td_kse)); ASSYM(TD_KSTACK, offsetof(struct thread, td_kstack)); ASSYM(TD_MD_FLAGS, offsetof(struct thread, td_md.md_flags)); +ASSYM(TDS_RUNNING, TDS_RUNNING); ASSYM(KE_FLAGS, offsetof(struct kse, ke_flags)); ==== //depot/projects/kse/sys/ia64/ia64/swtch.s#18 (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/ia64/ia64/swtch.s,v 1.21 2002/05/07 05:52:27 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/swtch.s,v 1.22 2002/06/29 18:26:18 julian Exp $ */ #include <machine/asm.h> @@ -283,6 +283,12 @@ st8 [r14]=r4 // set r13->pc_curthread mov ar.k7=r4 ;; +// Julian's guess at settinghte thread state + add r15=TD_STATE,r4 + ;; + mov [r15]=TDS_RUNNING + ;; +// end of julian's guess add r15=TD_PCB,r4 ;; ld8 r15=[r15] ==== //depot/projects/kse/sys/ia64/ia64/trap.c#25 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.58 2002/06/24 06:21:57 mini Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.60 2002/06/29 18:26:18 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 $ */ @@ -41,6 +41,7 @@ #include <sys/exec.h> #include <sys/lock.h> #include <sys/mutex.h> +#include <sys/kse.h> #include <sys/smp.h> #include <sys/vmmeter.h> #include <sys/sysent.h> @@ -334,6 +335,11 @@ td->td_frame = framep; if (td->td_ucred != p->p_ucred) cred_update_thread(td); + if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { + mtx_lock_spin(&sched_lock); + thread_exit(); + /* NOTREACHED */ + } } else { sticks = 0; /* XXX bogus -Wuninitialized warning */ KASSERT(cold || td->td_ucred != NULL, @@ -799,6 +805,24 @@ framep->tf_cr_iip += 16; } + if (p->p_flag & P_KSES) { + /* + * If we are doing a syscall in a KSE environment, + * note where our mailbox is. There is always the + * possibility that we could do this lazily (in sleep()), + * but for now do it every time. + */ + td->td_mailbox = (void *)fuword((caddr_t)td->td_kse->ke_mailbox + + offsetof(struct kse_mailbox, kmbx_current_thread)); + if ((td->td_mailbox == NULL) || + (td->td_mailbox == (void *)-1)) { + td->td_mailbox = NULL; /* single thread it.. */ + td->td_flags &= ~TDF_UNBOUND; + } else { + td->td_flags |= TDF_UNBOUND; + } + } + #ifdef DIAGNOSTIC ia64_fpstate_check(td); #endif ==== //depot/projects/kse/sys/ia64/ia64/vm_machdep.c#20 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.41 2002/06/24 15:48:00 jake Exp $ + * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.42 2002/06/29 18:26:18 julian Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -112,6 +112,43 @@ return(r); } +void +cpu_thread_exit(struct thread *td) +{ +} + +void +cpu_thread_setup(struct thread *td) +{ +} + +void +cpu_save_upcall(struct thread *td, struct kse *newkse) +{ +} + +void +cpu_set_upcall(struct thread *td, void *pcb) +{ +} + +void +cpu_set_args(struct thread *td, struct kse *ke) +{ +} + +void +cpu_free_kse_mdstorage(struct kse *ke) +{ +} + +int +cpu_export_context(struct thread *td) +{ + return (0); +} + + /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child ==== //depot/projects/kse/sys/kern/init_main.c#44 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/init_main.c,v 1.195 2002/05/16 21:28:11 trhodes Exp $ + * $FreeBSD: src/sys/kern/init_main.c,v 1.196 2002/06/29 17:26:18 julian Exp $ */ #include "opt_init_path.h" ==== //depot/projects/kse/sys/kern/init_sysent.c#21 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.124 2002/06/13 23:44:50 rwatson Exp $ + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.125 2002/06/29 17:26:18 julian Exp $ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp */ ==== //depot/projects/kse/sys/kern/kern_condvar.c#38 (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/kern/kern_condvar.c,v 1.22 2002/06/07 05:39:16 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_condvar.c,v 1.23 2002/06/29 17:26:18 julian Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/kse/sys/kern/kern_exec.c#32 (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/kern/kern_exec.c,v 1.168 2002/06/29 01:50:24 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_exec.c,v 1.169 2002/06/29 17:26:18 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/kern/kern_exit.c#58 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 - * $FreeBSD: src/sys/kern/kern_exit.c,v 1.169 2002/06/29 01:50:24 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_exit.c,v 1.170 2002/06/29 17:26:18 julian Exp $ */ #include "opt_compat.h" ==== //depot/projects/kse/sys/kern/kern_fork.c#74 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_fork.c 8.6 (Berkeley) 4/8/94 - * $FreeBSD: src/sys/kern/kern_fork.c,v 1.150 2002/06/24 06:21:57 mini Exp $ + * $FreeBSD: src/sys/kern/kern_fork.c,v 1.151 2002/06/29 17:26:18 julian Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/kse/sys/kern/kern_idle.c#15 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 2000, All rights reserved. See /usr/src/COPYRIGHT * - * $FreeBSD: src/sys/kern/kern_idle.c,v 1.22 2002/02/07 20:58:44 julian Exp $ + * $FreeBSD: src/sys/kern/kern_idle.c,v 1.23 2002/06/29 17:26:18 julian Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/kse/sys/kern/kern_intr.c#26 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_intr.c,v 1.75 2002/05/29 20:40:50 julian Exp $ + * $FreeBSD: src/sys/kern/kern_intr.c,v 1.76 2002/06/29 17:26:18 julian Exp $ * */ ==== //depot/projects/kse/sys/kern/kern_kthread.c#13 (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/kern/kern_kthread.c,v 1.22 2002/02/07 23:06:26 peter Exp $ + * $FreeBSD: src/sys/kern/kern_kthread.c,v 1.23 2002/06/29 17:26:18 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/kern/kern_mutex.c#30 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.101 2002/06/04 22:36:24 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.102 2002/06/29 17:26:18 julian Exp $ */ /* ==== //depot/projects/kse/sys/kern/kern_poll.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_poll.c,v 1.7 2002/06/27 23:23:04 luigi Exp $ + * $FreeBSD: src/sys/kern/kern_poll.c,v 1.8 2002/06/29 17:26:18 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/kern/kern_proc.c#75 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.7 (Berkeley) 2/14/95 - * $FreeBSD: src/sys/kern/kern_proc.c,v 1.137 2002/06/22 10:05:50 mini Exp $ + * $FreeBSD: src/sys/kern/kern_proc.c,v 1.138 2002/06/29 17:26:18 julian Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/kse/sys/kern/kern_shutdown.c#30 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.128 2002/05/12 18:27:28 marcel Exp $ + * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.129 2002/06/29 17:26:18 julian Exp $ */ #include "opt_ddb.h" ==== //depot/projects/kse/sys/kern/kern_sig.c#58 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.170 2002/06/29 02:00:01 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.171 2002/06/29 17:26:18 julian Exp $ */ #include "opt_compat.h" ==== //depot/projects/kse/sys/kern/kern_subr.c#16 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_subr.c,v 1.55 2002/06/29 00:29:12 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_subr.c,v 1.56 2002/06/29 17:26:18 julian Exp $ */ #include "opt_zero.h" ==== //depot/projects/kse/sys/kern/kern_switch.c#62 (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/kern/kern_switch.c,v 1.28 2002/06/20 06:21:20 peter Exp $ + * $FreeBSD: src/sys/kern/kern_switch.c,v 1.29 2002/06/29 17:26:18 julian Exp $ */ /*** ==== //depot/projects/kse/sys/kern/kern_synch.c#75 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/kern/kern_synch.c,v 1.177 2002/06/29 02:00:01 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_synch.c,v 1.178 2002/06/29 17:26:18 julian Exp $ */ #include "opt_ddb.h" ==== //depot/projects/kse/sys/kern/subr_smp.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/subr_smp.c,v 1.168 2002/04/05 10:00:37 bde Exp $ + * $FreeBSD: src/sys/kern/subr_smp.c,v 1.169 2002/06/29 17:26:18 julian Exp $ */ /* ==== //depot/projects/kse/sys/kern/subr_trap.c#74 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/kern/subr_trap.c,v 1.218 2002/06/24 06:21:57 mini Exp $ + * $FreeBSD: src/sys/kern/subr_trap.c,v 1.219 2002/06/29 17:26:18 julian Exp $ */ #ifdef __i386__ ==== //depot/projects/kse/sys/kern/subr_witness.c#28 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/subr_witness.c,v 1.118 2002/06/06 20:51:03 jhb Exp $ + * $FreeBSD: src/sys/kern/subr_witness.c,v 1.119 2002/06/29 17:26:18 julian Exp $ */ /* ==== //depot/projects/kse/sys/kern/sys_generic.c#29 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)sys_generic.c 8.5 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/sys_generic.c,v 1.103 2002/06/20 18:52:54 alfred Exp $ + * $FreeBSD: src/sys/kern/sys_generic.c,v 1.104 2002/06/29 17:26:18 julian Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/kse/sys/kern/sys_process.c#27 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/sys_process.c,v 1.94 2002/05/19 01:37:43 marcel Exp $ + * $FreeBSD: src/sys/kern/sys_process.c,v 1.95 2002/06/29 17:26:18 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/kern/syscalls.master#20 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.114 2002/06/29 17:26:19 julian Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. ==== //depot/projects/kse/sys/kern/tty.c#29 (text+ko) ==== @@ -44,7 +44,7 @@ * SUCH DAMAGE. * * @(#)tty.c 8.8 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/tty.c,v 1.182 2002/06/20 14:03:36 iedowse Exp $ + * $FreeBSD: src/sys/kern/tty.c,v 1.183 2002/06/29 17:26:19 julian Exp $ */ /*- ==== //depot/projects/kse/sys/kern/vfs_export.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_export.c,v 1.316 2002/06/28 23:17:36 alfred Exp $ + * $FreeBSD: src/sys/kern/vfs_export.c,v 1.318 2002/06/29 17:58:44 alfred Exp $ */ #include <sys/param.h> @@ -129,7 +129,7 @@ if (saddr->sa_len > argp->ex_addrlen) saddr->sa_len = argp->ex_addrlen; if (argp->ex_masklen) { - smask = (struct sockaddr *) (saddr + argp->ex_addrlen); + smask = (struct sockaddr *)((caddr_t)saddr + argp->ex_addrlen); error = copyin(argp->ex_mask, smask, argp->ex_masklen); if (error) goto out; @@ -153,11 +153,22 @@ goto out; } } - rn = (*rnh->rnh_addaddr) (saddr, smask, rnh, - np->netc_rnodes); - if (rn == 0 || np != (struct netcred *) rn) { /* already exists */ - error = EPERM; - goto out; + rn = (*rnh->rnh_addaddr)(saddr, smask, rnh, np->netc_rnodes); + if (rn == 0) { + /* + * One of the reasons that rnh_addaddr may fail is that + * the entry already exists. To check for this case, we + * look up the entry to see if it is there. If so, we + * do not need to make a new entry but do return success. + */ + free(np, M_NETADDR); + rn = (*rnh->rnh_matchaddr)(saddr, rnh); + if (rn != 0 && (rn->rn_flags & RNF_ROOT) == 0 && + ((struct netcred *)rn)->netc_exflags == argp->ex_flags && + !bcmp(&((struct netcred *)rn)->netc_anon, + &argp->ex_anon, sizeof(struct ucred))) + return (0); + return (EPERM); } np->netc_exflags = argp->ex_flags; bzero(&np->netc_anon, sizeof(np->netc_anon)); @@ -357,8 +368,7 @@ rnh = nep->ne_rtable[saddr->sa_family]; if (rnh != NULL) { np = (struct netcred *) - (*rnh->rnh_matchaddr)(saddr, - rnh); + (*rnh->rnh_matchaddr)(saddr, rnh); if (np && np->netc_rnodes->rn_flags & RNF_ROOT) np = NULL; } ==== //depot/projects/kse/sys/posix4/ksched.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/posix4/ksched.c,v 1.17 2002/02/11 20:37:54 julian Exp $ + * $FreeBSD: src/sys/posix4/ksched.c,v 1.18 2002/06/29 17:26:20 julian Exp $ */ /* ksched: Soft real time scheduling based on "rtprio". ==== //depot/projects/kse/sys/sparc64/sparc64/genassym.c#27 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/sparc64/sparc64/genassym.c,v 1.34 2002/05/29 06:08:44 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/genassym.c,v 1.35 2002/06/29 17:26:21 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/sparc64/sparc64/swtch.s#18 (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/sparc64/sparc64/swtch.s,v 1.18 2002/03/07 05:15:43 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/swtch.s,v 1.19 2002/06/29 17:26:21 julian Exp $ */ #include <machine/asmacros.h> ==== //depot/projects/kse/sys/sparc64/sparc64/trap.c#33 (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.41 2002/06/24 06:21:59 mini Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.42 2002/06/29 17:26:21 julian Exp $ */ #include "opt_ddb.h" ==== //depot/projects/kse/sys/sparc64/sparc64/vm_machdep.c#26 (text+ko) ==== @@ -40,7 +40,7 @@ * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ * from: FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.167 2001/07/12 - * $FreeBSD: src/sys/sparc64/sparc64/vm_machdep.c,v 1.25 2002/06/24 15:48:01 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/vm_machdep.c,v 1.26 2002/06/29 17:26:21 julian Exp $ */ #include <sys/param.h> ==== //depot/projects/kse/sys/sys/condvar.h#7 (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/condvar.h,v 1.7 2002/03/31 07:23:29 phk Exp $ + * $FreeBSD: src/sys/sys/condvar.h,v 1.8 2002/06/29 17:26:22 julian Exp $ */ #ifndef _SYS_CONDVAR_H_ ==== //depot/projects/kse/sys/sys/proc.h#118 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.225 2002/06/24 16:44:38 markm Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.226 2002/06/29 17:26:22 julian Exp $ */ #ifndef _SYS_PROC_H_ ==== //depot/projects/kse/sys/sys/queue.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $FreeBSD: src/sys/sys/queue.h,v 1.48 2002/04/17 14:00:37 tmm Exp $ + * $FreeBSD: src/sys/sys/queue.h,v 1.49 2002/06/29 17:26:22 julian Exp $ */ #ifndef _SYS_QUEUE_H_ ==== //depot/projects/kse/sys/sys/signalvar.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signalvar.h 8.6 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/signalvar.h,v 1.52 2002/05/29 23:44:32 julian Exp $ + * $FreeBSD: src/sys/sys/signalvar.h,v 1.53 2002/06/29 17:26:22 julian Exp $ */ #ifndef _SYS_SIGNALVAR_H_ ==== //depot/projects/kse/sys/sys/systm.h#27 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sys/sys/systm.h,v 1.177 2002/06/20 07:23:08 peter Exp $ + * $FreeBSD: src/sys/sys/systm.h,v 1.178 2002/06/29 17:26:22 julian Exp $ */ #ifndef _SYS_SYSTM_H_ ==== //depot/projects/kse/sys/sys/ucred.h#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ucred.h 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/ucred.h,v 1.37 2002/06/24 11:37:56 bde Exp $ + * $FreeBSD: src/sys/sys/ucred.h,v 1.38 2002/06/29 17:26:22 julian Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< 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?200206291918.g5TJIcuk062804>