Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Aug 2007 18:52:48 GMT
From:      "Christian S.J. Peron" <csjp@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 125227 for review
Message-ID:  <200708161852.l7GIqmJc006564@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=125227

Change 125227 by csjp@push on 2007/08/16 18:52:10

	IFC the zero copy bpf branch

Affected files ...

.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-bgp.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/Makefile#5 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/amd64/cpu_switch.S#4 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/amd64/local_apic.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/amd64/mp_machdep.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/amd64/trap.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/conf/NOTES#5 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/include/specialreg.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/isa/clock.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/busdma_machdep.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/arm/elf_trampoline.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/genassym.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/intr.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/pmap.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/swtch.S#2 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/trap.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/vm_machdep.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/at91/at91rm92reg.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/arm/at91/kb920x_machdep.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/arm/at91/ohci_atmelarm.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/conf/CRB#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/conf/KB920X#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/include/armreg.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/arm/include/cpufunc.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/include/pmap.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/include/pte.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321_pci.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321_timer.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321_wdog.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321var.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/obio.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/crb_machdep.c#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/files.crb#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/files.i81342#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/i81342.c#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/i81342_pci.c#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/i81342_space.c#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/i81342reg.h#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/i81342var.h#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/obio.c#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/obio_space.c#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/obiovar.h#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/std.crb#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/std.i81342#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/Makefile.inc#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot2/board.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot2/boot2.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot2/bwct_board.c#1 branch
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot2/centipad_board.c#1 branch
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/Makefile#3 integrate
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/emac.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/emac.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/bsm/audit.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/bsm/audit_internal.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/bsm/audit_kevents.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/bsm/audit_record.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_cd.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/coda/00READ#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/README#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/TODO#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/cnode.h#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda.h#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_fbsd.c#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_io.h#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_kernel.h#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_namecache.c#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_namecache.h#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_opstats.h#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_pioctl.h#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_psdev.c#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_psdev.h#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_subr.c#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_subr.h#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_venus.c#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_venus.h#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_vfsops.c#2 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_vfsops.h#3 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_vnops.c#4 delete
.. //depot/projects/zcopybpf/src/sys/coda/coda_vnops.h#3 delete
.. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/zcopybpf/src/sys/compat/ia32/ia32_sysvec.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/compat/linux/linux_socket.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/compat/ndis/subr_ntoskrnl.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/conf/Makefile.arm#4 integrate
.. //depot/projects/zcopybpf/src/sys/conf/NOTES#9 integrate
.. //depot/projects/zcopybpf/src/sys/conf/files#10 integrate
.. //depot/projects/zcopybpf/src/sys/conf/files.amd64#4 integrate
.. //depot/projects/zcopybpf/src/sys/conf/files.i386#4 integrate
.. //depot/projects/zcopybpf/src/sys/conf/kern.pre.mk#4 integrate
.. //depot/projects/zcopybpf/src/sys/conf/kmod.mk#5 integrate
.. //depot/projects/zcopybpf/src/sys/conf/options#8 integrate
.. //depot/projects/zcopybpf/src/sys/conf/options.ia64#2 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/altq/altq/altq_subr.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/pf/net/if_pfsync.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_hpet.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_timer.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/adlink/adlink.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/aic7xxx/aic7xxx.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/aic7xxx/aic_osm_lib.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/an/if_an.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/arcmsr/arcmsr.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ath/if_ath.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/dev/bce/if_bce.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/dev/bce/if_bcefw.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/bce/if_bcereg.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ce/if_ce.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/coretemp/coretemp.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/cp/if_cp.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ctau/if_ct.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cx/if_cx.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_common.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_adapter.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_ioctl.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_main.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_offload.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_offload.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_osdep.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_sge.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/mvec.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3fw-4.1.0.bin.gz.uu#2 delete
.. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/dc/if_dc.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/dc/if_dcreg.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/drm/i915_dma.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ed/if_ed_pccard.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/em/if_em.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/fb/splash_bmp.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/firewire/firewire.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/firewire/firewirereg.h#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ichwd/ichwd.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ichwd/ichwd.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ipmi/ipmi_isa.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/iscsi/initiator/isc_cam.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/iscsi/initiator/isc_sm.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/iscsi/initiator/isc_soc.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/iscsi/initiator/isc_subr.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/iscsi/initiator/iscsi.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/iscsi/initiator/iscsi.h#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/iscsi/initiator/iscsi_subr.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/iscsi/initiator/iscsivar.h#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/isp/isp.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/dev/isp/isp_freebsd.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ixgbe/LICENSE#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe.h#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_82598.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_api.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_api.h#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_common.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_common.h#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_osdep.h#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_phy.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_phy.h#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/ixgbe/ixgbe_type.h#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/kbdmux/kbdmux.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mfi/mfi.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mfi/mfi_disk.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mfi/mfi_pci.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mfi/mfireg.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mfi/mfivar.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt.h#6 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt_cam.c#9 integrate
.. //depot/projects/zcopybpf/src/sys/dev/msk/if_msk.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mxge/eth_z8e.dat.gz.uu#5 delete
.. //depot/projects/zcopybpf/src/sys/dev/mxge/eth_z8e.h#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#5 delete
.. //depot/projects/zcopybpf/src/sys/dev/mxge/ethp_z8e.h#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/mxge/if_mxge.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mxge/if_mxge_var.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mxge/mcp_gen_header.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mxge/mxge_eth_z8e.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/mxge/mxge_ethp_z8e.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/mxge/mxge_lro.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mxge/mxge_mcp.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nfe/if_nfe.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nfe/if_nfevar.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nmdm/nmdm.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/if_nxge.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/pccard/pccarddevs#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/pci/pci.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ral/rt2560.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ral/rt2661.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/re/if_re.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/dev/sound/pci/atiixp.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/dev/sound/pci/hda/hdac.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/dev/sound/pci/hda/hdac_private.h#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/sound/pci/ich.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/dev/streams/streams.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/sym/sym_hipd.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/ehci.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/if_axe.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/if_axereg.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/if_rue.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/if_ruereg.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/if_udav.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/if_ural.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/ufoma.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/ukbd.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/umodem.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/ums.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/usb_quirks.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/usbdevs#8 integrate
.. //depot/projects/zcopybpf/src/sys/dev/wi/if_wavelan_ieee.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/wi/if_wi.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/fs/coda/README#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/TODO#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/cnode.h#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda.h#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_fbsd.c#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_io.h#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_kernel.h#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_namecache.c#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_namecache.h#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_opstats.h#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_pioctl.h#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_psdev.c#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_psdev.h#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_subr.c#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_subr.h#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_venus.c#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_venus.h#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_vfsops.c#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_vfsops.h#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_vnops.c#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_vnops.h#1 branch
.. //depot/projects/zcopybpf/src/sys/fs/devfs/devfs_vnops.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/fs/fifofs/fifo_vnops.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/bpb.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/denode.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_conv.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_denode.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_fat.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_fileno.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfsmount.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_subr.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/i386/conf/NOTES#5 integrate
.. //depot/projects/zcopybpf/src/sys/i386/i386/genassym.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/i386/i386/local_apic.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/i386/i386/mp_machdep.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/i386/i386/swtch.s#3 integrate
.. //depot/projects/zcopybpf/src/sys/i386/i386/sys_machdep.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/i386/i386/trap.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/i386/include/cpufunc.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/i386/include/pc/vesa.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/i386/include/specialreg.h#5 integrate
.. //depot/projects/zcopybpf/src/sys/i386/isa/clock.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/i386/linux/linux_machdep.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/ia64/clock.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/ia64/db_machdep.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/ia64/exception.S#3 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/ia64/interrupt.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/ia64/machdep.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/ia64/mp_machdep.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/ia64/nexus.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/ia64/pmap.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/ia64/sapic.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/ia64/syscall.S#2 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/include/atomic.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/include/ia64_cpu.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/include/intr.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/include/md_var.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/include/sapicvar.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/isa/isa_dma.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/kern/init_sysent.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_descrip.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_event.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_exec.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_kse.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_lockf.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_mutex.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_poll.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_resource.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_rwlock.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_sig.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_switch.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_thread.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/sched_4bsd.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/sched_ule.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/kern/subr_bus.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/subr_clock.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/kern/sys_socket.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/syscalls.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/syscalls.master#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/systrace_args.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/tty.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/uipc_domain.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/uipc_syscalls.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/kern/uipc_usrreq.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/kern/vfs_mount.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/kern/vfs_vnops.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/modules/Makefile#8 integrate
.. //depot/projects/zcopybpf/src/sys/modules/coda/Makefile#2 integrate
.. //depot/projects/zcopybpf/src/sys/modules/coda5/Makefile#2 integrate
.. //depot/projects/zcopybpf/src/sys/modules/coretemp/Makefile#1 branch
.. //depot/projects/zcopybpf/src/sys/modules/cxgb/Makefile#4 integrate
.. //depot/projects/zcopybpf/src/sys/modules/iscsi/Makefile#1 branch
.. //depot/projects/zcopybpf/src/sys/modules/iscsi/initiator/Makefile#1 branch
.. //depot/projects/zcopybpf/src/sys/modules/mxge/mxge_eth_z8e/Makefile#2 integrate
.. //depot/projects/zcopybpf/src/sys/modules/mxge/mxge_ethp_z8e/Makefile#2 integrate
.. //depot/projects/zcopybpf/src/sys/modules/netgraph/atm/Makefile#2 integrate
.. //depot/projects/zcopybpf/src/sys/modules/netgraph/bluetooth/Makefile#2 integrate
.. //depot/projects/zcopybpf/src/sys/net/bpf.c#22 integrate
.. //depot/projects/zcopybpf/src/sys/net/bpfdesc.h#7 integrate
.. //depot/projects/zcopybpf/src/sys/net/bridgestp.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/net/bridgestp.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/net/if.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_bridge.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_bridgevar.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_ethersubr.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_lagg.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_lagg.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/net/netisr.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_scan_sta.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/netatm/atm_proto.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/bluetooth/drivers/h4/TODO#2 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/netflow/netflow.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/netgraph.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/ng_bpf.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/ng_eiface.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/ng_ppp.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/ng_ppp.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/icmp_var.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/in_mcast.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/in_pcb.h#6 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip_carp.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip_divert.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip_dummynet.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip_fw2.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip_icmp.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip_input.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip_ipsec.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip_ipsec.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip_mroute.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp.h#6 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_asconf.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_asconf.h#5 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_cc_functions.c#1 branch
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_cc_functions.h#1 branch
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_constants.h#7 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_indata.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_input.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_os.h#5 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_os_bsd.h#6 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_output.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_pcb.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_pcb.h#6 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_peeloff.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_structs.h#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_sysctl.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_sysctl.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_timer.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_timer.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_uio.h#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_usrreq.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_var.h#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctputil.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctputil.h#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/tcp_fsm.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/tcp_input.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/tcp_subr.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/tcp_syncache.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/tcp_syncache.h#1 branch
.. //depot/projects/zcopybpf/src/sys/netinet/tcp_timer.h#5 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/tcp_usrreq.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/tcp_var.h#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/udp_usrreq.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/udp_var.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/netinet6/in6.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/netinet6/ip6_ipsec.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/netinet6/ip6_ipsec.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/netinet6/sctp6_usrreq.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/netinet6/udp6_output.c#3 delete
.. //depot/projects/zcopybpf/src/sys/netinet6/udp6_usrreq.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/netinet6/udp6_var.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/netipsec/ipsec_input.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/netipsec/ipsec_output.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/netipsec/xform_ah.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/netipsec/xform_esp.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/netipsec/xform_ipcomp.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/netipsec/xform_ipip.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/netipx/spx_debug.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/netipx/spx_debug.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/netsmb/smb_dev.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/nfsclient/bootp_subr.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/nfsclient/krpc_subr.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_socket.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_vfsops.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_srvsock.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_srvsubs.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_syscalls.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/pc98/cbus/clock.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/pc98/cbus/sio.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/pci/agp.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/pci/agp_i810.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/pci/agppriv.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/pci/agpreg.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/pci/if_rl.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/pci/if_rlreg.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/pci/if_xl.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/pci/viapm.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/include/atomic.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/include/interruptvar.h#2 delete
.. //depot/projects/zcopybpf/src/sys/powerpc/include/intr_machdep.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/include/md_var.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/include/openpicvar.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/include/trap.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/powermac/hrowpic.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/powermac/hrowpicvar.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/powermac/openpic_macio.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/autoconf.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/interrupt.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/intr_machdep.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/nexus.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/openpic.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/pic_if.m#3 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/trap.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/psim/openpic_iobus.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/rpc/rpcclnt.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_syscalls.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac_mls/mac_mls.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/sparc64/include/iommureg.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/sparc64/include/iommuvar.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/sparc64/pci/psycho.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/sparc64/pci/psychoreg.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/sparc64/sbus/sbus.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/sparc64/sbus/sbusreg.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/eeprom.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/iommu.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/pmap.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/rtc.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/sys/ata.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/sys/kernel.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/sys/lock_profile.h#5 integrate
.. //depot/projects/zcopybpf/src/sys/sys/mutex.h#6 integrate
.. //depot/projects/zcopybpf/src/sys/sys/proc.h#6 integrate
.. //depot/projects/zcopybpf/src/sys/sys/rwlock.h#6 integrate
.. //depot/projects/zcopybpf/src/sys/sys/syscall.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/sys/syscall.mk#3 integrate
.. //depot/projects/zcopybpf/src/sys/sys/sysent.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/sys/sysproto.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/sys/thr.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/sys/vmmeter.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_vnops.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/vm/device_pager.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/vm/phys_pager.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/vm/swap_pager.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vm_fault.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vm_meter.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vm_page.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vm_page.h#5 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vm_pager.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vm_phys.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vm_phys.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vm_zeroidle.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vnode_pager.c#3 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/atalk.c#2 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/bpf.c#6 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/if.c#3 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/inet.c#5 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/inet6.c#3 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/ipsec.c#3 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/ipx.c#2 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/main.c#4 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/mbuf.c#2 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/mcast.c#4 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/mroute.c#3 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/mroute6.c#3 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/netgraph.c#2 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/netstat.h#4 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/pfkey.c#3 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/route.c#3 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/sctp.c#2 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/unix.c#2 integrate

Differences ...

==== //depot/projects/zcopybpf/src/contrib/tcpdump/print-bgp.c#2 (text+ko) ====

@@ -622,6 +622,26 @@
 	return -2;
 }
 
+/*
+ * As I remember, some versions of systems have an snprintf() that
+ * returns -1 if the buffer would have overflowed.  If the return
+ * value is negative, set buflen to 0, to indicate that we've filled
+ * the buffer up.
+ *
+ * If the return value is greater than buflen, that means that
+ * the buffer would have overflowed; again, set buflen to 0 in
+ * that case.
+ */
+#define UPDATE_BUF_BUFLEN(buf, buflen, strlen) \
+    if (strlen<0) \
+       	buflen=0; \
+    else if ((u_int)strlen>buflen) \
+        buflen=0; \
+    else { \
+        buflen-=strlen; \
+	buf+=strlen; \
+    }
+
 static int
 decode_labeled_vpn_l2(const u_char *pptr, char *buf, u_int buflen)
 {
@@ -632,11 +652,13 @@
         tlen=plen;
         pptr+=2;
 	TCHECK2(pptr[0],15);
+	buf[0]='\0';
         strlen=snprintf(buf, buflen, "RD: %s, CE-ID: %u, Label-Block Offset: %u, Label Base %u",
                         bgp_vpn_rd_print(pptr),
                         EXTRACT_16BITS(pptr+8),
                         EXTRACT_16BITS(pptr+10),
                         EXTRACT_24BITS(pptr+12)>>4); /* the label is offsetted by 4 bits so lets shift it right */
+        UPDATE_BUF_BUFLEN(buf, buflen, strlen);
         pptr+=15;
         tlen-=15;
 
@@ -652,23 +674,32 @@
 
             switch(tlv_type) {
             case 1:
-                strlen+=snprintf(buf+strlen,buflen-strlen, "\n\t\tcircuit status vector (%u) length: %u: 0x",
-                                 tlv_type,
-                                 tlv_len);
+                if (buflen!=0) {
+                    strlen=snprintf(buf,buflen, "\n\t\tcircuit status vector (%u) length: %u: 0x",
+                                    tlv_type,
+                                    tlv_len);
+                    UPDATE_BUF_BUFLEN(buf, buflen, strlen);
+                }
                 ttlv_len=ttlv_len/8+1; /* how many bytes do we need to read ? */
                 while (ttlv_len>0) {
                     TCHECK(pptr[0]);
-                    strlen+=snprintf(buf+strlen,buflen-strlen, "%02x",*pptr++);
+                    if (buflen!=0) {
+                        strlen=snprintf(buf,buflen, "%02x",*pptr++);
+                        UPDATE_BUF_BUFLEN(buf, buflen, strlen);
+                    }
                     ttlv_len--;
                 }
                 break;
             default:
-                snprintf(buf+strlen,buflen-strlen, "\n\t\tunknown TLV #%u, length: %u",
-                         tlv_type,
-                         tlv_len);
+                if (buflen!=0) {
+                    strlen=snprintf(buf,buflen, "\n\t\tunknown TLV #%u, length: %u",
+                                    tlv_type,
+                                    tlv_len);
+                    UPDATE_BUF_BUFLEN(buf, buflen, strlen);
+                }
                 break;
             }
-            tlen-=(tlv_len<<3); /* the tlv-length is expressed in bits so lets shift it tright */
+            tlen-=(tlv_len<<3); /* the tlv-length is expressed in bits so lets shift it right */
         }
         return plen+2;
 

==== //depot/projects/zcopybpf/src/sys/Makefile#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/Makefile,v 1.44 2007/07/05 08:55:13 bz Exp $
+# $FreeBSD: src/sys/Makefile,v 1.45 2007/07/12 21:04:55 rwatson Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,7 @@
 .endif
 
 # Directories to include in cscope name file and TAGS.
-CSCOPEDIRS=	bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \
+CSCOPEDIRS=	bsm cam compat conf contrib crypto ddb dev fs geom gnu \
 		i4b isa kern libkern modules net net80211 netatalk netatm \
 		netgraph netinet netinet6 netipsec netipx netnatm netncp \
 		netsmb nfs nfsclient nfs4client rpc pccard pci security sys \

==== //depot/projects/zcopybpf/src/sys/amd64/amd64/cpu_switch.S#4 (text+ko) ====

@@ -30,13 +30,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.158 2007/06/06 07:35:07 davidxu Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.159 2007/07/17 22:36:56 jeff Exp $
  */
 
 #include <machine/asmacros.h>
 #include <machine/specialreg.h>
 
 #include "assym.s"
+#include "opt_sched.h"
 
 /*****************************************************************************/
 /* Scheduling                                                                */
@@ -50,6 +51,12 @@
 #define LK
 #endif
 
+#if defined(SCHED_ULE) && defined(SMP)
+#define	SETLK	xchgq
+#else
+#define	SETLK	movq
+#endif
+
 /*
  * cpu_throw()
  *
@@ -148,13 +155,7 @@
 	movq	%cr3,%rax
 	cmpq	%rcx,%rax			/* Same address space? */
 	jne	swinact
-	movq	%rdx, TD_LOCK(%rdi)		/* Release the old thread */
-	/* Wait for the new thread to become unblocked */
-	movq	$blocked_lock, %rdx
-1:
-	movq	TD_LOCK(%rsi),%rcx
-	cmpq	%rcx, %rdx
-	je	1b
+	SETLK	%rdx, TD_LOCK(%rdi)		/* Release the old thread */
 	jmp	sw1
 swinact:
 	movq	%rcx,%cr3			/* new address space */
@@ -163,21 +164,24 @@
 	movq	TD_PROC(%rdi), %rcx		/* oldproc */
 	movq	P_VMSPACE(%rcx), %rcx
 	LK btrl	%eax, VM_PMAP+PM_ACTIVE(%rcx)	/* clear old */
-	movq	%rdx, TD_LOCK(%rdi)		/* Release the old thread */
+	SETLK	%rdx, TD_LOCK(%rdi)		/* Release the old thread */
 swact:
+	/* Set bit in new pmap->pm_active */
+	movq	TD_PROC(%rsi),%rdx		/* newproc */
+	movq	P_VMSPACE(%rdx), %rdx
+	LK btsl	%eax, VM_PMAP+PM_ACTIVE(%rdx)	/* set new */
+
+sw1:
+#if defined(SCHED_ULE) && defined(SMP)
 	/* Wait for the new thread to become unblocked */
 	movq	$blocked_lock, %rdx
 1:
 	movq	TD_LOCK(%rsi),%rcx
 	cmpq	%rcx, %rdx
+	pause
 	je	1b
-
-	/* Set bit in new pmap->pm_active */
-	movq	TD_PROC(%rsi),%rdx		/* newproc */
-	movq	P_VMSPACE(%rdx), %rdx
-	LK btsl	%eax, VM_PMAP+PM_ACTIVE(%rdx)	/* set new */
-
-sw1:
+	lfence
+#endif
 	/*
 	 * At this point, we've switched address spaces and are ready
 	 * to load up the rest of the next context.

==== //depot/projects/zcopybpf/src/sys/amd64/amd64/local_apic.c#5 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.40 2007/05/08 22:01:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.41 2007/08/02 21:17:58 peter Exp $");
 
 #include "opt_hwpmc_hooks.h"
 
@@ -1060,10 +1060,6 @@
 	if (retval != 0)
 		printf("%s: Failed to setup the local APIC: returned %d\n",
 		    best_enum->apic_name, retval);
-#ifdef SMP
-	/* Last, setup the cpu topology now that we have probed CPUs */
-	mp_topology();
-#endif
 }
 SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL)
 

==== //depot/projects/zcopybpf/src/sys/amd64/amd64/mp_machdep.c#6 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.286 2007/06/04 23:56:07 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.287 2007/08/02 21:17:58 peter Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -186,26 +186,14 @@
 mp_topology(void)
 {
 	struct cpu_group *group;
-	u_int regs[4];
-	int logical_cpus;
 	int apic_id;
 	int groups;
 	int cpu;
 
 	/* Build the smp_topology map. */
 	/* Nothing to do if there is no HTT support. */
-	if ((cpu_feature & CPUID_HTT) == 0)
+	if (hyperthreading_cpus <= 1)
 		return;
-	logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
-	if (logical_cpus <= 1)
-		return;
-	/* Nothing to do if reported cores are physical cores. */
-	if (strcmp(cpu_vendor, "GenuineIntel") == 0 && cpu_high >= 4) {
-		cpuid_count(4, 0, regs);
-		if ((regs[0] & 0x1f) != 0 &&
-		    logical_cpus <= ((regs[0] >> 26) & 0x3f) + 1)
-			return;
-	}
 	group = &mp_groups[0];
 	groups = 1;
 	for (cpu = 0, apic_id = 0; apic_id <= MAX_APIC_ID; apic_id++) {
@@ -215,7 +203,8 @@
 		 * If the current group has members and we're not a logical
 		 * cpu, create a new group.
 		 */
-		if (group->cg_count != 0 && (apic_id % logical_cpus) == 0) {
+		if (group->cg_count != 0 &&
+		    (apic_id % hyperthreading_cpus) == 0) {
 			group++;
 			groups++;
 		}
@@ -420,6 +409,9 @@
 	}
 
 	set_interrupt_apic_ids();
+
+	/* Last, setup the cpu topology now that we have probed CPUs */
+	mp_topology();
 }
 
 

==== //depot/projects/zcopybpf/src/sys/amd64/amd64/trap.c#4 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.318 2007/06/10 21:59:12 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.319 2007/07/26 15:32:54 jhb Exp $");
 
 /*
  * AMD64 Trap and System call handling
@@ -159,7 +159,8 @@
 {
 	struct thread *td = curthread;
 	struct proc *p = td->td_proc;
-	int i = 0, ucode = 0, type, code;
+	int i = 0, ucode = 0, code;
+	u_int type;
 	register_t addr = 0;
 	ksiginfo_t ksi;
 
@@ -622,7 +623,8 @@
 	struct trapframe *frame;
 	vm_offset_t eva;
 {
-	int code, type, ss;
+	int code, ss;
+	u_int type;
 	long esp;
 	struct soft_segment_descriptor softseg;
 	char *msg;

==== //depot/projects/zcopybpf/src/sys/amd64/conf/NOTES#5 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.68 2007/07/04 00:18:38 bz Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.69 2007/08/15 19:26:02 des Exp $
 #
 
 #
@@ -446,6 +446,13 @@
 #
 device		ichwd
 
+#
+# Temperature sensors:
+#
+# coretemp: on-die sensor on Intel Core and newer CPUs
+#
+device		coretemp
+
 #---------------------------------------------------------------------------
 # ISDN4BSD
 #

==== //depot/projects/zcopybpf/src/sys/amd64/include/specialreg.h#4 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.39 2007/05/31 11:26:44 des Exp $
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.40 2007/08/15 19:26:01 des Exp $
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
@@ -179,6 +179,7 @@
 #define	MSR_BIOS_SIGN		0x08b
 #define	MSR_PERFCTR0		0x0c1
 #define	MSR_PERFCTR1		0x0c2
+#define	MSR_IA32_EXT_CONFIG	0x0ee	/* Undocumented. Core Solo/Duo only */
 #define	MSR_MTRRcap		0x0fe
 #define	MSR_BBL_CR_ADDR		0x116
 #define	MSR_BBL_CR_DECC		0x118

==== //depot/projects/zcopybpf/src/sys/amd64/isa/clock.c#4 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.232 2007/06/15 22:58:14 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.233 2007/07/23 09:42:30 dwmalone Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -686,8 +686,7 @@
 	return;
 
 wrong_time:
-	printf("Invalid time in real time clock.\n");
-	printf("Check and reset the date immediately!\n");
+	printf("Invalid time in clock: check and reset the date!\n");
 }
 
 /*

==== //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_sysvec.c#4 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.29 2007/05/14 22:40:04 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.30 2007/07/12 18:01:30 jhb Exp $");
 #include "opt_compat.h"
 
 #ifndef COMPAT_IA32
@@ -1023,7 +1023,8 @@
 	VM_PROT_ALL,
 	linux_copyout_strings,
 	exec_linux_setregs,
-	linux32_fixlimit
+	linux32_fixlimit,
+	&linux32_maxssiz,
 };
 
 static Elf32_Brandinfo linux_brand = {

==== //depot/projects/zcopybpf/src/sys/arm/arm/busdma_machdep.c#4 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.33 2007/06/10 12:33:01 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.34 2007/07/27 14:46:43 cognet Exp $");
 
 /*
  * ARM bus dma support routines
@@ -763,8 +763,12 @@
 		if (__predict_true(pmap == pmap_kernel())) {
 			(void) pmap_get_pde_pte(pmap, vaddr, &pde, &ptep);
 			if (__predict_false(pmap_pde_section(pde))) {
-				curaddr = (*pde & L1_S_FRAME) |
-				    (vaddr & L1_S_OFFSET);
+				if (*pde & L1_S_SUPERSEC)
+					curaddr = (*pde & L1_SUP_FRAME) |
+					    (vaddr & L1_SUP_OFFSET);
+				else
+					curaddr = (*pde & L1_S_FRAME) |
+					    (vaddr & L1_S_OFFSET);
 				if (*pde & L1_S_CACHE_MASK) {
 					map->flags &=
 					    ~DMAMAP_COHERENT;
@@ -1087,36 +1091,36 @@
 {
 	char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align];
 
-	if (op & BUS_DMASYNC_PREWRITE)
+	if (op & BUS_DMASYNC_PREWRITE) {
 		cpu_dcache_wb_range((vm_offset_t)buf, len);
+		cpu_l2cache_wb_range((vm_offset_t)buf, len);
+	}
+	if (op & BUS_DMASYNC_PREREAD) {
+		cpu_idcache_wbinv_range((vm_offset_t)buf, len);
+		cpu_l2cache_wbinv_range((vm_offset_t)buf, len);
+	}
 	if (op & BUS_DMASYNC_POSTREAD) {
-		if ((vm_offset_t)buf & arm_dcache_align_mask)
+		if ((vm_offset_t)buf & arm_dcache_align_mask) {
 			memcpy(_tmp_cl, (void *)((vm_offset_t)buf & ~
 			    arm_dcache_align_mask),
-			    (vm_offset_t)buf - ((vm_offset_t)buf &~
-			    arm_dcache_align_mask));
-		if (((vm_offset_t)buf + len) & arm_dcache_align_mask)
-			memcpy(_tmp_cl, (void *)((vm_offset_t)buf & ~
-			    arm_dcache_align_mask),
-			    (vm_offset_t)buf - ((vm_offset_t)buf &~
-			    arm_dcache_align_mask));
-		if (((vm_offset_t)buf + len) & arm_dcache_align_mask)
-			memcpy(_tmp_clend, (void *)(((vm_offset_t)buf + len) & ~
-			    arm_dcache_align_mask),
-			    (vm_offset_t)buf +len - (((vm_offset_t)buf + len) &~
-			    arm_dcache_align_mask));
+			    (vm_offset_t)buf & arm_dcache_align_mask);
+		}
+		if (((vm_offset_t)buf + len) & arm_dcache_align_mask) {
+			memcpy(_tmp_clend, (void *)((vm_offset_t)buf + len),
+			    arm_dcache_align - (((vm_offset_t)(buf) + len) &
+			   arm_dcache_align_mask));
+		}
 		cpu_dcache_inv_range((vm_offset_t)buf, len);
+		cpu_l2cache_inv_range((vm_offset_t)buf, len);
+
 		if ((vm_offset_t)buf & arm_dcache_align_mask)
 			memcpy((void *)((vm_offset_t)buf &
-			    ~arm_dcache_align_mask),
-			    _tmp_cl, 
-			    (vm_offset_t)buf - ((vm_offset_t)buf &~
-			    arm_dcache_align_mask));
+			    ~arm_dcache_align_mask), _tmp_cl, 
+			    (vm_offset_t)buf & arm_dcache_align_mask);
 		if (((vm_offset_t)buf + len) & arm_dcache_align_mask)
-			memcpy((void *)(((vm_offset_t)buf + len) & ~
-			    arm_dcache_align_mask), _tmp_clend,
-			    (vm_offset_t)buf +len - (((vm_offset_t)buf + len) &~
-			    arm_dcache_align_mask));
+			memcpy((void *)((vm_offset_t)buf + len), _tmp_clend,
+			    arm_dcache_align - (((vm_offset_t)(buf) + len) &
+			   arm_dcache_align_mask));
 	}
 }
 

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200708161852.l7GIqmJc006564>