Date: Sat, 12 Mar 2005 15:14:05 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 72974 for review Message-ID: <200503121514.j2CFE5Pe050588@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=72974 Change 72974 by rwatson@rwatson_paprika on 2005/03/12 15:13:20 Integrate netperf_socket from FreeBSD CVS HEAD: - cscope targets - busdma changes? - armisms - ndisisms - compat32isms, including kevent_copyout() - fewer major numbers - BUS_PROBE_DEFAULT - minor ata tweaks - The normal spattering of PCI IDs. - devfs_random() :-), devname() sysctl helper. - sundry MFi386 to amd64, including lapic - CLONE_THREAD so that SIGTHR can be protected better with linux emulation. - td_sigmask cleanup - unit locking - SIGPIPE fix for soo_write() - TCP SACK fixes, configurable limits. - More sparc64 pmap locking. mpsafevm now works? netperf-related: - NFS server mutex in hard-coded witness lock order. - uipc_accf locking cleanup, do_getopt_accept_filter() centralized, etc. - Mbuf cluster reference count race fixes. - Some socket creation/teardown cleanup and optimization. - soisconnected() lock scope increase. - NET_CALLOUT_MPSAFE, more netgraph nodes use it. - BPF locking tweaks during descriptor attach/tear-down. - CARP locking work Affected files ... .. //depot/projects/netperf_socket/sys/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/busdma_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#14 integrate .. //depot/projects/netperf_socket/sys/alpha/include/_types.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/atomic.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/cpufunc.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/critical.h#4 integrate .. //depot/projects/netperf_socket/sys/alpha/include/endian.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/in_cksum.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/ioctl_bt848.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/ioctl_meteor.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/limits.h#4 integrate .. //depot/projects/netperf_socket/sys/alpha/include/stdarg.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/varargs.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_proto.h#7 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_syscall.h#7 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_sysent.c#7 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/syscalls.master#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/apic_vector.S#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#11 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/fpu.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/io_apic.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#24 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#16 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mptable.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/prof_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#22 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/NOTES#12 integrate .. //depot/projects/netperf_socket/sys/amd64/include/_types.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/apicvar.h#5 integrate .. //depot/projects/netperf_socket/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/bus_amd64.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/cpufunc.h#8 integrate .. //depot/projects/netperf_socket/sys/amd64/include/critical.h#4 integrate .. //depot/projects/netperf_socket/sys/amd64/include/endian.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/in_cksum.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/limits.h#4 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/profile.h#8 integrate .. //depot/projects/netperf_socket/sys/amd64/include/sf_buf.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/smp.h#5 integrate .. //depot/projects/netperf_socket/sys/amd64/include/stdarg.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/varargs.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/clock.c#8 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/busdma_machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/arm/arm/in_cksum.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/machdep.c#8 integrate .. //depot/projects/netperf_socket/sys/arm/arm/pmap.c#15 integrate .. //depot/projects/netperf_socket/sys/arm/arm/support.S#6 integrate .. //depot/projects/netperf_socket/sys/arm/arm/swtch.S#8 integrate .. //depot/projects/netperf_socket/sys/arm/include/_types.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/limits.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/stdarg.h#3 integrate .. //depot/projects/netperf_socket/sys/boot/arc/include/arcfuncs.h#3 integrate .. //depot/projects/netperf_socket/sys/boot/efi/include/i386/efibind.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/efi/include/ia64/efibind.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_net.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_proto.h#12 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscall.h#12 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscalls.c#12 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_sysent.c#12 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/netperf_socket/sys/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_socket.c#8 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_util.c#5 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_util.h#5 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#21 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/ndis_var.h#12 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#18 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#21 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#49 integrate .. //depot/projects/netperf_socket/sys/conf/files#61 integrate .. //depot/projects/netperf_socket/sys/conf/files.amd64#21 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#34 integrate .. //depot/projects/netperf_socket/sys/conf/majors#9 integrate .. //depot/projects/netperf_socket/sys/conf/options#36 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/access601.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/array.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/atapi.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/command.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/gui_lib.c#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/hptproc.c#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/ioctl.c#3 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/mvSata.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/mvStorageDev.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/raid5n.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/readme.txt#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/vdevice.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/nve/adapter.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/nve/basetype.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/nve/drvinfo.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/nve/os.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/nve/phy.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/mlfk_ipl.c#5 integrate .. //depot/projects/netperf_socket/sys/crypto/cast128/cast128.c#2 delete .. //depot/projects/netperf_socket/sys/crypto/cast128/cast128.h#2 delete .. //depot/projects/netperf_socket/sys/crypto/cast128/cast128sb.h#2 delete .. //depot/projects/netperf_socket/sys/crypto/md5.c#3 delete .. //depot/projects/netperf_socket/sys/crypto/md5.h#2 delete .. //depot/projects/netperf_socket/sys/crypto/rijndael/rijndael-alg-fst.c#2 integrate .. //depot/projects/netperf_socket/sys/crypto/rijndael/rijndael-alg-fst.h#2 delete .. //depot/projects/netperf_socket/sys/crypto/rijndael/rijndael-api-fst.c#2 integrate .. //depot/projects/netperf_socket/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate .. //depot/projects/netperf_socket/sys/crypto/rijndael/rijndael.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpi_support/acpi_sony.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#45 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_battery.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_button.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_acpi.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcibvar.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_timer.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_video.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpiio.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#26 integrate .. //depot/projects/netperf_socket/sys/dev/adlink/adlink.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adv_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adw_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahc_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahd_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/amd/amd.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr_pci.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/asr/asr.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#21 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#19 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ath/ath_rate/sample/sample.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ath/ath_rate/sample/sample.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ath/if_ath.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/ath/if_ath_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/awi/awi.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bgereg.h#8 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_os.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/cardbus/cardbus.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/cx/machdep.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/dpt/dpt_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/en/if_en_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/esp/esp_sbus.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/esp/ncr53c9x.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/fatm/if_fatm.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/fb/s3_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/fb/vgareg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#18 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc_isa.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohci_pci.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#18 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxpreg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxpvar.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/gem/if_gem_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/hatm/if_hatm.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/hfa_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hifn/hifn7751.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme_pci.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/access601.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/array.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/atapi.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/command.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/entry.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/global.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/gui_lib.c#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/hptproc.c#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/i386-elf.raid.o.uu#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/ioctl.c#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/mvSata.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/mvStorageDev.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/raid5n.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/readme.txt#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/vdevice.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/idt/idt_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ieee488/ibfoo.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#22 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pccard.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir.h#8 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_pci.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/isp/ispvar.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/ixgb/if_ixgb.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/led/led.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/mcd/mcdreg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlx_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/mly/mly.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/mpt/mpilib/mpi_type.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/musycc/musycc.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/my/if_my.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/null/null.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/nve/if_nve.c#1 branch .. //depot/projects/netperf_socket/sys/dev/nve/if_nvereg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/patm/if_patm_attach.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci_user.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/pdq/if_fpa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/pps.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/pst/pst-pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/puc/puc.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/puc/puc_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/random/hash.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/random/nehemiah.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/random/yarrow.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/re/if_re.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/safe/safe.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sbsh/if_sbsh.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/scd/scdreg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/si/si_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/ad1816.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/mss.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/als4000.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/au88x0.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/aureal.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/cmi.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/cs4281.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/csa.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/ds1.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/emu10k1.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/es137x.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/fm801.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/ich.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/maestro.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/maestro3.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/solo.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/t4dwave.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/via8233.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/via82c686.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/vibes.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/dsp.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sndstat.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sound.h#10 integrate .. //depot/projects/netperf_socket/sys/dev/sound/sbus/cs4231.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/usb/uaudio_pcm.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sr/if_sr_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/stg/tmc18c30_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sx/sx_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sym/sym_hipd.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/sysmouse.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/tdfx/tdfx_pci.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/tga/tga_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/trm/trm.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/twa/twa_freebsd.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twe_freebsd.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/tx/if_tx.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/txp/if_txp.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_core.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehci.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ohci_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhci_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_subr.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbcdc.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi_util.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi_util.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/wi/if_wi.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/wi/if_wi_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs.h#5 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_devs.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_rule.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vnops.c#13 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_conv.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vncache.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/bde/g_bde.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/bde/g_bde_crypt.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/bde/g_bde_lock.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/bde/g_bde_work.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#16 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.h#10 integrate .. //depot/projects/netperf_socket/sys/geom/geom_aes.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/geom_dev.c#9 integrate .. //depot/projects/netperf_socket/sys/geom/label/g_label.c#9 integrate .. //depot/projects/netperf_socket/sys/geom/label/g_label.h#4 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.c#18 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.h#10 integrate .. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3.c#12 integrate .. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3.h#7 integrate .. //depot/projects/netperf_socket/sys/geom/shsec/g_shsec.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/shsec/g_shsec.h#2 integrate .. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.c#15 integrate .. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.h#7 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum.c#13 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_drive.c#13 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_init.c#7 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_alloc.c#4 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vnops.c#13 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_wakeup.c#9 integrate .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#19 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#34 integrate .. //depot/projects/netperf_socket/sys/i386/i386/busdma_machdep.c#11 integrate .. //depot/projects/netperf_socket/sys/i386/i386/identcpu.c#10 integrate .. //depot/projects/netperf_socket/sys/i386/i386/in_cksum.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/local_apic.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#18 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mp_watchdog.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/_types.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/atomic.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/bus_at386.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/clock.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/cpufunc.h#6 integrate .. //depot/projects/netperf_socket/sys/i386/include/critical.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/endian.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/ieeefp.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/in_cksum.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/ioctl_bt848.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/ioctl_meteor.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/limits.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/pcpu.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/profile.h#7 integrate .. //depot/projects/netperf_socket/sys/i386/include/stdarg.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/varargs.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/clock.c#8 integrate .. //depot/projects/netperf_socket/sys/i386/isa/npx.c#11 integrate .. //depot/projects/netperf_socket/sys/i386/isa/prof_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/vesa.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_proto.h#7 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/linux/syscalls.master#7 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/busdma_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/machdep.c#17 integrate .. //depot/projects/netperf_socket/sys/ia64/include/_types.h#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/cpufunc.h#4 integrate .. //depot/projects/netperf_socket/sys/ia64/include/critical.h#4 integrate .. //depot/projects/netperf_socket/sys/ia64/include/endian.h#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/in_cksum.h#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/limits.h#4 integrate .. //depot/projects/netperf_socket/sys/ia64/include/stdarg.h#2 integrate .. //depot/projects/netperf_socket/sys/isa/vga_isa.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/init_sysent.c#17 integrate .. //depot/projects/netperf_socket/sys/kern/kern_acct.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_conf.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#27 integrate .. //depot/projects/netperf_socket/sys/kern/kern_environment.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_event.c#17 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mib.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_prot.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#26 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#33 integrate .. //depot/projects/netperf_socket/sys/kern/kern_umtx.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/subr_bus.c#19 integrate .. //depot/projects/netperf_socket/sys/kern/subr_hints.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_log.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/subr_prof.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/subr_unit.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/subr_witness.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/sys_socket.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.c#17 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.master#17 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#21 integrate .. //depot/projects/netperf_socket/sys/kern/tty_cons.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/tty_pty.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/tty_tty.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_accf.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#47 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#27 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#32 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_bio.c#16 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#27 integrate .. //depot/projects/netperf_socket/sys/modules/ath_rate_sample/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/crypto/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/hptmv/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/nve/Makefile#1 branch .. //depot/projects/netperf_socket/sys/net/bpf.c#16 integrate .. //depot/projects/netperf_socket/sys/net/bridge.c#14 integrate .. //depot/projects/netperf_socket/sys/net/if.c#28 integrate .. //depot/projects/netperf_socket/sys/net/if_ef.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#22 integrate .. //depot/projects/netperf_socket/sys/net/if_var.h#25 integrate .. //depot/projects/netperf_socket/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/netperf_socket/sys/net80211/ieee80211_node.c#8 integrate .. //depot/projects/netperf_socket/sys/netgraph/netflow/netflow.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/netgraph.h#12 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#17 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_eiface.c#9 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_one2many.c#7 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_parse.c#7 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_source.c#8 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_source.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet/if_ether.c#15 integrate .. //depot/projects/netperf_socket/sys/netinet/in.c#9 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_dummynet.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#23 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#16 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_sack.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#28 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#17 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#15 integrate .. //depot/projects/netperf_socket/sys/netinet6/esp_core.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_output.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet6/ipsec.c#7 integrate .. //depot/projects/netperf_socket/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/netperf_socket/sys/netipx/README#4 integrate .. //depot/projects/netperf_socket/sys/opencrypto/cryptodev.c#9 integrate .. //depot/projects/netperf_socket/sys/opencrypto/cryptosoft.c#4 integrate .. //depot/projects/netperf_socket/sys/opencrypto/rijndael.c#4 delete .. //depot/projects/netperf_socket/sys/opencrypto/rijndael.h#3 delete .. //depot/projects/netperf_socket/sys/opencrypto/xform.c#3 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC.hints#8 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/NOTES#21 integrate .. //depot/projects/netperf_socket/sys/pc98/i386/machdep.c#16 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/clock.c#9 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/pc98gdc.c#7 integrate .. //depot/projects/netperf_socket/sys/pci/if_dc.c#14 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/_types.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/atomic.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/critical.h#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/endian.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/in_cksum.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/limits.h#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/stdarg.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/varargs.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/busdma_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/machdep.c#11 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#21 integrate .. //depot/projects/netperf_socket/sys/sparc64/central/central.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#19 integrate .. //depot/projects/netperf_socket/sys/sparc64/fhc/fhc.c#5 integrate .. //depot/projects/netperf_socket/sys/sparc64/fhc/fhc_central.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/fhc/fhc_nexus.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/fhc/fhcvar.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/_types.h#5 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/critical.h#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/endian.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/limits.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/smp.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/stdarg.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/varargs.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/intr_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/machdep.c#13 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#17 integrate .. //depot/projects/netperf_socket/sys/sys/cdefs.h#8 integrate .. //depot/projects/netperf_socket/sys/sys/conf.h#14 integrate .. //depot/projects/netperf_socket/sys/sys/dir.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/event.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/filio.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/ioctl.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/ktr.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/linker_set.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#22 integrate .. //depot/projects/netperf_socket/sys/sys/mutex.h#9 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#35 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#33 integrate .. //depot/projects/netperf_socket/sys/sys/queue.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/socket.h#12 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#26 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.h#16 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.mk#16 integrate .. //depot/projects/netperf_socket/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/sysctl.h#11 integrate .. //depot/projects/netperf_socket/sys/sys/syslimits.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/sysproto.h#16 integrate .. //depot/projects/netperf_socket/sys/sys/systm.h#16 integrate .. //depot/projects/netperf_socket/sys/sys/umtx.h#5 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_snapshot.c#12 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#15 integrate Differences ... ==== //depot/projects/netperf_socket/sys/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.31 2004/08/19 09:54:28 des Exp $ +# $FreeBSD: src/sys/Makefile,v 1.33 2005/03/08 00:09:41 grog Exp $ # The boot loader .if !defined(NO_BOOT) @@ -7,11 +7,30 @@ .endif .endif +# Directories to include in cscope name file and TAGS. +CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs gnu i4b isa \ + isofs kern libkern modules net netatalk netatm netgraph \ + netinet netinet6 netipx netkey netnatm netncp netsmb nfs \ + pccard pci posix4 sys ufs vm ${ARCHDIR} + +ARCHDIR ?= ${MACHINE} + # Loadable kernel modules + .if defined(MODULES_WITH_WORLD) SUBDIR+=modules .endif HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` +cscope: ${.CURDIR}/cscopenamefile + cd ${.CURDIR}; cscope -k -p4 -i cscopenamefile + +${.CURDIR}/cscopenamefile: + cd ${.CURDIR}; find ${CSCOPEDIRS} -name "*.[csh]" > ${.TARGET} + +TAGS ${.CURDIR}/TAGS: ${.CURDIR}/cscopenamefile + rm -f ${.CURDIR}/TAGS + cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscopenamefile + .include <bsd.subdir.mk> ==== //depot/projects/netperf_socket/sys/alpha/alpha/busdma_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.48 2005/01/15 20:11:25 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.50 2005/03/12 02:43:50 mux Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -85,7 +85,6 @@ static int reserved_bpages; static int active_bpages; static int total_bpages; -static bus_addr_t bounce_lowaddr = BUS_SPACE_MAXADDR; struct bus_dmamap { struct bp_list bpages; @@ -250,14 +249,6 @@ if (newtag->lowaddr < ptoa(Maxmem) && (flags & BUS_DMA_ALLOCNOW) != 0) { /* Must bounce */ - if (lowaddr > bounce_lowaddr) { - /* - * Go through the pool and kill any pages - * that don't reside below lowaddr. - */ - panic("bus_dma_tag_create: page reallocation " - "not implemented"); - } if (ptoa(total_bpages) < maxsize) { int pages; @@ -367,14 +358,6 @@ && total_bpages < maxpages)) { int pages; - if (dmat->lowaddr > bounce_lowaddr) { - /* - * Go through the pool and kill any pages - * that don't reside below lowaddr. - */ - panic("bus_dmamap_create: page reallocation " - "not implemented"); - } pages = atop(dmat->maxsize) + 1; pages = MIN(maxpages - total_bpages, pages); @@ -595,7 +578,7 @@ } if (sg->ds_len == 0) { - sg->ds_addr = paddr + alpha_XXX_dmamap_or; + sg->ds_addr = paddr | alpha_XXX_dmamap_or; sg->ds_len = size; } else if (paddr == nextpaddr) { sg->ds_len += size; @@ -605,7 +588,7 @@ seg++; if (seg > dmat->nsegments) break; - sg->ds_addr = paddr + alpha_XXX_dmamap_or; + sg->ds_addr = paddr | alpha_XXX_dmamap_or; sg->ds_len = size; } vaddr += size; @@ -685,7 +668,7 @@ * previous segment if possible. */ if (first) { - segs[seg].ds_addr = curaddr + alpha_XXX_dmamap_or; + segs[seg].ds_addr = curaddr | alpha_XXX_dmamap_or; segs[seg].ds_len = sgsize; first = 0; } else { @@ -697,7 +680,7 @@ else { if (++seg >= dmat->nsegments) break; - segs[seg].ds_addr = curaddr + alpha_XXX_dmamap_or; + segs[seg].ds_addr = curaddr | alpha_XXX_dmamap_or; segs[seg].ds_len = sgsize; } } ==== //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#14 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.232 2005/02/06 01:55:06 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.233 2005/03/01 21:55:26 wes Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -194,6 +194,7 @@ struct msgbuf *msgbufp=0; long Maxmem = 0; +long realmem = 0; long totalphysmem; /* total amount of physical memory in system */ long resvmem; /* amount of memory reserved for PROM */ @@ -250,6 +251,7 @@ #endif printf("real memory = %ld (%ld MB)\n", alpha_ptob(Maxmem), alpha_ptob(Maxmem) / 1048576); + realmem = alpha_ptob(Maxmem); /* * Display any holes after the first chunk of extended memory. ==== //depot/projects/netperf_socket/sys/alpha/include/_types.h#3 (text+ko) ==== @@ -33,12 +33,16 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.5 2004/03/20 20:41:39 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.6 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE__TYPES_H_ #define _MACHINE__TYPES_H_ +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + /* * Basic types upon which most other types are built. */ @@ -97,7 +101,7 @@ /* * Unusual type definitions. */ -#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) +#ifdef __GNUCLIKE_BUILTIN_VAALIST typedef __builtin_va_list __va_list; /* internally known to gcc */ #else typedef struct { @@ -105,8 +109,9 @@ int __offset; int __pad; } __va_list; -#endif /* post GCC 2.95 */ -#if defined __GNUC__ && !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) +#endif /* __GNUCLIKE_BUILTIN_VAALIST */ +#if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \ + && !defined(__NO_GNUC_VA_LIST) #define __GNUC_VA_LIST typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif ==== //depot/projects/netperf_socket/sys/alpha/include/atomic.h#3 (text+ko) ==== @@ -23,12 +23,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.19 2004/09/10 05:00:27 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.20 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + #include <machine/alpha_cpu.h> /* @@ -50,7 +54,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %2\n\t" /* load old value */ "bis %0, %3, %0\n\t" /* calculate new value */ @@ -66,7 +70,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "bic %0, %2, %0\n\t" /* calculate new value */ @@ -82,7 +86,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "addl %0, %2, %0\n\t" /* calculate new value */ @@ -98,7 +102,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "subl %0, %2, %0\n\t" /* calculate new value */ @@ -114,7 +118,7 @@ { u_int32_t result,temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "wmb\n" /* ensure pending writes have drained */ "1:\tldl_l %0,%2\n\t" /* load current value, asserting lock */ @@ -133,7 +137,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "bis %0, %2, %0\n\t" /* calculate new value */ @@ -149,7 +153,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "bic %0, %2, %0\n\t" /* calculate new value */ @@ -165,7 +169,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "addq %0, %2, %0\n\t" /* calculate new value */ @@ -181,7 +185,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "subq %0, %2, %0\n\t" /* calculate new value */ @@ -197,7 +201,7 @@ { u_int64_t result,temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "wmb\n" /* ensure pending writes have drained */ "1:\tldq_l %0,%2\n\t" /* load current value, asserting lock */ @@ -336,7 +340,7 @@ { u_int32_t ret; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "cmpeq %0, %2, %0\n\t" /* compare */ @@ -363,7 +367,7 @@ { u_int64_t ret; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "cmpeq %0, %2, %0\n\t" /* compare */ ==== //depot/projects/netperf_socket/sys/alpha/include/cpufunc.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/cpufunc.h,v 1.15 2002/04/01 23:51:22 dillon Exp $ + * $FreeBSD: src/sys/alpha/include/cpufunc.h,v 1.16 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -35,9 +35,13 @@ #include <machine/chipset.h> #include <machine/alpha_cpu.h> +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + struct thread; -#ifdef __GNUC__ +#if defined(__GNUCLIKE_ASM) static __inline void breakpoint(void) ==== //depot/projects/netperf_socket/sys/alpha/include/critical.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * related support functions residing * in <arch>/<arch>/critical.c - prototyped * - * $FreeBSD: src/sys/alpha/include/critical.h,v 1.5 2004/07/27 16:41:00 rwatson Exp $ + * $FreeBSD: src/sys/alpha/include/critical.h,v 1.6 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_CRITICAL_H_ @@ -46,7 +46,7 @@ */ void cpu_critical_fork_exit(void); -#ifdef __GNUC__ +#ifdef __CC_SUPPORTS___INLINE /* * cpu_critical_enter: @@ -75,12 +75,12 @@ intr_restore(td->td_md.md_savecrit); } -#else /* !__GNUC__ */ +#else /* !__CC_SUPPORTS___INLINE */ void cpu_critical_enter(struct thread *td); void cpu_critical_exit(struct thread *td); -#endif /* __GNUC__ */ +#endif /* __CC_SUPPORTS___INLINE */ __END_DECLS ==== //depot/projects/netperf_socket/sys/alpha/include/endian.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ - * $FreeBSD: src/sys/alpha/include/endian.h,v 1.15 2004/04/05 21:00:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/endian.h,v 1.16 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -64,7 +64,7 @@ #define BYTE_ORDER _BYTE_ORDER #endif -#ifdef __GNUC__ +#if defined(__CC_SUPPORTS___INLINE) && defined(__GNUCLIKE_ASM) static __inline __uint64_t __bswap64(__uint64_t _x) @@ -113,7 +113,7 @@ #define __ntohl(x) __bswap32(x) #define __ntohs(x) __bswap16(x) -#else /* !__GNUC__ */ +#else /* !(__CC_SUPPORTS___INLINE && __GNUCLIKE_ASM) */ /* * No optimizations are available for this compiler. Fall back to @@ -122,6 +122,6 @@ */ #define _BYTEORDER_FUNC_DEFINED -#endif /* __GNUC__ */ +#endif /* __CC_SUPPORTS___INLINE && __GNUCLIKE_ASM */ #endif /* !_MACHINE_ENDIAN_H_ */ ==== //depot/projects/netperf_socket/sys/alpha/include/in_cksum.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * from tahoe: in_cksum.c 1.2 86/01/05 * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 * from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp - * $FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.6 2004/04/05 21:00:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.7 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_IN_CKSUM_H_ @@ -45,7 +45,7 @@ * in the normal case (where there are no options and the header length is * therefore always exactly five 32-bit words. */ -#ifdef __GNUC__ +#ifdef __CC_SUPPORTS___INLINE static __inline void in_cksum_update(struct ip *ip) ==== //depot/projects/netperf_socket/sys/alpha/include/ioctl_bt848.h#2 (text+ko) ==== @@ -23,13 +23,15 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503121514.j2CFE5Pe050588>