PERFORCE change 65936 for review

Robert Watson rwatson at FreeBSD.org
Sat Nov 27 12:34:56 PST 2004 

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

Change 65936 by rwatson at rwatson_paprika on 2004/11/27 20:34:13

	Integrate netperf_socket from FreeBSD CVS HEAD:
	
	- De-MNT_NODEV.
	- De-pecoff/linux/a.out core dump.
	- De vfs_start.
	- Less vop_open().
	- Less user.h as less u-area.
	- TCP_INFO socket option.

Affected files ...

.. //depot/projects/netperf_socket/sys/alpha/alpha/db_trace.c#6 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/fp_emulate.c#3 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#11 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/mp_machdep.c#4 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#20 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/prom.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/sys_machdep.c#3 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/trap.c#4 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/vm_machdep.c#7 integrate
.. //depot/projects/netperf_socket/sys/alpha/linux/linux_machdep.c#4 integrate
.. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_misc.c#8 integrate
.. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_signal.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/fpu.c#6 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#21 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#30 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#12 integrate
.. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#8 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/trap.c#5 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/undefined.c#3 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/vm_machdep.c#8 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.S#6 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/btx.S#4 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#9 integrate
.. //depot/projects/netperf_socket/sys/compat/linux/linux_file.c#5 integrate
.. //depot/projects/netperf_socket/sys/compat/pecoff/imgact_pecoff.c#4 integrate
.. //depot/projects/netperf_socket/sys/compat/svr4/svr4_misc.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#16 integrate
.. //depot/projects/netperf_socket/sys/dev/mii/mii.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/mlx/mlx_disk.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/mlx/mlxreg.h#2 integrate
.. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vfsops.c#6 integrate
.. //depot/projects/netperf_socket/sys/fs/nullfs/null_vfsops.c#7 integrate
.. //depot/projects/netperf_socket/sys/fs/nullfs/null_vnops.c#3 integrate
.. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_vfsops.c#5 integrate
.. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_vfsops.c#6 integrate
.. //depot/projects/netperf_socket/sys/fs/umapfs/umap_vfsops.c#6 integrate
.. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum.c#11 integrate
.. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum.h#6 integrate
.. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_init.c#5 integrate
.. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_plex.c#9 integrate
.. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_raid5.c#8 integrate
.. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_raid5.h#4 integrate
.. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_state.c#5 integrate
.. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_var.h#4 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#16 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#32 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/sys_machdep.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/vm86.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#17 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/npx.c#10 integrate
.. //depot/projects/netperf_socket/sys/i386/linux/linux_sysvec.c#5 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/machdep.c#14 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/trap.c#10 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/vm_machdep.c#7 integrate
.. //depot/projects/netperf_socket/sys/kern/imgact_aout.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/init_main.c#13 integrate
.. //depot/projects/netperf_socket/sys/kern/init_sysent.c#14 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#23 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_exec.c#20 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_exit.c#22 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_fork.c#22 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_proc.c#20 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_synch.c#20 integrate
.. //depot/projects/netperf_socket/sys/kern/sys_process.c#12 integrate
.. //depot/projects/netperf_socket/sys/kern/syscalls.c#14 integrate
.. //depot/projects/netperf_socket/sys/kern/syscalls.master#14 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#19 integrate
.. //depot/projects/netperf_socket/sys/modules/if_gif/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp.h#7 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#23 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_usrreq.c#17 integrate
.. //depot/projects/netperf_socket/sys/pc98/i386/machdep.c#14 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/db_trace.c#6 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/fpu.c#3 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/machdep.c#9 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/mp_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/trap.c#7 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/vm_machdep.c#10 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/db_trace.c#6 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/machdep.c#11 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/rwindow.c#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/trap.c#4 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/vm_machdep.c#11 integrate
.. //depot/projects/netperf_socket/sys/sys/jail.h#4 integrate
.. //depot/projects/netperf_socket/sys/sys/mount.h#15 integrate
.. //depot/projects/netperf_socket/sys/sys/user.h#11 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#15 integrate
.. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_extern.h#5 integrate
.. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vfsops.c#4 integrate
.. //depot/projects/netperf_socket/sys/vm/uma_int.h#4 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_contig.c#13 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_glue.c#17 integrate

Differences ...

==== //depot/projects/netperf_socket/sys/alpha/alpha/db_trace.c#6 (text+ko) ====

@@ -42,17 +42,17 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.22 2004/11/01 22:15:13 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.23 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kdb.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/sysent.h>
 
 #include <machine/db_machdep.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 
 #include <ddb/ddb.h>
 #include <ddb/db_sym.h> 

==== //depot/projects/netperf_socket/sys/alpha/alpha/fp_emulate.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.14 2004/05/06 09:35:57 das Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.15 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -34,7 +34,6 @@
 #include <sys/proc.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
@@ -47,6 +46,7 @@
 #include <machine/fpu.h>
 #include <machine/inst.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/reg.h>
 
 #include <alpha/alpha/ieee_float.h>

==== //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#11 (text+ko) ====

@@ -88,7 +88,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.225 2004/11/20 02:29:36 das Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.226 2004/11/27 06:51:32 das Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
@@ -132,7 +132,6 @@
 #include <vm/vm_extern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>
-#include <sys/user.h>
 #include <sys/ptrace.h>
 #include <sys/ucontext.h>
 #include <machine/clock.h>
@@ -141,6 +140,7 @@
 #include <machine/pal.h>
 #include <machine/cpuconf.h>
 #include <machine/bootinfo.h>
+#include <machine/pcb.h>
 #include <machine/rpb.h>
 #include <machine/prom.h>
 #include <machine/chipset.h>

==== //depot/projects/netperf_socket/sys/alpha/alpha/mp_machdep.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.54 2004/11/20 02:29:36 das Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.55 2004/11/27 06:51:32 das Exp $");
 
 #include "opt_kstack_pages.h"
 
@@ -42,7 +42,6 @@
 #include <sys/smp.h>
 #include <sys/sysctl.h>
 #include <sys/bus.h>
-#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
@@ -51,6 +50,7 @@
 #include <machine/atomic.h>
 #include <machine/clock.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/pmap.h>
 #include <machine/prom.h>
 #include <machine/rpb.h>

==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#20 (text+ko) ====

@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.173 2004/10/03 00:16:42 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.174 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -173,9 +173,8 @@
 #include <vm/vm_pager.h>
 #include <vm/uma.h>
 
-#include <sys/user.h>
-
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/rpb.h>
 
 #ifndef PMAP_SHPGPERPROC

==== //depot/projects/netperf_socket/sys/alpha/alpha/prom.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 /* __KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.22 1998/02/27 04:03:00 thorpej Exp $"); */
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/prom.c,v 1.28 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/prom.c,v 1.29 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -35,10 +35,10 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/cons.h>
 
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/prom.h>
 #include <machine/rpb.h>
 #include <machine/vmparam.h>

==== //depot/projects/netperf_socket/sys/alpha/alpha/sys_machdep.c#3 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.27 2004/04/05 21:00:49 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.28 2004/11/27 06:51:32 das Exp $");
 
 #include "opt_mac.h"
 
@@ -42,7 +42,6 @@
 #include <sys/proc.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <sys/user.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
@@ -50,6 +49,7 @@
 #include <vm/vm_extern.h>
 
 #include <machine/cpu.h>
+#include <machine/pcb.h>
 #include <machine/sysarch.h>
 
 #include <vm/vm_kern.h>		/* for kernel_map */

==== //depot/projects/netperf_socket/sys/alpha/alpha/trap.c#4 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.120 2004/08/31 07:34:53 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.121 2004/11/27 06:51:32 das Exp $");
 
 /* #include "opt_fix_unaligned_vax_fp.h" */
 #include "opt_ddb.h"
@@ -55,12 +55,12 @@
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_param.h>
-#include <sys/user.h>
 #include <sys/ptrace.h>
 #include <machine/clock.h>
 #include <machine/md_var.h>
 #include <machine/reg.h>
 #include <machine/pal.h>
+#include <machine/pcb.h>
 #include <machine/fpu.h>
 
 #ifdef KTRACE

==== //depot/projects/netperf_socket/sys/alpha/alpha/vm_machdep.c#7 (text+ko) ====

@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.104 2004/05/26 12:09:36 tmm Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.105 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,6 +89,7 @@
 #include <machine/cpu.h>
 #include <machine/fpu.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/prom.h>
 
 #include <vm/vm.h>
@@ -99,8 +100,6 @@
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
-#include <sys/user.h>
-
 /*
  * 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/netperf_socket/sys/alpha/linux/linux_machdep.c#4 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.34 2004/09/01 02:11:27 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.35 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -36,10 +36,13 @@
 #include <sys/mount.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
+#include <sys/resource.h>
+#include <sys/resourcevar.h>
 #include <sys/syscallsubr.h>
 #include <sys/sysproto.h>
 #include <sys/unistd.h>
-#include <sys/user.h>
+
+#include <machine/pcb.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>

==== //depot/projects/netperf_socket/sys/alpha/osf1/osf1_misc.c#8 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.50 2004/10/14 10:43:47 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.51 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,7 +66,6 @@
 #include <sys/sysproto.h>
 #include <sys/systm.h>
 #include <sys/unistd.h>
-#include <sys/user.h>
 #include <sys/utsname.h>
 #include <sys/vnode.h>
 #include <sys/wait.h>
@@ -82,6 +81,7 @@
 #include <machine/cpuconf.h>
 #include <machine/fpu.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/rpb.h>
 
 #include <alpha/osf1/exec_ecoff.h>

==== //depot/projects/netperf_socket/sys/alpha/osf1/osf1_signal.c#2 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.36 2004/01/03 23:36:31 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.37 2004/11/27 06:51:32 das Exp $");
 
 #include "opt_compat.h"
 #ifndef COMPAT_43
@@ -66,7 +66,6 @@
 #include <vm/vm_extern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>
-#include <sys/user.h>
 #include <sys/ptrace.h>
 #include <sys/cons.h>
 #include <machine/clock.h>
@@ -83,6 +82,7 @@
 #include <ddb/ddb.h>
 #include <alpha/alpha/db_instruction.h>
 #include <sys/vnode.h>
+#include <machine/pcb.h>
 
 #include <alpha/osf1/osf1_signal.h>
 #include <alpha/osf1/osf1_proto.h>

==== //depot/projects/netperf_socket/sys/amd64/amd64/fpu.c#6 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.154 2004/06/18 04:01:54 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.155 2004/11/27 06:51:32 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -47,7 +47,6 @@
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <sys/signalvar.h>
-#include <sys/user.h>
 
 #include <machine/cputypes.h>
 #include <machine/frame.h>

==== //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#21 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.623 2004/11/20 02:29:23 das Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.624 2004/11/27 06:51:32 das Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
@@ -82,6 +82,8 @@
 #include <sys/bus.h>
 #include <sys/eventhandler.h>
 
+#include <machine/pcb.h>
+
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_kern.h>
@@ -91,7 +93,6 @@
 #include <vm/vm_pager.h>
 #include <vm/vm_extern.h>
 
-#include <sys/user.h>
 #include <sys/exec.h>
 #include <sys/cons.h>
 

==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#30 (text+ko) ====

@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.508 2004/10/08 08:23:42 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.509 2004/11/27 06:51:33 das Exp $");
 
 /*
  *	Manages physical address maps.
@@ -116,7 +116,6 @@
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/sx.h>
-#include <sys/user.h>
 #include <sys/vmmeter.h>
 #include <sys/sched.h>
 #include <sys/sysctl.h>
@@ -138,6 +137,7 @@
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/specialreg.h>
 #ifdef SMP
 #include <machine/smp.h>

==== //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#12 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.237 2004/08/16 22:57:13 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.238 2004/11/27 06:51:34 das Exp $");
 
 #include "opt_isa.h"
 #include "opt_cpu.h"
@@ -62,7 +62,6 @@
 #include <sys/smp.h>
 #include <sys/sysctl.h>
 #include <sys/unistd.h>
-#include <sys/user.h>
 #include <sys/vnode.h>
 #include <sys/vmmeter.h>
 

==== //depot/projects/netperf_socket/sys/amd64/linux32/linux32_sysvec.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.3 2004/08/16 11:15:46 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.4 2004/11/27 06:51:34 das Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
@@ -56,12 +56,12 @@
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
+#include <sys/resourcevar.h>
 #include <sys/signalvar.h>
 #include <sys/sysctl.h>
 #include <sys/syscallsubr.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <sys/user.h>
 #include <sys/vnode.h>
 
 #include <vm/vm.h>
@@ -74,6 +74,7 @@
 
 #include <machine/cpu.h>
 #include <machine/md_var.h>
+#include <machine/pcb.h>
 #include <machine/specialreg.h>
 
 #include <amd64/linux32/linux.h>

==== //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#8 (text+ko) ====

@@ -30,18 +30,18 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.8 2004/11/21 19:41:27 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.9 2004/11/27 06:51:34 das Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 
 
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/kdb.h>
 #include <machine/armreg.h>
 #include <machine/asm.h>
 #include <machine/cpufunc.h>
 #include <machine/db_machdep.h>
+#include <machine/pcb.h>
 #include <machine/vmparam.h>
 #include <ddb/ddb.h>
 #include <ddb/db_access.h>

==== //depot/projects/netperf_socket/sys/arm/arm/trap.c#5 (text+ko) ====

@@ -82,14 +82,13 @@
 #include "opt_ktrace.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.4 2004/11/20 00:55:57 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.5 2004/11/27 06:51:34 das Exp $");
 
 #include <sys/types.h>
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
@@ -112,6 +111,7 @@
 #include <machine/katelib.h>
 #include <machine/cpu.h>
 #include <machine/intr.h>
+#include <machine/pcb.h>
 #include <machine/proc.h>
 #include <machine/swi.h>
 #if !defined(DDB)

==== //depot/projects/netperf_socket/sys/arm/arm/undefined.c#3 (text+ko) ====

@@ -48,7 +48,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.3 2004/11/21 18:11:39 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.4 2004/11/27 06:51:34 das Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -56,7 +56,6 @@
 #include <sys/signal.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/syslog.h>
 #include <sys/vmmeter.h>
 #include <sys/types.h>

==== //depot/projects/netperf_socket/sys/arm/arm/vm_machdep.c#8 (text+ko) ====

@@ -81,7 +81,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.8 2004/11/20 16:51:32 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.9 2004/11/27 06:51:34 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -91,7 +91,6 @@
 #include <sys/proc.h>
 #include <sys/socketvar.h>
 #include <sys/sf_buf.h>
-#include <sys/user.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 #include <vm/vm.h>

==== //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.S#6 (text+ko) ====

@@ -13,13 +13,13 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.11 2004/11/06 06:13:13 keramida Exp $
+ * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.12 2004/11/24 15:39:04 jhb Exp $
  */
 
 /* A 512-byte boot manager. */
 #ifdef SIO
 /* ... using a serial console on COM1. */
-#endif /* SIO */
+#endif
 
 		.set NHRDRV,0x475		# Number of hard drives
 		.set ORIGIN,0x600		# Execution address
@@ -92,13 +92,13 @@
 		jmp main-LOAD+ORIGIN		# To relocated code
 
 main:
-#ifdef SIO
+#if defined(SIO) && COMSPEED != 0
 /*
  * Initialize the serial port.  bioscom preserves the driver number in DX.
  */
 		movw COMSPEED,%ax		# defined by Makefile
 		callw bioscom
-#endif /* SIO */
+#endif
 /*
  * Check what flags were loaded with us, specifically if a predefined drive
  * number should be used.  If what the bios gives us is bad, use the '0' in
@@ -235,18 +235,18 @@
 		xorb %ah,%ah			# BIOS: Get
 		int $0x16			#  keypress
 		movb %ah,%al			# Scan code
-#else /* SIO */
+#else
 		movb $0x02,%ah			# BIOS: Receive
 		call bioscom
-#endif /* SIO */
+#endif
 /*
  * If it's CR act as if timed out.
  */
 #ifndef SIO
 		cmpb $KEY_ENTER,%al		# Enter pressed?
-#else /* SIO */
+#else
 		cmpb $ASCII_CR,%al		# Enter pressed?
-#endif /* SIO */
+#endif
 		je main.9			# Yes
 /*
  * Otherwise check if legal. If not ask again.
@@ -256,9 +256,9 @@
 		cmpb $0x4,%al			# F1..F5?
 		jna main.12			# Yes
 		subb $(KEY_1 - KEY_F1),%al	# Less #1 scan code
-#else /* SIO */
+#else
 		subb $'1',%al			# Less '1' ascii character
-#endif /* SIO */
+#endif
 		cmpb $0x4,%al			# #1..#5?
 		ja main.10			# No
 /*
@@ -326,7 +326,7 @@
 #ifndef SIO
 		movb $'F',%al			# Display
 		callw putchr			#  'F'
-#endif /* SIO */
+#endif
 		movb $'1',%al			# Prepare
 		addb %dl,%al			#  digit
 		jmp putstr.1			# Display the rest

==== //depot/projects/netperf_socket/sys/boot/i386/btx/btx/btx.S#4 (text+ko) ====

@@ -12,7 +12,7 @@
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
- * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.37 2004/05/14 20:29:30 ru Exp $
+ * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.38 2004/11/24 14:54:33 jhb Exp $
  */
 
 /*
@@ -975,8 +975,9 @@
 		.set SIO_FMT,SIOFMT		# 8N1
 		.set SIO_DIV,(115200/SIOSPD)	# 115200 / SPD
 
+/*
  * void sio_init(void)
-
+ */
 sio_init:	movw $SIO_PRT+0x3,%dx		# Data format reg
 		movb $SIO_FMT|0x80,%al		# Set format
 		outb %al,(%dx)			#  and DLAB
@@ -992,15 +993,17 @@
 		outb %al,(%dx)			#  DTR
 		incl %edx			# Line status reg
 
+/*
  * void sio_flush(void)
-
+ */
 sio_flush.0:	call sio_getc.1 		# Get character
 sio_flush:	call sio_ischar 		# Check for character
 		jnz sio_flush.0 		# Till none
 		ret				# To caller
 
+/*
  * void sio_putc(int c)
-
+ */
 sio_putc:	movw $SIO_PRT+0x5,%dx		# Line status reg
 		xor %ecx,%ecx			# Timeout
 		movb $0x40,%ch			#  counter
@@ -1013,16 +1016,18 @@
 		outb %al,(%dx)			# Write character
 sio_putc.2:	ret $0x4			# To caller
 
+/*
  * int sio_getc(void)
-
+ */
 sio_getc:	call sio_ischar 		# Character available?
 		jz sio_getc			# No
 sio_getc.1:	subb $0x5,%dl			# Receiver buffer reg
 		inb (%dx),%al			# Read character
 		ret				# To caller
 
+/*
  * int sio_ischar(void)
-
+ */
 sio_ischar:	movw $SIO_PRT+0x5,%dx		# Line status register
 		xorl %eax,%eax			# Zero
 		inb (%dx),%al			# Received data

==== //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#9 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.25 2004/10/11 22:04:15 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.26 2004/11/27 06:51:34 das Exp $");
 
 #include "opt_compat.h"
 
@@ -64,8 +64,6 @@
 #include <sys/sysproto.h>
 #include <sys/systm.h>
 #include <sys/unistd.h>
-#include <sys/user.h>
-#include <sys/utsname.h>
 #include <sys/vnode.h>
 #include <sys/wait.h>
 

==== //depot/projects/netperf_socket/sys/compat/linux/linux_file.c#5 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.87 2004/08/16 07:28:16 tjr Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.88 2004/11/26 07:39:20 phk Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
@@ -786,8 +786,6 @@
 			fsflags |= MNT_RDONLY;
 		if (args->rwflag & LINUX_MS_NOSUID)
 			fsflags |= MNT_NOSUID;
-		if (args->rwflag & LINUX_MS_NODEV)
-			fsflags |= MNT_NODEV;
 		if (args->rwflag & LINUX_MS_NOEXEC)
 			fsflags |= MNT_NOEXEC;
 		if (args->rwflag & LINUX_MS_REMOUNT)

==== //depot/projects/netperf_socket/sys/compat/pecoff/imgact_pecoff.c#4 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.34 2004/11/20 02:32:04 das Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.35 2004/11/27 06:46:45 das Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,7 +66,6 @@
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
 
-#include <sys/user.h>
 #include <sys/exec.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
@@ -79,13 +78,8 @@
 
 #include "opt_pecoff.h"
 
-#define	uarea_pages	1
-
 #define PECOFF_PE_SIGNATURE "PE\0\0"
 static int      pecoff_fixup(register_t **, struct image_params *);
-static int 
-pecoff_coredump(register struct thread *, register struct vnode *,
-		off_t);
 #ifndef PECOFF_DEBUG
 #define DPRINTF(a)
 #else
@@ -106,7 +100,7 @@
 	&szsigcode,
 	0,
 	"FreeBSD PECoff",
-	pecoff_coredump,
+	NULL,
 	NULL,
 	MINSIGSTKSZ,
 	PAGE_SIZE,
@@ -167,66 +161,6 @@
 	return 0;
 }
 
-
-static int 
-pecoff_coredump(register struct thread * td, register struct vnode * vp,
-		off_t limit)
-{
-	register struct ucred *cred = td->td_ucred;
-	struct proc *p = td->td_proc;
-	register struct vmspace *vm = p->p_vmspace;
-	char *tempuser;
-	int             error;
-#ifdef PECOFF_DEBUG
-	struct vm_map  *map;
-	struct vm_map_entry *ent;
-	struct reg      regs;
-
-#endif
-	if (ctob((uarea_pages + kstack_pages) + vm->vm_dsize + vm->vm_ssize) >=
-	    limit)
-		return (EFAULT);
-	tempuser = malloc(ctob(uarea_pages + kstack_pages), M_TEMP,
-	    M_WAITOK | M_ZERO);
-	if (tempuser == NULL)
-		return (ENOMEM);
-	PROC_LOCK(p);
-	fill_user(p, (struct user *)tempuser);
-	PROC_UNLOCK(p);
-	bcopy(td->td_frame,
-	    tempuser + ctob(uarea_pages) +
-	    ((caddr_t)td->td_frame - (caddr_t)td->td_kstack),
-	    sizeof(struct trapframe));
-#if PECOFF_DEBUG
-	fill_regs(td, &regs);
-	printf("EIP%x\n", regs.r_eip);
-	printf("EAX%x EBX%x ECX%x EDI%x\n",
-	       regs.r_eax, regs.r_ebx, regs.r_ecx, regs.r_edi);
-	map = &vm->vm_map;
-	ent = &map->header;
-	printf("%p %p %p\n", ent, ent->prev, ent->next);
-#endif
-	error = vn_rdwr(UIO_WRITE, vp, (caddr_t)tempuser,
-	    ctob(uarea_pages + kstack_pages),
-	    (off_t)0, UIO_SYSSPACE, IO_UNIT, cred, NOCRED,
-	    (int *)NULL, td);
-	free(tempuser, M_TEMP);
-	if (error == 0)
-		error = vn_rdwr_inchunks(UIO_WRITE, vp, vm->vm_daddr,
-		    (int)ctob(vm->vm_dsize),
-		    (off_t)ctob((uarea_pages + kstack_pages)),
-		    UIO_USERSPACE, IO_UNIT, cred, NOCRED, NULL, td);
-	if (error == 0)
-		error = vn_rdwr_inchunks(UIO_WRITE, vp,
-		    (caddr_t)trunc_page(USRSTACK - ctob(vm->vm_ssize)),
-		    round_page(ctob(vm->vm_ssize)),
-		    (off_t)ctob((uarea_pages + kstack_pages)) +
-		    ctob(vm->vm_dsize),
-		    UIO_USERSPACE, IO_UNIT, cred, NOCRED, NULL, td);
-	return (error);
-
-}
-
 static int 
 pecoff_load_section(struct thread * td, struct vmspace * vmspace, struct vnode * vp, vm_offset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot)
 {

==== //depot/projects/netperf_socket/sys/compat/svr4/svr4_misc.c#6 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.75 2004/11/13 11:53:00 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.76 2004/11/27 06:51:35 das Exp $");
 
 #include "opt_mac.h"
 
@@ -57,13 +57,13 @@
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
 #include <sys/sem.h>
+#include <sys/signalvar.h>
 #include <sys/stat.h>
 #include <sys/sx.h>
 #include <sys/sysproto.h>
 #include <sys/time.h>
 #include <sys/times.h>
 #include <sys/uio.h>
-#include <sys/user.h>
 #include <sys/vnode.h>
 #include <sys/wait.h>
 

==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#16 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.34 2004/11/23 22:26:44 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.35 2004/11/26 23:31:59 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
@@ -580,6 +580,7 @@
 static int
 acpi_pci_link_resume(device_t dev)
 {
+#if 0 /* XXX Disabled temporarily since this hangs resume. */
 	ACPI_STATUS status;
 
 	ACPI_SERIAL_BEGIN(pci_link);
@@ -588,6 +589,7 @@
 	if (ACPI_FAILURE(status))
 		return (ENXIO);
 	else
+#endif
 		return (0);
 }
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

More information about the p4-projects mailing list