Date: Sun, 30 May 2004 18:26:15 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 53831 for review Message-ID: <200405310126.i4V1QFmY042530@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=53831 Change 53831 by rwatson@rwatson_paprika on 2004/05/30 18:26:04 Integrate netperf_socket from CVS HEAD: cpu_sched_exit() gone. amd64 mirrors i386 ithread preemption fix. More fixes to amd64 profiling. More ACPI, update to 20040515, et al. Intel 10gig-e driver (ixgb). Various module.h include consistency fixes. Unneeded CTLFLAG_PRISON sysctls de-prison'd. ips device driver uses M_IPSBUF not M_DEVBUF. newbus gains a sysctl tree. if_vlan uses capabilities to store vlan mtu state, and properly references the parent interface for state information. Netgraph nodes gain a close method. Netgraph class definitions move to C99 sparse struct initialization. Ipfirewall control processing explicitly checks for privilege because raw sockets may now be (optionally) referenced in jail. Loop back of NFS Giant tweaks: missing Giant locking, VFS annotation on Giant lock/unlock. Don't need to optionally acquire Giant around socket operations, because we'll already hold it if we need it. Possibly gratuitous mbuf.h reformatting. Msync MS_INVALIDATE tweaks. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/vm_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/support.S#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/netperf_socket/sys/coda/coda_fbsd.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#9 integrate .. //depot/projects/netperf_socket/sys/conf/files#21 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#16 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#10 integrate .. //depot/projects/netperf_socket/sys/conf/kern.post.mk#6 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#7 integrate .. //depot/projects/netperf_socket/sys/conf/ldscript.amd64#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/CHANGES.txt#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acconfig.h#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acdebug.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acdispat.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acefi.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acenv.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acevents.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acexcep.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acfreebsd.h#7 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acglobal.h#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/achware.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/aclocal.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acmacros.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acnamesp.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acobject.h#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acparser.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acpixf.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acstruct.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actbl.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/actypes.h#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/common/adisasm.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbcmds.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbdisply.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dbinput.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dmwalk.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsmethod.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dsopcode.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/dswstate.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evevent.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evgpe.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evgpeblk.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evmisc.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evregion.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evxface.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evxfevnt.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/evxfregn.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exconfig.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exmutex.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exoparg2.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exresolv.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/exstore.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwgpe.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwregs.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/hwsleep.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsaccess.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsalloc.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nseval.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsinit.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsparse.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsxfeval.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/nsxfname.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/psxface.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rsutils.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/rsxface.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/uteval.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utglobal.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/utxface.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/oltr/if_oltr.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_linux.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#19 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_acad.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_button.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cmbat.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_ec.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_isab.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_lid.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_resource.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_thermal.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_timer.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_video.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#12 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adv_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic/aic_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/amd/amd.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr_disk.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/asr.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/awi/if_awi_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_mem.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_os.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/buslogic/bt_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/cissreg.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/cs/if_cs_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/en/if_en_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fb/splash.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/gx/if_gx.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme_sbus.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida_disk.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida_eisa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/iicbus/iicbus.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips_commands.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips_ioctl.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ixgb/LICENSE#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/README#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/if_ixgb.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/if_ixgb.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/if_ixgb_osdep.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/ixgb_ee.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/ixgb_ee.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/ixgb_hw.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/ixgb_hw.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ixgb/ixgb_ids.h#1 branch .. //depot/projects/netperf_socket/sys/dev/joy/joy_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/dcphy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/exphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/inphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/mii.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/mii_physubr.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/pnphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/ruephy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/tlphy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/xmphy.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlx_disk.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlx_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/musycc/musycc.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/nmdm/nmdm.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/nsp/nsp_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/owi/if_owi_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/Makefile.pccarddevs#2 delete .. //depot/projects/netperf_socket/sys/dev/pccard/card_if.m#2 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/devlist2h.awk#2 delete .. //depot/projects/netperf_socket/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/pccarddevs.h#6 delete .. //depot/projects/netperf_socket/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/pcf/envctrl.c#1 branch .. //depot/projects/netperf_socket/sys/dev/pcf/pcf.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pcf/pcf_isa.c#1 branch .. //depot/projects/netperf_socket/sys/dev/pcf/pcfvar.h#1 branch .. //depot/projects/netperf_socket/sys/dev/pci/eisa_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pci/fixup_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pci/ignore_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pci/isa_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/pcfclock.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ppc/ppc.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/puc/puc_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/random/randomdev.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ray/if_ray.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/rc/rc.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/re/if_re.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/safe/safe.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sbsh/if_sbsh.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/si/si_eisa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/si/si_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/si/si_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sn/if_sn_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/snp/snp.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sr/if_sr.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sr/if_sr_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/stg/tmc18c30_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sx/sx_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scterm-sc.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/trm/trm.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/twa/twa_includes.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twe_compat.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/tx/if_tx.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/txp/if_txp.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_bus_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_cue.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_kue.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_rue.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uftdi.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umct.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_subr.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uvisor.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/utopia/utopia.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/wl/if_wl.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/xe/if_xe_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#8 integrate .. //depot/projects/netperf_socket/sys/geom/geom_disk.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_asus.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_toshiba.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/bios/apm.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/netperf_socket/sys/i386/i386/apic_vector.s#6 integrate .. //depot/projects/netperf_socket/sys/i386/i386/bios.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/exception.s#6 integrate .. //depot/projects/netperf_socket/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/i386/legacy.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mem.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#11 integrate .. //depot/projects/netperf_socket/sys/i386/include/cputypes.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/atpic.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/isa/atpic_vector.s#7 integrate .. //depot/projects/netperf_socket/sys/i386/isa/clock.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/isa/if_el.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/mse.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_hdr.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/spic.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_bus.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_pir.c#4 integrate .. //depot/projects/netperf_socket/sys/i4b/driver/i4b_ing.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#3 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_isic_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_isic_pnp.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/vm_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/isa/atkbd_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/isa/atkbdc_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/isa/vga_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/subr_bus.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/subr_prof.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_accf.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/netperf_socket/sys/modules/aic/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/an/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/awi/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/cs/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ed/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ep/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ex/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/exca/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/fdc/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/fe/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/if_ndis/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/ixgb/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/joy/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ncv/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/netgraph/bluetooth/bt3c/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/nsp/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/oldcard/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/owi/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/pccard/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/pcic/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ray/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/sio/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/sn/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/splash/bmp/splash_bmp.c#2 integrate .. //depot/projects/netperf_socket/sys/modules/splash/pcx/splash_pcx.c#2 integrate .. //depot/projects/netperf_socket/sys/modules/stg/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/uart/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/wi/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/xe/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/net/bpf.h#5 integrate .. //depot/projects/netperf_socket/sys/net/bridge.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_arcsubr.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#13 integrate .. //depot/projects/netperf_socket/sys/net/if_faith.c#5 integrate .. //depot/projects/netperf_socket/sys/net/if_gif.c#5 integrate .. //depot/projects/netperf_socket/sys/net/if_gre.c#5 integrate .. //depot/projects/netperf_socket/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/netperf_socket/sys/net/if_stf.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_tap.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if_vlan.c#5 integrate .. //depot/projects/netperf_socket/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/atmpif/ng_atmpif.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/sscfu/ng_sscfu.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/sscop/ng_sscop.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/uni/ng_uni.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/common/ng_bluetooth.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_UI.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_async.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_atmllc.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_cisco.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_device.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_echo.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_etf.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ether.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_gif_demux.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_hole.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ip_input.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ksocket.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_lmi.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_mppc.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_one2many.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_pptpgre.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_rfc1490.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_sample.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_source.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_split.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_tee.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_vjc.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_vlan.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/accf_data.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/accf_http.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_fw.c#2 integrate .. //depot/projects/netperf_socket/sys/netncp/ncp_mod.c#3 integrate .. //depot/projects/netperf_socket/sys/netsmb/smb_dev.c#3 integrate .. //depot/projects/netperf_socket/sys/netsmb/smb_rq.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_serv.c#6 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_syscalls.c#7 integrate .. //depot/projects/netperf_socket/sys/opencrypto/crypto.c#3 integrate .. //depot/projects/netperf_socket/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#7 integrate .. //depot/projects/netperf_socket/sys/pci/agp.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/agp_ali.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/agp_amd.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/agp_i810.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/agp_intel.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/agp_nvidia.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/agp_sis.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/agp_via.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_dc.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/if_de.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/if_mn.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_pcn.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/if_rl.c#10 integrate .. //depot/projects/netperf_socket/sys/pci/if_sf.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/if_sis.c#7 integrate .. //depot/projects/netperf_socket/sys/pci/if_sk.c#9 integrate .. //depot/projects/netperf_socket/sys/pci/if_ste.c#14 integrate .. //depot/projects/netperf_socket/sys/pci/if_ti.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/if_tl.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/if_vr.c#7 integrate .. //depot/projects/netperf_socket/sys/pci/if_wb.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/if_xl.c#7 integrate .. //depot/projects/netperf_socket/sys/pci/ncr.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/xrpu.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/vm_machdep.c#8 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_pipe.c#3 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_system.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/vm_machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/sys/bus.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/eui64.h#1 branch .. //depot/projects/netperf_socket/sys/sys/mbuf.h#10 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#8 integrate .. //depot/projects/netperf_socket/sys/sys/rman.h#2 integrate .. //depot/projects/netperf_socket/sys/tools/devlist2h.awk#2 delete .. //depot/projects/netperf_socket/sys/tools/miidevs2h.awk#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#8 integrate .. //depot/projects/netperf_socket/sys/vm/vm_object.c#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.h#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pageq.c#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/vm_machdep.c#6 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.103 2004/04/18 06:24:51 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.104 2004/05/26 12:09:36 tmm Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -240,12 +240,6 @@ } void -cpu_sched_exit(td) - register struct thread *td; -{ -} - -void cpu_thread_exit(struct thread *td) { } ==== //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#3 (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.5 2004/05/16 20:30:46 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.6 2004/05/30 04:49:39 alc Exp $ */ /* @@ -183,7 +183,6 @@ if (vector == 0) clkintr_pending = 1; - critical_enter(); if (ih != NULL && ih->ih_flags & IH_FAST) { /* * Execute fast interrupt handlers directly. @@ -191,6 +190,7 @@ * with a NULL argument, then we pass it a pointer to * a trapframe as its argument. */ + critical_enter(); TAILQ_FOREACH(ih, &it->it_handlers, ih_next) { MPASS(ih->ih_flags & IH_FAST); CTR3(KTR_INTR, "%s: executing handler %p(%p)", @@ -204,6 +204,7 @@ } isrc->is_pic->pic_eoi_source(isrc); error = 0; + critical_exit(); } else { /* * For stray and threaded interrupts, we mask and EOI the @@ -216,7 +217,6 @@ else error = ithread_schedule(it, !cold); } - critical_exit(); if (error == EINVAL) { atomic_add_long(isrc->is_straycount, 1); if (*isrc->is_straycount < MAX_STRAY_LOG) ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#9 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.460 2004/05/19 21:55:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.461 2004/05/28 19:42:02 alc Exp $"); /* * Manages physical address maps. @@ -1892,14 +1892,6 @@ if (mpte) mpte->hold_count--; - if ((prot & VM_PROT_WRITE) && (origpte & PG_V)) { - if ((origpte & PG_RW) == 0) { - pte_store(pte, origpte | PG_RW); - pmap_invalidate_page(pmap, va); - } - return; - } - /* * We might be turning off write access to the page, * so we go ahead and sense modify status. ==== //depot/projects/netperf_socket/sys/amd64/amd64/prof_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.20 2004/05/23 18:27:14 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.21 2004/05/26 09:43:37 bde Exp $"); #ifdef GUPROF #if 0 @@ -220,8 +220,15 @@ #ifndef SMP if (cputime_clock == CPUTIME_CLOCK_TSC) { - count = (u_int)rdtsc(); - delta = (int)(count - prev_count); + /* + * Scale the TSC a little to make cputime()'s frequency + * fit in an int, assuming that the TSC frequency fits + * in a u_int. Use a fixed scale since dynamic scaling + * would be slower and we can't really use the low bit + * of precision. + */ + count = (u_int)rdtsc() & ~1u; + delta = (int)(count - prev_count) >> 1; prev_count = count; return (delta); } @@ -330,7 +337,7 @@ gp->profrate = timer_freq << CPUTIME_CLOCK_I8254_SHIFT; #ifndef SMP if (cputime_clock == CPUTIME_CLOCK_TSC) - gp->profrate = tsc_freq; + gp->profrate = tsc_freq >> 1; #if defined(PERFMON) && defined(I586_PMC_GUPROF) else if (cputime_clock == CPUTIME_CLOCK_I586_PMC) { if (perfmon_avail() && ==== //depot/projects/netperf_socket/sys/amd64/amd64/support.S#6 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.111 2004/05/23 14:56:02 bde Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.112 2004/05/29 01:13:28 tjr Exp $ */ #include "opt_ddb.h" @@ -653,3 +653,22 @@ incl %eax ret #endif + +/* + * Support for BB-profiling (gcc -a). The kernbb program will extract + * the data from the kernel. + */ + + .data + ALIGN_DATA + .globl bbhead +bbhead: + .quad 0 + + .text +NON_GPROF_ENTRY(__bb_init_func) + movq $1,(%rdi) + movq bbhead,%rax + movq %rax,32(%rdi) + movq %rdi,bbhead + NON_GPROF_RET ==== //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#9 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.234 2004/04/18 05:36:37 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.235 2004/05/26 12:09:36 tmm Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -225,12 +225,6 @@ } void -cpu_sched_exit(td) - register struct thread *td; -{ -} - -void cpu_thread_setup(struct thread *td) { ==== //depot/projects/netperf_socket/sys/arm/arm/vm_machdep.c#2 (text+ko) ==== @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.2 2004/05/26 12:09:37 tmm Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -340,9 +340,3 @@ cpu_exit(struct thread *td) { } - -void -cpu_sched_exit(td) - register struct thread *td; -{ -} ==== //depot/projects/netperf_socket/sys/boot/i386/libi386/biosacpi.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.8 2004/05/14 01:29:21 jdp Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.9 2004/05/25 05:51:35 njl Exp $"); #include <stand.h> #include <machine/stdarg.h> @@ -84,22 +84,24 @@ } /* - * Find the RSDP in low memory. + * Find the RSDP in low memory. See section 5.2.2 of the ACPI spec. */ static RSDP_DESCRIPTOR * biosacpi_find_rsdp(void) { RSDP_DESCRIPTOR *rsdp; + uint16_t *addr; - /* search the EBDA */ - if ((rsdp = biosacpi_search_rsdp((char *)0, 0x400)) != NULL) - return(rsdp); + /* EBDA is the 1 KB addressed by the 16 bit pointer at 0x40E. */ + addr = (uint16_t *)0x40E; + if ((rsdp = biosacpi_search_rsdp((char *)(*addr << 4), 0x400)) != NULL) + return (rsdp); - /* search the BIOS space */ + /* Check the upper memory BIOS space, 0xe0000 - 0xfffff. */ if ((rsdp = biosacpi_search_rsdp((char *)0xe0000, 0x20000)) != NULL) - return(rsdp); + return (rsdp); - return(NULL); + return (NULL); } static RSDP_DESCRIPTOR * ==== //depot/projects/netperf_socket/sys/coda/coda_fbsd.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.32 2004/02/21 21:10:39 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.33 2004/05/30 20:27:19 phk Exp $"); #include "vcoda.h" @@ -40,6 +40,7 @@ #include <sys/kernel.h> #include <sys/lock.h> #include <sys/malloc.h> +#include <sys/module.h> #include <sys/ucred.h> #include <sys/vnode.h> ==== //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.56 2004/04/16 00:04:28 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.58 2004/05/29 22:34:08 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -49,6 +49,7 @@ */ +#include <sys/ctype.h> #include <sys/param.h> #include <sys/types.h> #include <sys/errno.h> @@ -129,6 +130,7 @@ struct sysctl_oid *, ndis_parm_type, ndis_config_parm **); static ndis_status ndis_decode_parm(ndis_miniport_block *, ndis_config_parm *, char *); +static int my_strcasecmp(const char *, const char *, int); __stdcall static void ndis_read_cfg(ndis_status *, ndis_config_parm **, ndis_handle, ndis_unicode_string *, ndis_parm_type); __stdcall static void ndis_write_cfg(ndis_status *, ndis_handle, @@ -554,6 +556,22 @@ return(NDIS_STATUS_SUCCESS); } +static int +my_strcasecmp(s1, s2, len) + const char *s1; + const char *s2; + int len; +{ + int i; + + for (i = 0; i < len; i++) { + if (toupper(s1[i]) != toupper(s2[i])) + return(1); + } + + return(0); +} + __stdcall static void ndis_read_cfg(status, parm, cfg, key, type) ndis_status *status; @@ -589,7 +607,8 @@ */ TAILQ_FOREACH(e, &sc->ndis_ctx, link) { oidp = e->entry; - if (strcmp(oidp->oid_name, keystr) == 0) { + if (my_strcasecmp(oidp->oid_name, + keystr, strlen(keystr)) == 0) { if (strcmp((char *)oidp->oid_arg1, "UNSET") == 0) { free(keystr, M_DEVBUF); *status = NDIS_STATUS_FAILURE; @@ -685,7 +704,8 @@ TAILQ_FOREACH(e, &sc->ndis_ctx, link) { oidp = e->entry; - if (strcmp(oidp->oid_name, keystr) == 0) { + if (my_strcasecmp(oidp->oid_name, + keystr, strlen(keystr)) == 0) { /* Found it, set the value. */ strcpy((char *)oidp->oid_arg1, val); free(keystr, M_DEVBUF); ==== //depot/projects/netperf_socket/sys/conf/files#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.894 2004/05/20 10:37:11 pjd Exp $ +# $FreeBSD: src/sys/conf/files,v 1.898 2004/05/28 00:22:58 tackerman Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -30,16 +30,26 @@ aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local -miidevs.h standard \ - dependency "$S/tools/devlist2h.awk $S/dev/mii/miidevs" \ - compile-with "${AWK} -f $S/tools/devlist2h.awk $S/dev/mii/miidevs" \ - no-obj no-implicit-rule \ - clean "miidevs.h" emu10k1-alsa%diked.h optional pcm pci \ dependency "$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h" \ compile-with "CC=${CC} AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \ no-obj no-implicit-rule before-depend \ clean "emu10k1-alsa%diked.h" +miidevs.h standard \ + dependency "$S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ + compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ + no-obj no-implicit-rule \ + clean "miidevs.h" +pccarddevs.h standard \ + dependency "$S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ + compile-with "${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ + no-obj no-implicit-rule \ + clean "pccarddevs.h" +usbdevs.h standard \ + dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ + compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ + no-obj no-implicit-rule \ + clean "usbdevs.h" kern/device_if.m standard kern/bus_if.m standard kern/clock_if.m optional genclock @@ -498,6 +508,9 @@ dev/isp/isp_pci.c optional isp pci dev/isp/isp_sbus.c optional isp sbus dev/ispfw/ispfw.c optional ispfw +dev/ixgb/ixgb_hw.c optional ixgb +dev/ixgb/ixgb_ee.c optional ixgb +dev/ixgb/if_ixgb.c optional ixgb dev/joy/joy.c optional joy dev/joy/joy_isa.c optional joy isa dev/joy/joy_pccard.c optional joy pccard ==== //depot/projects/netperf_socket/sys/conf/files.i386#16 (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.492 2004/05/17 08:15:59 rik Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.493 2004/05/26 07:43:40 bde Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -198,7 +198,7 @@ i386/bios/smapi_bios.S optional smapi i386/bios/smbios.c optional smbios i386/bios/vpd.c optional vpd -i386/i386/apic_vector.s optional apic +#i386/i386/apic_vector.s optional apic i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" i386/i386/autoconf.c standard @@ -267,7 +267,7 @@ i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 i386/isa/atpic.c standard -i386/isa/atpic_vector.s standard +#i386/isa/atpic_vector.s standard i386/isa/clock.c standard i386/isa/elcr.c standard i386/isa/elink.c optional ep ==== //depot/projects/netperf_socket/sys/conf/files.pc98#10 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.298 2004/05/18 11:34:04 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.299 2004/05/26 13:10:37 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -132,7 +132,7 @@ geom/geom_pc98.c standard geom/geom_pc98_enc.c standard i386/bios/apm.c optional apm -i386/i386/apic_vector.s optional apic +#i386/i386/apic_vector.s optional apic i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" i386/i386/autoconf.c standard @@ -195,7 +195,7 @@ i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 i386/isa/atpic.c standard -i386/isa/atpic_vector.s standard +#i386/isa/atpic_vector.s standard i386/isa/elink.c optional ep i386/isa/elink.c optional ie i386/isa/isa.c optional isa ==== //depot/projects/netperf_socket/sys/conf/kern.post.mk#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.65 2004/03/22 15:45:17 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.66 2004/05/26 16:31:41 imp Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -77,8 +77,8 @@ ${SYSTEM_LD_TAIL} .if !exists(${.OBJDIR}/.depend) -${SYSTEM_OBJS}: assym.s miidevs.h vnode_if.h ${BEFORE_DEPEND:M*.h} \ - ${MFILES:T:S/.m$/.h/} +${SYSTEM_OBJS}: assym.s pccarddevs.h usbdevs.h miidevs.h vnode_if.h \ + ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/} .endif LNFILES= ${CFILES:T:S/.c$/.ln/} @@ -136,9 +136,9 @@ # The argument list can be very long, so use make -V and xargs to # pass it to mkdep. -_kernel-depend: assym.s miidevs.h vnode_if.h ${BEFORE_DEPEND} \ - ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${GEN_M_CFILES} \ - ${SFILES} ${MFILES:T:S/.m$/.h/} +_kernel-depend: assym.s miidevs.h pccarddevs.h usbdevs.h vnode_if.h \ + ${BEFORE_DEPEND} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} \ + ${GEN_M_CFILES} ${SFILES} ${MFILES:T:S/.m$/.h/} if [ -f .olddep ]; then mv .olddep .depend; fi rm -f .newdep ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES -V GEN_M_CFILES | \ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405310126.i4V1QFmY042530>