Date: Sat, 13 Mar 2004 21:48:53 -0800 (PST) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 48949 for review Message-ID: <200403140548.i2E5mrik077904@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=48949 Change 48949 by rwatson@rwatson_tislabs on 2004/03/13 21:48:40 Integrate netperf_socket: - Giant not required for contigfree() - Hold Giant for less time when running non-MPSAFE system calls - Support for non-Giant requiring swap backend for md device - Beginning of driver removal from ISA compat shims: wt, ctx, gp, asc - Giant no longer held for process_exec event handler, so Giant is not generally grabbed in exec as much. - Less Giant in exec, exit, fork, thread operations. - AF_ARP address family - Loopback of const interactive_ports, NULL changes in if_spppsubr.c - Register removal. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/busdma_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/netperf_socket/sys/amd64/include/dvcfg.h#2 delete .. //depot/projects/netperf_socket/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pcvt_ioctl.h#2 delete .. //depot/projects/netperf_socket/sys/amd64/include/physio_proc.h#2 delete .. //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/netperf_socket/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/netperf_socket/sys/conf/files.i386#5 integrate .. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#5 integrate .. //depot/projects/netperf_socket/sys/conf/options.amd64#5 integrate .. //depot/projects/netperf_socket/sys/dev/ct/bshw_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ct/ct.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500hw.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/nsp/nsp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/nsp/nsp_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/stg/tmc18c30.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/stg/tmc18c30_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#9 integrate .. //depot/projects/netperf_socket/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/dvcfg.h#2 delete .. //depot/projects/netperf_socket/sys/i386/include/physio_proc.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/asc.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/ascreg.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/ctx.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/ctxreg.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/gpib.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/gpib.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/gpibreg.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/wt.c#3 delete .. //depot/projects/netperf_socket/sys/i386/isa/wtreg.h#2 delete .. //depot/projects/netperf_socket/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/init_sysent.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exec.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_fork.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/subr_trap.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.master#3 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if_fddisubr.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_iso88025subr.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/if_ether.c#2 integrate .. //depot/projects/netperf_socket/sys/netncp/ncp_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/agp_intel.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/bus_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/sys/eventhandler.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/socket.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.mk#3 integrate .. //depot/projects/netperf_socket/sys/sys/sysproto.h#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_contig.c#5 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.43 2003/07/27 13:52:09 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.44 2004/03/13 15:42:59 scottl Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -458,9 +458,7 @@ if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) free(vaddr, M_DEVBUF); else { - mtx_lock(&Giant); contigfree(vaddr, dmat->maxsize, M_DEVBUF); - mtx_unlock(&Giant); } } ==== //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.54 2003/09/22 23:11:42 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.55 2004/03/13 15:42:59 scottl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -453,9 +453,7 @@ && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) free(vaddr, M_DEVBUF); else { - mtx_lock(&Giant); contigfree(vaddr, dmat->maxsize, M_DEVBUF); - mtx_unlock(&Giant); } } ==== //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.274 2004/03/11 00:17:45 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.275 2004/03/13 19:15:43 peter Exp $"); /* * AMD64 Trap and System call handling @@ -754,13 +754,6 @@ ktrsyscall(code, narg, argp); #endif - /* - * Try to run the syscall without Giant if the syscall - * is MP safe. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_lock(&Giant); - if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = frame.tf_rdx; @@ -769,7 +762,12 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - error = (*callp->sy_call)(td, argp); + if ((callp->sy_narg & SYF_MPSAFE) == 0) { + mtx_lock(&Giant); + error = (*callp->sy_call)(td, argp); + mtx_unlock(&Giant); + } else + error = (*callp->sy_call)(td, argp); } switch (error) { @@ -807,12 +805,6 @@ } /* - * Release Giant if we previously set it. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - - /* * Traced syscall. */ if (orig_tf_rflags & PSL_T) { ==== //depot/projects/netperf_socket/sys/amd64/conf/NOTES#5 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.10 2004/03/05 08:04:10 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.12 2004/03/13 22:16:34 peter Exp $ # # We don't have modules on amd64. @@ -17,7 +17,7 @@ machine amd64 # -# We want LINT to cover profiling as well +# We want LINT to cover profiling as well. #XXX#profile 2 @@ -231,17 +231,17 @@ # Network interfaces: # +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) +# (requires miibus) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) -#XXX# Needs to be busdma'ed. +#XXX# still calls MD i386 kvtop function instead of vtophys etc #XXX#device ed #XXX#device lnc -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) - #XXX#device ath #XXX#device ath_hal # Atheros HAL (includes binary component) device wlan # 802.11 layer @@ -477,7 +477,7 @@ # (whether static or dynamic). # #XXX#options COMPAT_SVR4 # build emulator statically -options DEBUG_SVR4 # enable verbose debugging +#XXX#options DEBUG_SVR4 # enable verbose debugging #XXX#device streams # STREAMS network driver (required for svr4). ==== //depot/projects/netperf_socket/sys/amd64/include/pci_cfgreg.h#2 (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/amd64/include/pci_cfgreg.h,v 1.11 2003/09/22 22:21:21 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.12 2004/03/13 19:19:13 peter Exp $ * */ @@ -45,4 +45,3 @@ int pci_cfgregopen(void); u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); -int pci_cfgintr(int bus, int device, int pin, int oldirq); ==== //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.106 2003/12/06 23:19:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.107 2004/03/13 19:21:35 peter Exp $"); #include "opt_cpu.h" @@ -33,7 +33,6 @@ #include <sys/systm.h> #include <sys/bus.h> #include <sys/kernel.h> -#include <sys/module.h> #include <sys/malloc.h> #include <dev/pci/pcivar.h> @@ -42,9 +41,6 @@ #include <isa/isavar.h> #include <machine/legacyvar.h> #include <machine/pci_cfgreg.h> -#include <machine/segments.h> -#include <machine/cputypes.h> -#include <machine/md_var.h> #include "pcib_if.h" @@ -88,210 +84,10 @@ u_int8_t *busnum) { const char *s = NULL; - static u_int8_t pxb[4]; /* hack for 450nx */ *busnum = 0; - - switch (id) { - case 0x12258086: - s = "Intel 824?? host to PCI bridge"; - /* XXX This is a guess */ - /* *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x41, 1); */ - *busnum = bus; - break; - case 0x71208086: - s = "Intel 82810 (i810 GMCH) Host To Hub bridge"; - break; - case 0x71228086: - s = "Intel 82810-DC100 (i810-DC100 GMCH) Host To Hub bridge"; - break; - case 0x71248086: - s = "Intel 82810E (i810E GMCH) Host To Hub bridge"; - break; - case 0x11308086: - s = "Intel 82815 (i815 GMCH) Host To Hub bridge"; - break; - case 0x71808086: - s = "Intel 82443LX (440 LX) host to PCI bridge"; - break; - case 0x71908086: - s = "Intel 82443BX (440 BX) host to PCI bridge"; - break; - case 0x71928086: - s = "Intel 82443BX host to PCI bridge (AGP disabled)"; - break; - case 0x71948086: - s = "Intel 82443MX host to PCI bridge"; - break; - case 0x71a08086: - s = "Intel 82443GX host to PCI bridge"; - break; - case 0x71a18086: - s = "Intel 82443GX host to AGP bridge"; - break; - case 0x71a28086: - s = "Intel 82443GX host to PCI bridge (AGP disabled)"; - break; - case 0x84c48086: - s = "Intel 82454KX/GX (Orion) host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x4a, 1); - break; - case 0x84ca8086: - /* - * For the 450nx chipset, there is a whole bundle of - * things pretending to be host bridges. The MIOC will - * be seen first and isn't really a pci bridge (the - * actual busses are attached to the PXB's). We need to - * read the registers of the MIOC to figure out the - * bus numbers for the PXB channels. - * - * Since the MIOC doesn't have a pci bus attached, we - * pretend it wasn't there. - */ - pxb[0] = legacy_pcib_read_config(0, bus, slot, func, - 0xd0, 1); /* BUSNO[0] */ - pxb[1] = legacy_pcib_read_config(0, bus, slot, func, - 0xd1, 1) + 1; /* SUBA[0]+1 */ - pxb[2] = legacy_pcib_read_config(0, bus, slot, func, - 0xd3, 1); /* BUSNO[1] */ - pxb[3] = legacy_pcib_read_config(0, bus, slot, func, - 0xd4, 1) + 1; /* SUBA[1]+1 */ - return NULL; - case 0x84cb8086: - switch (slot) { - case 0x12: - s = "Intel 82454NX PXB#0, Bus#A"; - *busnum = pxb[0]; - break; - case 0x13: - s = "Intel 82454NX PXB#0, Bus#B"; - *busnum = pxb[1]; - break; - case 0x14: - s = "Intel 82454NX PXB#1, Bus#A"; - *busnum = pxb[2]; - break; - case 0x15: - s = "Intel 82454NX PXB#1, Bus#B"; - *busnum = pxb[3]; - break; - } - break; - - /* AMD -- vendor 0x1022 */ - case 0x30001022: - s = "AMD Elan SC520 host to PCI bridge"; -#ifdef CPU_ELAN - init_AMD_Elan_sc520(); -#else - printf( -"*** WARNING: missing CPU_ELAN -- timekeeping may be wrong\n"); -#endif - break; - case 0x70061022: - s = "AMD-751 host to PCI bridge"; - break; - case 0x700e1022: - s = "AMD-761 host to PCI bridge"; - break; - - /* SiS -- vendor 0x1039 */ - case 0x04961039: - s = "SiS 85c496"; - break; - case 0x04061039: - s = "SiS 85c501"; - break; - case 0x06011039: - s = "SiS 85c601"; - break; - case 0x55911039: - s = "SiS 5591 host to PCI bridge"; - break; - case 0x00011039: - s = "SiS 5591 host to AGP bridge"; - break; - - /* VLSI -- vendor 0x1004 */ - case 0x00051004: - s = "VLSI 82C592 Host to PCI bridge"; - break; - - /* XXX Here is MVP3, I got the datasheet but NO M/B to test it */ - /* totally. Please let me know if anything wrong. -F */ - /* XXX need info on the MVP3 -- any takers? */ - case 0x05981106: - s = "VIA 82C598MVP (Apollo MVP3) host bridge"; - break; - - /* AcerLabs -- vendor 0x10b9 */ - /* Funny : The datasheet told me vendor id is "10b8",sub-vendor */ - /* id is '10b9" but the register always shows "10b9". -Foxfair */ - case 0x154110b9: - s = "AcerLabs M1541 (Aladdin-V) PCI host bridge"; - break; - - /* OPTi -- vendor 0x1045 */ - case 0xc7011045: - s = "OPTi 82C700 host to PCI bridge"; - break; - case 0xc8221045: - s = "OPTi 82C822 host to PCI Bridge"; - break; - - /* ServerWorks -- vendor 0x1166 */ - case 0x00051166: - s = "ServerWorks NB6536 2.0HE host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00061166: - /* FALLTHROUGH */ - case 0x00081166: - /* FALLTHROUGH */ - case 0x02011166: - /* FALLTHROUGH */ - case 0x010f1014: /* IBM re-badged ServerWorks chipset */ - s = "ServerWorks host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00091166: - s = "ServerWorks NB6635 3.0LE host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00101166: - s = "ServerWorks CIOB30 host to PCI bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - case 0x00111166: - /* FALLTHROUGH */ - case 0x03021014: /* IBM re-badged ServerWorks chipset */ - s = "ServerWorks CMIC-HE host to PCI-X bridge"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - /* XXX unknown chipset, but working */ - case 0x00171166: - /* FALLTHROUGH */ - case 0x01011166: - s = "ServerWorks host to PCI bridge(unknown chipset)"; - *busnum = legacy_pcib_read_config(0, bus, slot, func, 0x44, 1); - break; - - /* Integrated Micro Solutions -- vendor 0x10e0 */ - case 0x884910e0: - s = "Integrated Micro Solutions VL Bridge"; - break; - - default: - if (class == PCIC_BRIDGE && subclass == PCIS_BRIDGE_HOST) - s = "Host to PCI bridge"; - break; - } - + if (class == PCIC_BRIDGE && subclass == PCIS_BRIDGE_HOST) + s = "Host to PCI bridge"; return s; } @@ -432,9 +228,10 @@ int legacy_pcib_attach(device_t dev) { + int bus; - device_add_child(dev, "pci", pcib_get_bus(dev)); - + bus = pcib_get_bus(dev); + device_add_child(dev, "pci", bus); return bus_generic_attach(dev); } ==== //depot/projects/netperf_socket/sys/amd64/pci/pci_cfgreg.c#3 (text+ko) ==== @@ -27,26 +27,17 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.105 2004/01/28 20:46:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.106 2004/03/13 19:19:13 peter Exp $"); -#include <sys/param.h> /* XXX trim includes */ +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> -#include <sys/kernel.h> -#include <sys/module.h> -#include <sys/malloc.h> #include <sys/lock.h> #include <sys/mutex.h> -#include <vm/vm.h> -#include <vm/pmap.h> -#include <machine/md_var.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> -#include <isa/isavar.h> #include <machine/pci_cfgreg.h> -#include "pcib_if.h" - static int cfgmech; static int devmax; @@ -108,18 +99,6 @@ pcireg_cfgwrite(bus, slot, func, reg, data, bytes); } -/* - * Route a PCI interrupt - */ -int -pci_cfgintr(int bus, int device, int pin, int oldirq) -{ - - printf("pci_cfgintr: can't route an interrupt to %d:%d INT%c without ACPI\n", bus, - device, 'A' + pin - 1); - return (PCI_INVALID_IRQ); -} - /* * Configuration space access using direct register operations */ ==== //depot/projects/netperf_socket/sys/conf/files.i386#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.468 2004/03/12 17:31:29 wpaul Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.472 2004/03/14 05:31:40 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -258,15 +258,12 @@ i386/ibcs2/ibcs2_xenix.c optional ibcs2 i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 -i386/isa/asc.c count asc i386/isa/atpic.c standard i386/isa/atpic_vector.s standard i386/isa/clock.c standard -i386/isa/ctx.c optional ctx i386/isa/cy.c count cy i386/isa/elink.c optional ep i386/isa/elink.c optional ie -i386/isa/gpib.c optional gp i386/isa/gsc.c count gsc i386/isa/if_el.c count el i386/isa/if_le.c count le @@ -293,7 +290,6 @@ i386/isa/spkr.c optional speaker i386/isa/stallion.c optional stl nowerror i386/isa/vesa.c optional vga vesa -i386/isa/wt.c count wt i386/linux/imgact_linux.c optional compat_linux i386/linux/linux_dummy.c optional compat_linux i386/linux/linux_locore.s optional compat_linux \ ==== //depot/projects/netperf_socket/sys/conf/kern.pre.mk#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.43 2004/03/12 21:36:12 trhodes Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.44 2004/03/14 01:29:05 trhodes Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -39,7 +39,7 @@ INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S -# This hack lets us use the Intel ACPICA code without spamming a new +# This hack lets us use the Intel ACPICA code without spamming a new # include path into 100+ source files. INCLUDES+= -I$S/contrib/dev/acpica @@ -66,11 +66,11 @@ ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 -. if ${CC} == "icc" -CFLAGS+= -DGPROF -. else +.if ${CC} == "icc" +.error Profiling doesn't work with ICC yet. +.else CFLAGS+= -DGPROF -falign-functions=16 -. endif +.endif .if ${PROFLEVEL} >= 2 CFLAGS+= -DGPROF4 -DGUPROF . if ${CC} == "icc" ==== //depot/projects/netperf_socket/sys/conf/kmod.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.155 2004/03/12 21:36:12 trhodes Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.156 2004/03/14 01:29:05 trhodes Exp $ # # The include file <bsd.kmod.mk> handles installing Kernel Loadable Device # drivers (KLD's). @@ -71,8 +71,7 @@ .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S .if ${CC} == "icc" -_ICC_CFLAGS:= ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/} -CFLAGS= ${_ICC_CFLAGS} +CFLAGS:= ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/} .endif CFLAGS+= ${COPTS} -D_KERNEL CFLAGS+= -DKLD_MODULE ==== //depot/projects/netperf_socket/sys/conf/options.amd64#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.amd64,v 1.13 2004/03/05 07:56:23 obrien Exp $ +# $FreeBSD: src/sys/conf/options.amd64,v 1.14 2004/03/13 22:16:34 peter Exp $ # Options specific to AMD64 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -10,14 +10,11 @@ # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems # (see src/sys/conf/options), except for broken debugging options. -IBCS2 opt_dontuse.h -COMPAT_LINUX opt_dontuse.h -COMPAT_SVR4 opt_dontuse.h -DEBUG_SVR4 opt_svr4.h -NDISAPI opt_dontuse.h - -# Change KVM size. Changes things all over the kernel. -KVA_PAGES opt_global.h +#IBCS2 opt_dontuse.h +#COMPAT_LINUX opt_dontuse.h +#COMPAT_SVR4 opt_dontuse.h +#DEBUG_SVR4 opt_svr4.h +#NDISAPI opt_dontuse.h CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h ==== //depot/projects/netperf_socket/sys/dev/ct/bshw_machdep.c#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NecBSD: bshw_machdep.c,v 1.8.12.6 2001/06/29 06:28:05 honda Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ct/bshw_machdep.c,v 1.5 2003/08/24 17:46:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ct/bshw_machdep.c,v 1.6 2004/03/13 19:46:27 peter Exp $"); /* $NetBSD$ */ /* @@ -78,8 +78,8 @@ #include <machine/clock.h> #include <machine/md_var.h> -#include <machine/dvcfg.h> -#include <machine/physio_proc.h> +#include <compat/netbsd/dvcfg.h> +#include <compat/netbsd/physio_proc.h> #include <cam/scsi/scsi_low.h> ==== //depot/projects/netperf_socket/sys/dev/ct/ct.c#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NecBSD: ct.c,v 1.13.12.5 2001/06/26 07:31:53 honda Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ct/ct.c,v 1.7 2003/08/24 17:46:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ct/ct.c,v 1.8 2004/03/13 19:46:27 peter Exp $"); /* $NetBSD$ */ #define CT_DEBUG @@ -76,8 +76,8 @@ #ifdef __FreeBSD__ #include <machine/bus.h> -#include <machine/dvcfg.h> -#include <machine/physio_proc.h> +#include <compat/netbsd/dvcfg.h> +#include <compat/netbsd/physio_proc.h> #include <cam/scsi/scsi_low.h> ==== //depot/projects/netperf_socket/sys/dev/ct/ct_isa.c#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NecBSD: ct_isa.c,v 1.6 1999/07/26 06:32:01 honda Exp $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.9 2003/08/24 17:46:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.10 2004/03/13 19:46:27 peter Exp $"); /* $NetBSD$ */ /* @@ -81,8 +81,8 @@ #include <pc98/pc98/pc98.h> #include <isa/isavar.h> -#include <machine/dvcfg.h> -#include <machine/physio_proc.h> +#include <compat/netbsd/dvcfg.h> +#include <compat/netbsd/physio_proc.h> #include <cam/scsi/scsi_low.h> ==== //depot/projects/netperf_socket/sys/dev/md/md.c#7 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.115 2004/03/10 20:41:08 phk Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.116 2004/03/14 00:24:30 alc Exp $ * */ @@ -542,7 +542,6 @@ lastp = (bp->bio_offset + bp->bio_length - 1) / PAGE_SIZE; lastend = (bp->bio_offset + bp->bio_length - 1) % PAGE_SIZE + 1; - mtx_lock(&Giant); kva = kmem_alloc_nofault(kernel_map, PAGE_SIZE); VM_OBJECT_LOCK(sc->object); @@ -602,7 +601,6 @@ vm_object_set_writeable_dirty(sc->object); VM_OBJECT_UNLOCK(sc->object); kmem_free(kernel_map, kva, sc->secsize); - mtx_unlock(&Giant); return (0); } } @@ -618,13 +616,13 @@ curthread->td_base_pri = PRIBIO; switch (sc->type) { - case MD_SWAP: case MD_VNODE: mtx_lock(&Giant); hasgiant = 1; break; case MD_MALLOC: case MD_PRELOAD: + case MD_SWAP: default: hasgiant = 0; break; ==== //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.8 2003/08/24 17:54:12 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.9 2004/03/13 19:46:27 peter Exp $"); #include "opt_ddb.h" #include <sys/param.h> @@ -79,8 +79,8 @@ #include <machine/bus_pio.h> #include <machine/bus.h> -#include <machine/dvcfg.h> -#include <machine/physio_proc.h> +#include <compat/netbsd/dvcfg.h> +#include <compat/netbsd/physio_proc.h> #include <cam/scsi/scsi_low.h> ==== //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500_pccard.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.18 2003/10/26 00:51:40 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.19 2004/03/13 19:46:27 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,7 +46,7 @@ #include <machine/bus.h> #include <machine/bus_pio.h> -#include <machine/dvcfg.h> +#include <compat/netbsd/dvcfg.h> #include <sys/device_port.h> ==== //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500hw.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ncv/ncr53c500hw.h,v 1.2 2001/07/14 00:38:50 non Exp $ */ +/* $FreeBSD: src/sys/dev/ncv/ncr53c500hw.h,v 1.3 2004/03/13 19:46:27 peter Exp $ */ /* $NecBSD: ncr53c500hw.h,v 1.6.18.1 2001/06/08 06:27:44 honda Exp $ */ /* $NetBSD$ */ @@ -36,7 +36,7 @@ #ifndef __NCR53C500HW_H_ #define __NCR53C500HW_H_ -#include <machine/dvcfg.h> +#include <compat/netbsd/dvcfg.h> #define NCV_HOSTID 7 #define NCV_NTARGETS 8 ==== //depot/projects/netperf_socket/sys/dev/nsp/nsp.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.10 2003/08/24 17:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.11 2004/03/13 19:46:27 peter Exp $"); #include "opt_ddb.h" #include <sys/param.h> @@ -79,8 +79,8 @@ #include <machine/bus_memio.h> #include <machine/bus.h> -#include <machine/dvcfg.h> -#include <machine/physio_proc.h> +#include <compat/netbsd/dvcfg.h> +#include <compat/netbsd/physio_proc.h> #include <cam/scsi/scsi_low.h> #include <dev/nsp/nspreg.h> ==== //depot/projects/netperf_socket/sys/dev/nsp/nsp_pccard.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.16 2003/08/24 17:54:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.17 2004/03/13 19:46:27 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -45,7 +45,7 @@ #include <vm/vm.h> #include <machine/bus.h> -#include <machine/dvcfg.h> +#include <compat/netbsd/dvcfg.h> #include <sys/device_port.h> ==== //depot/projects/netperf_socket/sys/dev/stg/tmc18c30.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.10 2003/12/17 16:12:01 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.11 2004/03/13 19:46:27 peter Exp $"); #include "opt_ddb.h" #include <sys/param.h> @@ -77,8 +77,8 @@ #include <machine/bus_pio.h> #include <machine/bus.h> -#include <machine/dvcfg.h> -#include <machine/physio_proc.h> +#include <compat/netbsd/dvcfg.h> +#include <compat/netbsd/physio_proc.h> #include <cam/scsi/scsi_low.h> #include <dev/stg/tmc18c30reg.h> ==== //depot/projects/netperf_socket/sys/dev/stg/tmc18c30_pccard.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_pccard.c,v 1.18 2003/08/24 18:17:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30_pccard.c,v 1.19 2004/03/13 19:46:27 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -48,7 +48,7 @@ #include <machine/bus.h> #include <machine/bus_pio.h> -#include <machine/dvcfg.h> +#include <compat/netbsd/dvcfg.h> #include <sys/device_port.h> ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs#6 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.166 2004/03/07 05:33:09 sanpei Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.167 2004/03/13 08:21:22 tjr Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -659,6 +659,7 @@ product EPSON 3200 0x011c Perfection 3200 scanner product EPSON 1260 0x011d Perfection 1260 scanner product EPSON 1660 0x011e Perfection 1660 scanner +product EPSON 1670 0x011f Perfection 1670 scanner /* e-TEK Labs products */ product ETEK 1COM 0x8007 Serial port ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#6 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.173 2004/03/07 05:34:36 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.174 2004/03/13 08:25:51 tjr Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.166 2004/03/07 05:33:09 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.167 2004/03/13 08:21:22 tjr Exp */ /* @@ -666,6 +666,7 @@ #define USB_PRODUCT_EPSON_3200 0x011c /* Perfection 3200 scanner */ #define USB_PRODUCT_EPSON_1260 0x011d /* Perfection 1260 scanner */ #define USB_PRODUCT_EPSON_1660 0x011e /* Perfection 1660 scanner */ +#define USB_PRODUCT_EPSON_1670 0x011f /* Perfection 1670 scanner */ /* e-TEK Labs products */ #define USB_PRODUCT_ETEK_1COM 0x8007 /* Serial port */ ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#6 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.173 2004/03/07 05:34:36 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.174 2004/03/13 08:25:51 tjr Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.166 2004/03/07 05:33:09 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.167 2004/03/13 08:21:22 tjr Exp */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403140548.i2E5mrik077904>