PERFORCE change 56368 for review

Robert Watson rwatson at FreeBSD.org
Fri Jul 2 21:54:55 PDT 2004 

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

Change 56368 by rwatson at rwatson_tislabs on 2004/07/03 04:54:49

	Integrate netperf_socket:
	
	- John's new ithread preemption bits.
	- ACPI quirks.
	- GEOM_LABEL.
	- Turnstile/sleepqueue profiling.
	- Verbosity reduction.
	- BURN_BRIDGES pci powerstate. 
	- USB vendor/product/... ids.
	- Profiling fixes.   
	- ALTQ driver changes.
	- TCP SACK fixes. 
	- Various other changes...

Affected files ...

.. //depot/projects/netperf_socket/sys/alpha/alpha/busdma_machdep.c#3 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/interrupt.c#4 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/sgmap.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/include/param.h#3 integrate
.. //depot/projects/netperf_socket/sys/alpha/isa/isa.c#3 integrate
.. //depot/projects/netperf_socket/sys/alpha/mcbus/mcpcia.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/pci/apecs.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/pci/cia.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/pci/pcibus.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/pci/t2.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/pci/tsunami.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/pci/tsunami_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/tlsb/dwlpx.c#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#4 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/nexus.c#4 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/param.h#3 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/intr.c#2 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/nexus.c#2 integrate
.. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0.c#3 integrate
.. //depot/projects/netperf_socket/sys/boot/common/loader.8#5 integrate
.. //depot/projects/netperf_socket/sys/boot/common/newvers.sh#3 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_proto.h#6 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/syscalls.master#5 integrate
.. //depot/projects/netperf_socket/sys/compat/linux/linux_ioctl.c#5 integrate
.. //depot/projects/netperf_socket/sys/compat/linux/linux_ioctl.h#5 integrate
.. //depot/projects/netperf_socket/sys/conf/NOTES#25 integrate
.. //depot/projects/netperf_socket/sys/conf/files#35 integrate
.. //depot/projects/netperf_socket/sys/conf/files.amd64#9 integrate
.. //depot/projects/netperf_socket/sys/conf/files.i386#18 integrate
.. //depot/projects/netperf_socket/sys/conf/files.ia64#4 integrate
.. //depot/projects/netperf_socket/sys/conf/kmod.mk#11 integrate
.. //depot/projects/netperf_socket/sys/conf/newvers.sh#3 integrate
.. //depot/projects/netperf_socket/sys/conf/options#17 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/acpica/CHANGES.txt#6 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acconfig.h#6 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acfreebsd.h#8 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acinterp.h#4 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acmacros.h#5 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbcmds.c#4 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbdisply.c#4 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsopcode.c#4 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evgpe.c#6 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evgpeblk.c#5 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exconfig.c#4 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exfldio.c#4 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/acpica/tbxfroot.c#3 integrate
.. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/fil.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#30 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_acad.c#8 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_button.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cmbat.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_ec.c#10 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_if.m#1 branch
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_isab.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_lid.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#13 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#9 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_acpi.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_powerres.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_quirk.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_quirks#2 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_resource.c#8 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#17 integrate
.. //depot/projects/netperf_socket/sys/dev/amr/amr.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/amr/amrvar.h#4 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-raid.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/digi/digi.c#10 integrate
.. //depot/projects/netperf_socket/sys/dev/em/if_em.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwohci_pci.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#11 integrate
.. //depot/projects/netperf_socket/sys/dev/ixgb/if_ixgb.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#12 integrate
.. //depot/projects/netperf_socket/sys/dev/pci/pci.c#9 integrate
.. //depot/projects/netperf_socket/sys/dev/pci/pci_pci.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/puc/puc.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/random/randomdev.c#9 integrate
.. //depot/projects/netperf_socket/sys/dev/rc/rc.c#9 integrate
.. //depot/projects/netperf_socket/sys/dev/re/if_re.c#10 integrate
.. //depot/projects/netperf_socket/sys/dev/sab/sab.c#8 integrate
.. //depot/projects/netperf_socket/sys/dev/sio/sio.c#16 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pcm/dsp.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/txp/if_txp.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/uart/uart_tty.c#8 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ehci.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uftdi.c#8 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uftdireg.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ugen.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uhub.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usb_subr.c#8 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#16 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdivar.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/zs/zs.c#7 integrate
.. //depot/projects/netperf_socket/sys/geom/gate/g_gate.c#6 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_disk.c#6 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_slice.c#4 integrate
.. //depot/projects/netperf_socket/sys/geom/label/g_label.c#1 branch
.. //depot/projects/netperf_socket/sys/geom/label/g_label.h#1 branch
.. //depot/projects/netperf_socket/sys/geom/label/g_label_iso9660.c#1 branch
.. //depot/projects/netperf_socket/sys/geom/label/g_label_msdosfs.c#1 branch
.. //depot/projects/netperf_socket/sys/geom/label/g_label_ufs.c#1 branch
.. //depot/projects/netperf_socket/sys/i386/acpica/acpi_asus.c#5 integrate
.. //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#8 integrate
.. //depot/projects/netperf_socket/sys/i386/acpica/acpi_toshiba.c#9 integrate
.. //depot/projects/netperf_socket/sys/i386/conf/NOTES#21 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/i686_mem.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/intr_machdep.c#4 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/mptable.c#5 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/nexus.c#4 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#15 integrate
.. //depot/projects/netperf_socket/sys/i386/include/param.h#3 integrate
.. //depot/projects/netperf_socket/sys/i386/include/pmap.h#9 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/isa.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/vesa.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/pci/pci_pir.c#6 integrate
.. //depot/projects/netperf_socket/sys/ia64/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/interrupt.c#4 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/nexus.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/init_sysent.c#8 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_clock.c#7 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_idle.c#4 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_intr.c#7 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_linker.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_mutex.c#4 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_poll.c#4 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_shutdown.c#6 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_sig.c#12 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_subr.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_switch.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_synch.c#10 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_thr.c#8 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_thread.c#17 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_umtx.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/link_elf_obj.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/sched_4bsd.c#7 integrate
.. //depot/projects/netperf_socket/sys/kern/sched_ule.c#11 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_bus.c#10 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_prof.c#6 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_rman.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#8 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_trap.c#6 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_turnstile.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/sys_process.c#6 integrate
.. //depot/projects/netperf_socket/sys/kern/syscalls.c#8 integrate
.. //depot/projects/netperf_socket/sys/kern/syscalls.master#8 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#19 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#11 integrate
.. //depot/projects/netperf_socket/sys/modules/Makefile#12 integrate
.. //depot/projects/netperf_socket/sys/modules/acpi/acpi/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/modules/acpi/acpi_asus/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/acpi/acpi_video/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/ahb/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/geom/Makefile#5 integrate
.. //depot/projects/netperf_socket/sys/modules/geom/geom_label/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#17 integrate
.. //depot/projects/netperf_socket/sys/net/if_tun.c#9 integrate
.. //depot/projects/netperf_socket/sys/netgraph/netgraph.h#5 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#6 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_device.c#5 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_device.h#2 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#16 integrate
.. //depot/projects/netperf_socket/sys/pc98/conf/NOTES#13 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#14 integrate
.. //depot/projects/netperf_socket/sys/pci/agp_via.c#5 integrate
.. //depot/projects/netperf_socket/sys/pci/if_dc.c#8 integrate
.. //depot/projects/netperf_socket/sys/pci/if_dcreg.h#2 integrate
.. //depot/projects/netperf_socket/sys/pci/if_de.c#7 integrate
.. //depot/projects/netperf_socket/sys/pci/if_pcn.c#7 integrate
.. //depot/projects/netperf_socket/sys/pci/if_rl.c#12 integrate
.. //depot/projects/netperf_socket/sys/pci/if_rlreg.h#3 integrate
.. //depot/projects/netperf_socket/sys/pci/if_sf.c#7 integrate
.. //depot/projects/netperf_socket/sys/pci/if_sis.c#9 integrate
.. //depot/projects/netperf_socket/sys/pci/if_sk.c#11 integrate
.. //depot/projects/netperf_socket/sys/pci/if_ste.c#16 integrate
.. //depot/projects/netperf_socket/sys/pci/if_vr.c#9 integrate
.. //depot/projects/netperf_socket/sys/pci/if_wb.c#7 integrate
.. //depot/projects/netperf_socket/sys/pci/if_xl.c#9 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powermac/grackle.c#5 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powermac/hrowpic.c#4 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powermac/macio.c#3 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powermac/maciovar.h#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powermac/openpic_macio.c#5 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powermac/uninorth.c#3 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/intr_machdep.c#4 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/openpic.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#8 integrate
.. //depot/projects/netperf_socket/sys/powerpc/psim/iobus.c#3 integrate
.. //depot/projects/netperf_socket/sys/powerpc/psim/iobusvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/psim/openpic_iobus.c#4 integrate
.. //depot/projects/netperf_socket/sys/sparc64/ebus/ebus.c#6 integrate
.. //depot/projects/netperf_socket/sys/sparc64/fhc/fhc.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/pci/psycho.c#5 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sbus/sbus.c#5 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/intr_machdep.c#3 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/iommu.c#6 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/nexus.c#5 integrate
.. //depot/projects/netperf_socket/sys/sys/interrupt.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/param.h#15 integrate
.. //depot/projects/netperf_socket/sys/sys/proc.h#15 integrate
.. //depot/projects/netperf_socket/sys/sys/resourcevar.h#4 integrate
.. //depot/projects/netperf_socket/sys/sys/rman.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/sched.h#4 integrate
.. //depot/projects/netperf_socket/sys/sys/syscall.h#8 integrate
.. //depot/projects/netperf_socket/sys/sys/syscall.mk#8 integrate
.. //depot/projects/netperf_socket/sys/sys/sysproto.h#8 integrate
.. //depot/projects/netperf_socket/sys/sys/thr.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/tty.h#9 integrate
.. //depot/projects/netperf_socket/sys/sys/umtx.h#2 integrate
.. //depot/projects/netperf_socket/sys/tools/acpi_quirks2h.awk#2 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_glue.c#10 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_map.c#11 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_object.c#6 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_zeroidle.c#4 integrate

Differences ...

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

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.44 2004/03/13 15:42:59 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.45 2004/07/02 03:47:28 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -66,6 +66,7 @@
 	int		  map_count;
 	bus_dma_lock_t	 *lockfunc;
 	void		 *lockfuncarg;
+	bus_dma_segment_t *segments;
 };
 
 struct bounce_page {
@@ -221,7 +222,9 @@
 		newtag->lockfunc = dflt_lock;
 		newtag->lockfuncarg = NULL;
 	}
-	
+
+	newtag->segments = NULL;
+
 	/* Take into account any restrictions imposed by our parent tag */
 	if (parent != NULL) {
 		newtag->lowaddr = MIN(parent->lowaddr, newtag->lowaddr);
@@ -290,6 +293,8 @@
 			parent = dmat->parent;
 			atomic_subtract_int(&dmat->ref_count, 1);
 			if (dmat->ref_count == 0) {
+				if (dmat->segments != NULL)
+					free(dmat->segments, M_DEVBUF);
 				free(dmat, M_DEVBUF);
 				/*
 				 * Last reference count, so
@@ -332,6 +337,14 @@
 		return (0);
 	}
 
+	if (dmat->segments == NULL) {
+		dmat->segments = (bus_dma_segment_t *)malloc(
+		    sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF,
+		    M_NOWAIT);
+		if (dmat->segments == NULL)
+			return (ENOMEM);
+	}
+
 	if (dmat->lowaddr < ptoa(Maxmem)) {
 		/* Must bounce */
 		int maxpages;
@@ -425,6 +438,14 @@
 	/* If we succeed, no mapping/bouncing will be required */
 	*mapp = &nobounce_dmamap;
 
+	if (dmat->segments == NULL) {
+		dmat->segments = (bus_dma_segment_t *)malloc(
+		    sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF,
+		    M_NOWAIT);
+		if (dmat->segments == NULL)
+			return (ENOMEM);
+	}
+
 	if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) {
 		*vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags);
 	} else {
@@ -477,11 +498,6 @@
 {
 	vm_offset_t		vaddr;
 	vm_offset_t		paddr;
-#ifdef __GNUC__
-	bus_dma_segment_t	dm_segments[dmat->nsegments];
-#else
-	bus_dma_segment_t	dm_segments[BUS_DMAMAP_NSEGS];
-#endif
 	bus_dma_segment_t      *sg;
 	int			seg;
 	int			error;
@@ -496,16 +512,16 @@
 		 * of the bus address space.
 		 */
 		vaddr = trunc_page((vm_offset_t) buf);
-		dm_segments[0].ds_addr =
+		dmat->segments[0].ds_addr =
 			map->busaddress + (vm_offset_t) buf - vaddr;
-		dm_segments[0].ds_len = buflen;
+		dmat->segments[0].ds_len = buflen;
 		buflen = round_page((vm_offset_t) buf + buflen) - vaddr;
 		sgmap_load_region(chipset.sgmap,
 				  map->busaddress,
 				  vaddr,
 				  buflen);
 		map->buflen = buflen;
-		(*callback)(callback_arg, dm_segments, 1, error);
+		(*callback)(callback_arg, dmat->segments, 1, error);
 
 		return (0);
 	}
@@ -560,7 +576,7 @@
 	}
 
 	vaddr = (vm_offset_t)buf;
-	sg = &dm_segments[0];
+	sg = &dmat->segments[0];
 	seg = 1;
 	sg->ds_len = 0;
 
@@ -604,7 +620,7 @@
 		error = EFBIG;
 	}
 
-	(*callback)(callback_arg, dm_segments, seg, error);
+	(*callback)(callback_arg, dmat->segments, seg, error);
 
 	return (0);
 }
@@ -617,7 +633,6 @@
  */
 static int
 _bus_dmamap_load_buffer(bus_dma_tag_t dmat,
-			bus_dma_segment_t segs[],
 			void *buf, bus_size_t buflen,
 			struct thread *td,
 			int flags,
@@ -625,12 +640,15 @@
 			int *segp,
 			int first)
 {
+	bus_dma_segment_t *segs;
 	bus_size_t sgsize;
 	bus_addr_t curaddr, lastaddr, baddr, bmask;
 	vm_offset_t vaddr = (vm_offset_t)buf;
 	int seg;
 	pmap_t pmap;
 
+	segs = dmat->segments;
+
 	if (td != NULL)
 		pmap = vmspace_pmap(td->td_proc->p_vmspace);
 	else
@@ -709,11 +727,6 @@
 		     bus_dmamap_callback2_t *callback, void *callback_arg,
 		     int flags)
 {
-#ifdef __GNUC__
-	bus_dma_segment_t dm_segments[dmat->nsegments];
-#else
-	bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS];
-#endif
 	int nsegs, error;
 
 	KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL,
@@ -730,7 +743,6 @@
 		for (m = m0; m != NULL && error == 0; m = m->m_next) {
 			if (m->m_len > 0) {
 				error = _bus_dmamap_load_buffer(dmat,
-						dm_segments,
 						m->m_data, m->m_len,
 						NULL, flags, &lastaddr,
 						&nsegs, first);
@@ -743,9 +755,9 @@
 
 	if (error) {
 		/* force "no valid mappings" in callback */
-		(*callback)(callback_arg, dm_segments, 0, 0, error);
+		(*callback)(callback_arg, dmat->segments, 0, 0, error);
 	} else {
-		(*callback)(callback_arg, dm_segments,
+		(*callback)(callback_arg, dmat->segments,
 			    nsegs+1, m0->m_pkthdr.len, error);
 	}
 	return (error);
@@ -761,11 +773,6 @@
 		    int flags)
 {
 	bus_addr_t lastaddr;
-#ifdef __GNUC__
-	bus_dma_segment_t dm_segments[dmat->nsegments];
-#else
-	bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS];
-#endif
 	int nsegs, error, first, i;
 	bus_size_t resid;
 	struct iovec *iov;
@@ -796,9 +803,7 @@
 		caddr_t addr = (caddr_t) iov[i].iov_base;
 
 		if (minlen > 0) {
-			error = _bus_dmamap_load_buffer(dmat,
-					dm_segments,
-					addr, minlen,
+			error = _bus_dmamap_load_buffer(dmat, addr, minlen,
 					td, flags, &lastaddr, &nsegs, first);
 			first = 0;
 
@@ -808,9 +813,9 @@
 
 	if (error) {
 		/* force "no valid mappings" in callback */
-		(*callback)(callback_arg, dm_segments, 0, 0, error);
+		(*callback)(callback_arg, dmat->segments, 0, 0, error);
 	} else {
-		(*callback)(callback_arg, dm_segments,
+		(*callback)(callback_arg, dmat->segments,
 			    nsegs+1, uio->uio_resid, error);
 	}
 	return (error);

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

@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.78 2004/04/16 20:09:53 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.79 2004/07/02 20:21:41 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -455,7 +455,7 @@
 	 * thread to the current CPU until we return from the interrupt.
 	 */
 	sched_pin();
-	error = ithread_schedule(ithd, !cold);
+	error = ithread_schedule(ithd);
 	KASSERT(error == 0, ("got an impossible stray interrupt"));
 	sched_unpin();
 }

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

@@ -25,8 +25,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.6 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.7 2004/07/01 15:07:26 gallatin Exp $");
 
+#define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

==== //depot/projects/netperf_socket/sys/alpha/include/param.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/param.h,v 1.33 2004/04/05 21:00:50 imp Exp $ */
+/* $FreeBSD: src/sys/alpha/include/param.h,v 1.34 2004/07/02 20:21:41 jhb Exp $ */
 /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
 
 /*
@@ -113,6 +113,8 @@
 #define	SSIZE		1		/* initial stack size/NBPG */
 #define	SINCR		1		/* increment of stack/NBPG */
 
+#define	PREEMPTION
+
 #ifndef	KSTACK_PAGES
 #define	KSTACK_PAGES	2		/* pages of kstack (with pcb) */
 #endif

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

@@ -25,8 +25,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.35 2004/03/17 21:45:55 jmg Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36 2004/07/01 15:07:26 gallatin Exp $");
 
+#define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

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

@@ -25,8 +25,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.28 2003/11/17 06:10:14 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.29 2004/07/01 15:07:26 gallatin Exp $");
 
+#define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

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

@@ -55,8 +55,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.25 2003/12/23 02:36:41 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.26 2004/07/01 15:07:27 gallatin Exp $");
 
+#define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

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

@@ -87,10 +87,11 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.42 2003/11/17 06:10:14 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.43 2004/07/01 15:07:27 gallatin Exp $");
 
 #include "opt_cpu.h"
 
+#define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

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

@@ -25,10 +25,11 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.33 2003/08/22 07:20:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.34 2004/07/01 15:07:27 gallatin Exp $");
 
 #include "opt_isa.h"
 
+#define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

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

@@ -51,8 +51,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.20 2003/11/17 06:10:14 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.21 2004/07/01 15:07:27 gallatin Exp $");
 
+#define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

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

@@ -25,10 +25,11 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.23 2003/11/17 06:10:14 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.24 2004/07/01 15:07:27 gallatin Exp $");
 
 #include "opt_cpu.h"
 
+#define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

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

@@ -25,8 +25,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami_pci.c,v 1.16 2003/08/22 07:20:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami_pci.c,v 1.17 2004/07/01 15:07:27 gallatin Exp $");
 
+#define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

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

@@ -56,8 +56,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.26 2003/08/22 07:20:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.27 2004/07/01 15:07:27 gallatin Exp $");
 
+#define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

==== //depot/projects/netperf_socket/sys/amd64/acpica/acpi_machdep.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.13 2004/04/21 02:10:58 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.14 2004/06/30 04:42:29 njl Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -56,3 +56,9 @@
 
 	intr_model = model;
 }
+
+int
+acpi_machdep_quirks(int *quirks)
+{
+	return (0);
+}

==== //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#4 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.6 2004/05/30 04:49:39 alc Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.7 2004/07/02 20:21:41 jhb Exp $
  */
 
 /*
@@ -215,7 +215,7 @@
 		if (ih == NULL)
 			error = EINVAL;
 		else
-			error = ithread_schedule(it, !cold);
+			error = ithread_schedule(it);
 	}
 	if (error == EINVAL) {
 		atomic_add_long(isrc->is_straycount, 1);

==== //depot/projects/netperf_socket/sys/amd64/amd64/nexus.c#4 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.60 2004/06/03 20:22:48 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.61 2004/06/30 19:24:26 imp Exp $");
 
 /*
  * This code implements a `root nexus' for Intel Architecture
@@ -41,6 +41,7 @@
  * and I/O memory address space.
  */
 
+#define __RMAN_RESOURCE_VISIBLE
 #include "opt_isa.h"
 
 #include <sys/param.h>

==== //depot/projects/netperf_socket/sys/amd64/include/param.h#3 (text+ko) ====

@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/amd64/include/param.h,v 1.11 2004/06/07 23:47:59 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/param.h,v 1.12 2004/07/02 20:21:41 jhb Exp $
  */
 
 /*
@@ -119,6 +119,8 @@
 #define	NBPML4		(1ul<<PML4SHIFT)/* bytes/page map lev4 table */
 #define	PML4MASK	(NBPML4-1)
 
+#define	PREEMPTION
+
 #define IOPAGES	2		/* pages of i/o permission bitmap */
 
 #ifndef	KSTACK_PAGES

==== //depot/projects/netperf_socket/sys/arm/arm/intr.c#2 (text+ko) ====

@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.1 2004/05/14 11:46:42 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.2 2004/07/02 22:30:42 cognet Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/syslog.h> 
@@ -143,7 +143,7 @@
 					 */
 				}
 			} else if (ih) {
-				ithread_schedule(ithd, !cold);
+				ithread_schedule(ithd);
 			}
 		}
 	}	

==== //depot/projects/netperf_socket/sys/arm/arm/nexus.c#2 (text+ko) ====

@@ -40,8 +40,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.2 2004/05/22 13:15:14 mux Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.3 2004/07/02 22:30:10 cognet Exp $");
 
+#define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

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

@@ -57,8 +57,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.2 2004/06/19 17:38:32 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.3 2004/07/02 22:30:10 cognet Exp $");
 
+#define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

==== //depot/projects/netperf_socket/sys/boot/common/loader.8#5 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.60 2004/05/16 22:51:35 ru Exp $
+.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.61 2004/07/02 21:49:22 ru Exp $
 .\"
 .Dd January 27, 2004
 .Dt LOADER 8
@@ -586,9 +586,9 @@
 .Ic catch
 or
 .Ic execute
-is processed
+is processed!
 .Ef
-\&! This is particularly annoying for programs that want or need to
+This is particularly annoying for programs that want or need to
 handle exceptions.
 In this case, the use of a proxy is recommended.
 For example:

==== //depot/projects/netperf_socket/sys/boot/common/newvers.sh#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.4 2004/04/07 20:45:56 imp Exp $
+# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.5 2004/07/01 06:40:12 ps Exp $
 #	$NetBSD: newvers.sh,v 1.1 1997/07/26 01:50:38 thorpej Exp $
 #
 # Copyright (c) 1984, 1986, 1990, 1993
@@ -33,7 +33,7 @@
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
 
 LC_ALL=C; export LC_ALL
-u=${USER-root} h=`hostname` t=`date`
+u=${USER-root} h=${HOSTNAME-`hostname`} t=`date`
 #r=`head -n 6 $1 | tail -n 1 | awk -F: ' { print $1 } '`
 r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1`
 

==== //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_proto.h#6 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.25 2004/04/14 23:17:57 peter Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.26 2004/07/02 00:38:56 marcel Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp 
  */
 
 #ifndef _FREEBSD32_SYSPROTO_H_

==== //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscall.h#6 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.25 2004/04/14 23:17:57 peter Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.26 2004/07/02 00:38:56 marcel Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp 
  */
 
 #define	FREEBSD32_SYS_syscall	0

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

@@ -2,8 +2,8 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.16 2004/04/14 23:17:57 peter Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.17 2004/07/02 00:38:56 marcel Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp 
  */
 
 const char *freebsd32_syscallnames[] = {

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

@@ -2,8 +2,8 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.26 2004/04/14 23:17:57 peter Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.27 2004/07/02 00:38:56 marcel Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp 
  */
 
 #include "opt_compat.h"

==== //depot/projects/netperf_socket/sys/compat/freebsd32/syscalls.master#5 (text+ko) ====

@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;	from: src/sys/kern/syscalls.master 1.107
 ;
@@ -595,10 +595,10 @@
 428	UNIMPL	__acl_aclcheck_link
 ; XXX implement
 429	UNIMPL	sigwait
-430	MNOPROTO { int thr_create(ucontext_t *ctx, thr_id_t *id, int flag s); }
+430	MNOPROTO { int thr_create(ucontext_t *ctx, long *id, int flag s); }
 431	MNOPROTO { void thr_exit(void); }
-432	MNOPROTO { int thr_self(thr_id_t *id); }
-433	MNOPROTO { int thr_kill(thr_id_t id, int sig); }
+432	MNOPROTO { int thr_self(long *id); }
+433	MNOPROTO { int thr_kill(long id, int sig); }
 434	MNOPROTO { int _umtx_lock(struct umtx *umtx); }
 435	MNOPROTO { int _umtx_unlock(struct umtx *umtx); }
 436	MNOPROTO { int jail_attach(int jid); }
@@ -608,4 +608,4 @@
 440	UNIMPL	kse_switchin
 441	UNIMPL	ksem_timedwait
 442     MNOPROTO { int thr_suspend(const struct timespec *timeout); }
-443     MNOPROTO { int thr_wake(thr_id_t id); }
+443     MNOPROTO { int thr_wake(long id); }

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

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.119 2004/06/18 14:36:24 bms Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.120 2004/07/02 15:31:44 netchild Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1799,6 +1799,10 @@
 		args->cmd = SNDCTL_DSP_GETOPTR;
 		return (ioctl(td, (struct ioctl_args *)args));
 
+	case LINUX_SNDCTL_DSP_SETDUPLEX:
+		args->cmd = SNDCTL_DSP_SETDUPLEX;
+		return (ioctl(td, (struct ioctl_args *)args));
+
 	case LINUX_SNDCTL_DSP_GETODELAY:
 		args->cmd = SNDCTL_DSP_GETODELAY;
 		return (ioctl(td, (struct ioctl_args *)args));

==== //depot/projects/netperf_socket/sys/compat/linux/linux_ioctl.h#5 (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/linux/linux_ioctl.h,v 1.20 2004/06/18 14:36:24 bms Exp $
+ * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.21 2004/07/02 15:31:44 netchild Exp $
  */
 
 #ifndef _LINUX_IOCTL_H_
@@ -254,6 +254,7 @@
 #define	LINUX_SNDCTL_DSP_SETTRIGGER	LINUX_SNDCTL_DSP_GETTRIGGER
 #define	LINUX_SNDCTL_DSP_GETIPTR	0x5011
 #define	LINUX_SNDCTL_DSP_GETOPTR	0x5012
+#define	LINUX_SNDCTL_DSP_SETDUPLEX	0x5016
 #define	LINUX_SNDCTL_DSP_GETODELAY	0x5017
 #define	LINUX_SNDCTL_SEQ_RESET		0x5100
 #define	LINUX_SNDCTL_SEQ_SYNC		0x5101

==== //depot/projects/netperf_socket/sys/conf/NOTES#25 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1236 2004/06/27 02:36:33 rwatson Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1240 2004/07/02 20:21:41 jhb Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -125,6 +125,7 @@
 options 	GEOM_FOX		# Redundant path mitigation
 options 	GEOM_GATE		# Userland services.
 options 	GEOM_GPT		# GPT partitioning
+options 	GEOM_LABEL		# Providers labelization.
 options 	GEOM_MBR		# DOS/MBR partitioning
 options 	GEOM_NOP		# Test class.
 options 	GEOM_PC98		# NEC PC9800 partitioning
@@ -178,15 +179,30 @@
 # and WITNESS options.
 options 	MUTEX_NOINLINE
 
+# MUTEX_WAKE_ALL changes the mutex unlock algorithm to wake all waiters
+# when a contested mutex is released rather than just awaking the highest
+# priority waiter.
+options 	MUTEX_WAKE_ALL
+
 # SMP Debugging Options:
 #
+# FULL_PREEMPTION instructs the kernel to preempt non-realtime kernel
+#	  threads.  It sole use is to expose race conditions and other
+#	  bugs during development.  Enabling this option will reduce
+#	  performance and increase the frequency of kernel panics by
+#	  design.  If you aren't sure that you need it then you don't.
 # MUTEX_DEBUG enables various extra assertions in the mutex code.
+# SLEEPQUEUE_PROFILING enables rudimentary profiling of the hash table
+#	  used to hold active sleep queues.
+# TURNSTILE_PROFILING enables rudimentary profiling of the hash table
+#	  used to hold active lock queues.
 # WITNESS enables the witness code which detects deadlocks and cycles
 #         during locking operations.
 # WITNESS_DDB causes the witness code to drop into the kernel debugger if
 #	  a lock hierarchy violation occurs or if locks are held when going to
 #	  sleep.
 # WITNESS_SKIPSPIN disables the witness checks on spin mutexes.
+options 	FULL_PREEMPTION
 options 	MUTEX_DEBUG
 options 	WITNESS
 options 	WITNESS_DDB
@@ -196,6 +212,10 @@
 # MUTEX_PROFILING(9) for details.
 options 	MUTEX_PROFILING
 
+# Profiling for internal hash tables.
+options 	SLEEPQUEUE_PROFILING
+options 	TURNSTILE_PROFILING
+
 

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

More information about the p4-projects mailing list