PERFORCE change 150577 for review
Sam Leffler
sam at FreeBSD.org
Sat Sep 27 20:52:51 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=150577
Change 150577 by sam at sam_ebb on 2008/09/27 20:51:57
IFC @ 150575
Affected files ...
.. //depot/projects/vap/Makefile.inc1#16 integrate
.. //depot/projects/vap/ObsoleteFiles.inc#19 integrate
.. //depot/projects/vap/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#3 integrate
.. //depot/projects/vap/contrib/libpcap/pcap-bpf.c#3 integrate
.. //depot/projects/vap/contrib/libpcap/pcap-int.h#3 integrate
.. //depot/projects/vap/contrib/libpcap/pcap.c#3 integrate
.. //depot/projects/vap/crypto/openssh/sshconnect2.c#4 integrate
.. //depot/projects/vap/crypto/openssl/FREEBSD-Xlist#3 delete
.. //depot/projects/vap/crypto/openssl/FREEBSD-upgrade#3 delete
.. //depot/projects/vap/etc/Makefile#7 integrate
.. //depot/projects/vap/etc/defaults/rc.conf#21 integrate
.. //depot/projects/vap/etc/periodic/daily/Makefile#3 integrate
.. //depot/projects/vap/etc/periodic/monthly/Makefile#3 integrate
.. //depot/projects/vap/etc/periodic/security/Makefile#3 integrate
.. //depot/projects/vap/etc/periodic/weekly/Makefile#3 integrate
.. //depot/projects/vap/etc/rc.d/jail#4 integrate
.. //depot/projects/vap/gnu/lib/csu/Makefile#5 integrate
.. //depot/projects/vap/gnu/lib/libgcc/Makefile#5 integrate
.. //depot/projects/vap/gnu/lib/libgomp/Makefile#4 integrate
.. //depot/projects/vap/gnu/usr.bin/Makefile#7 integrate
.. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kld.c#5 integrate
.. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/trgt_i386.c#7 integrate
.. //depot/projects/vap/include/Makefile#7 integrate
.. //depot/projects/vap/include/unistd.h#12 integrate
.. //depot/projects/vap/include/uuid.h#3 integrate
.. //depot/projects/vap/lib/Makefile#7 integrate
.. //depot/projects/vap/lib/libarchive/archive.h#4 integrate
.. //depot/projects/vap/lib/libarchive/archive_entry.h#7 integrate
.. //depot/projects/vap/lib/libarchive/archive_read_support_format_mtree.c#7 integrate
.. //depot/projects/vap/lib/libarchive/test/test_read_format_mtree.c#4 integrate
.. //depot/projects/vap/lib/libc/gen/getosreldate.3#3 integrate
.. //depot/projects/vap/lib/libc/powerpc/gen/syncicache.c#3 integrate
.. //depot/projects/vap/lib/libc/uuid/Symbol.map#3 integrate
.. //depot/projects/vap/lib/libpmc/Makefile#3 integrate
.. //depot/projects/vap/lib/libpmc/libpmc.c#5 integrate
.. //depot/projects/vap/lib/libpmc/pmc.3#6 integrate
.. //depot/projects/vap/lib/libpmc/pmc.k7.3#1 branch
.. //depot/projects/vap/lib/libpmc/pmc.k8.3#1 branch
.. //depot/projects/vap/lib/libpmc/pmc.p4.3#1 branch
.. //depot/projects/vap/lib/libpmc/pmc.p5.3#1 branch
.. //depot/projects/vap/lib/libpmc/pmc.p6.3#1 branch
.. //depot/projects/vap/lib/libpmc/pmc.tsc.3#1 branch
.. //depot/projects/vap/lib/libpmc/pmc_allocate.3#3 integrate
.. //depot/projects/vap/lib/libpmc/pmc_capabilities.3#4 integrate
.. //depot/projects/vap/lib/libpmc/pmc_disable.3#3 integrate
.. //depot/projects/vap/lib/libpmc/pmc_start.3#3 integrate
.. //depot/projects/vap/libexec/Makefile#4 integrate
.. //depot/projects/vap/libexec/rtld-elf/rtld_lock.c#4 integrate
.. //depot/projects/vap/release/doc/zh_CN.GB2312/Makefile#4 integrate
.. //depot/projects/vap/release/doc/zh_CN.GB2312/errata/Makefile#4 integrate
.. //depot/projects/vap/release/doc/zh_CN.GB2312/errata/article.sgml#3 integrate
.. //depot/projects/vap/release/doc/zh_CN.GB2312/hardware/Makefile#4 integrate
.. //depot/projects/vap/release/doc/zh_CN.GB2312/hardware/article.sgml#2 integrate
.. //depot/projects/vap/release/doc/zh_CN.GB2312/readme/Makefile#3 integrate
.. //depot/projects/vap/release/doc/zh_CN.GB2312/readme/article.sgml#4 integrate
.. //depot/projects/vap/release/doc/zh_CN.GB2312/relnotes/Makefile#4 integrate
.. //depot/projects/vap/release/doc/zh_CN.GB2312/relnotes/article.sgml#2 integrate
.. //depot/projects/vap/release/doc/zh_CN.GB2312/share/sgml/catalog#3 integrate
.. //depot/projects/vap/release/doc/zh_CN.GB2312/share/sgml/release.dsl#3 integrate
.. //depot/projects/vap/release/i386/fixit_crunch.conf#3 integrate
.. //depot/projects/vap/release/pc98/fixit-small_crunch.conf#4 integrate
.. //depot/projects/vap/release/pc98/fixit_crunch.conf#4 integrate
.. //depot/projects/vap/sbin/Makefile#6 integrate
.. //depot/projects/vap/sbin/bsdlabel/Makefile#3 integrate
.. //depot/projects/vap/sbin/bsdlabel/bsdlabel.c#5 integrate
.. //depot/projects/vap/sbin/fdisk/Makefile#3 integrate
.. //depot/projects/vap/sbin/fsck_ffs/fsck_ffs.8#4 integrate
.. //depot/projects/vap/sbin/ifconfig/ifconfig.8#18 integrate
.. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#29 integrate
.. //depot/projects/vap/sbin/ifconfig/regdomain.c#7 integrate
.. //depot/projects/vap/sbin/init/init.c#3 integrate
.. //depot/projects/vap/sbin/ipfw/ipfw.8#9 integrate
.. //depot/projects/vap/sbin/ipfw/ipfw2.c#9 integrate
.. //depot/projects/vap/sbin/mount_nfs/mount_nfs.c#6 integrate
.. //depot/projects/vap/share/Makefile#4 integrate
.. //depot/projects/vap/share/examples/drivers/make_pseudo_driver.sh#3 integrate
.. //depot/projects/vap/share/man/man4/age.4#2 integrate
.. //depot/projects/vap/share/man/man4/hwpmc.4#4 integrate
.. //depot/projects/vap/share/man/man4/snd_hda.4#6 integrate
.. //depot/projects/vap/share/man/man5/rc.conf.5#15 integrate
.. //depot/projects/vap/share/man/man5/src.conf.5#9 integrate
.. //depot/projects/vap/share/man/man9/DB_COMMAND.9#1 branch
.. //depot/projects/vap/share/man/man9/Makefile#14 integrate
.. //depot/projects/vap/share/man/man9/make_dev.9#4 integrate
.. //depot/projects/vap/share/man/man9/priv.9#3 integrate
.. //depot/projects/vap/share/man/man9/suser.9#3 delete
.. //depot/projects/vap/share/man/man9/ucred.9#3 integrate
.. //depot/projects/vap/share/man/man9/vfs_suser.9#3 integrate
.. //depot/projects/vap/share/misc/committers-src.dot#11 integrate
.. //depot/projects/vap/share/mk/bsd.own.mk#10 integrate
.. //depot/projects/vap/share/zoneinfo/africa#4 integrate
.. //depot/projects/vap/share/zoneinfo/asia#6 integrate
.. //depot/projects/vap/share/zoneinfo/europe#5 integrate
.. //depot/projects/vap/share/zoneinfo/southamerica#7 integrate
.. //depot/projects/vap/sys/amd64/amd64/elf_machdep.c#5 integrate
.. //depot/projects/vap/sys/amd64/amd64/identcpu.c#10 integrate
.. //depot/projects/vap/sys/amd64/amd64/mem.c#5 integrate
.. //depot/projects/vap/sys/amd64/linux32/linux32_sysvec.c#9 integrate
.. //depot/projects/vap/sys/arm/arm/elf_machdep.c#5 integrate
.. //depot/projects/vap/sys/arm/arm/mem.c#5 integrate
.. //depot/projects/vap/sys/boot/Makefile#7 integrate
.. //depot/projects/vap/sys/boot/ofw/libofw/Makefile#5 integrate
.. //depot/projects/vap/sys/boot/ofw/libofw/ofw_console.c#6 integrate
.. //depot/projects/vap/sys/cam/cam.h#3 integrate
.. //depot/projects/vap/sys/cam/scsi/scsi_pass.c#6 integrate
.. //depot/projects/vap/sys/cam/scsi/scsi_sa.c#6 integrate
.. //depot/projects/vap/sys/cam/scsi/scsi_ses.c#8 integrate
.. //depot/projects/vap/sys/cam/scsi/scsi_sg.c#3 integrate
.. //depot/projects/vap/sys/cam/scsi/scsi_target.c#6 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate
.. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 integrate
.. //depot/projects/vap/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_misc.c#9 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_proto.h#14 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscall.h#14 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscalls.c#14 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_sysent.c#14 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_util.h#5 integrate
.. //depot/projects/vap/sys/compat/freebsd32/syscalls.master#14 integrate
.. //depot/projects/vap/sys/compat/ia32/ia32_sysvec.c#6 integrate
.. //depot/projects/vap/sys/compat/linprocfs/linprocfs.c#10 integrate
.. //depot/projects/vap/sys/compat/linux/linux_misc.c#17 integrate
.. //depot/projects/vap/sys/compat/svr4/svr4_sysvec.c#10 integrate
.. //depot/projects/vap/sys/conf/files.ia64#7 integrate
.. //depot/projects/vap/sys/conf/files.mips#3 integrate
.. //depot/projects/vap/sys/conf/files.powerpc#15 integrate
.. //depot/projects/vap/sys/conf/files.sparc64#11 integrate
.. //depot/projects/vap/sys/conf/ldscript.mips#3 integrate
.. //depot/projects/vap/sys/conf/options.mips#2 integrate
.. //depot/projects/vap/sys/conf/options.sparc64#6 integrate
.. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_compat.h#7 integrate
.. //depot/projects/vap/sys/contrib/pf/net/pf_ioctl.c#11 integrate
.. //depot/projects/vap/sys/ddb/db_command.c#10 integrate
.. //depot/projects/vap/sys/ddb/db_command.h#4 integrate
.. //depot/projects/vap/sys/ddb/db_main.c#6 integrate
.. //depot/projects/vap/sys/ddb/ddb.h#9 integrate
.. //depot/projects/vap/sys/dev/acpica/acpi_quirk.c#5 integrate
.. //depot/projects/vap/sys/dev/agp/agp.c#4 integrate
.. //depot/projects/vap/sys/dev/aic7xxx/aic79xx_osm.c#7 integrate
.. //depot/projects/vap/sys/dev/amr/amr.c#9 integrate
.. //depot/projects/vap/sys/dev/arcmsr/arcmsr.c#6 integrate
.. //depot/projects/vap/sys/dev/asr/asr.c#6 integrate
.. //depot/projects/vap/sys/dev/ata/ata-chipset.c#16 integrate
.. //depot/projects/vap/sys/dev/ata/ata-pci.c#10 integrate
.. //depot/projects/vap/sys/dev/ata/ata-pci.h#11 integrate
.. //depot/projects/vap/sys/dev/ata/atapi-tape.c#9 integrate
.. //depot/projects/vap/sys/dev/ath/if_ath.c#94 integrate
.. //depot/projects/vap/sys/dev/ath/if_athvar.h#30 integrate
.. //depot/projects/vap/sys/dev/atkbdc/psm.c#7 integrate
.. //depot/projects/vap/sys/dev/bge/if_bge.c#17 integrate
.. //depot/projects/vap/sys/dev/bktr/bktr_os.c#6 integrate
.. //depot/projects/vap/sys/dev/bm/if_bm.c#4 integrate
.. //depot/projects/vap/sys/dev/ce/if_ce.c#4 integrate
.. //depot/projects/vap/sys/dev/cfe/cfe_api.c#1 branch
.. //depot/projects/vap/sys/dev/cfe/cfe_api.h#1 branch
.. //depot/projects/vap/sys/dev/cfe/cfe_api_int.h#1 branch
.. //depot/projects/vap/sys/dev/cfe/cfe_console.c#1 branch
.. //depot/projects/vap/sys/dev/cfe/cfe_error.h#1 branch
.. //depot/projects/vap/sys/dev/cfe/cfe_ioctl.h#1 branch
.. //depot/projects/vap/sys/dev/cfe/cfe_resource.c#1 branch
.. //depot/projects/vap/sys/dev/cp/if_cp.c#7 integrate
.. //depot/projects/vap/sys/dev/cpuctl/cpuctl.c#3 integrate
.. //depot/projects/vap/sys/dev/ctau/if_ct.c#7 integrate
.. //depot/projects/vap/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate
.. //depot/projects/vap/sys/dev/cxgb/common/cxgb_common.h#7 integrate
.. //depot/projects/vap/sys/dev/cxgb/common/cxgb_mc5.c#5 integrate
.. //depot/projects/vap/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#5 integrate
.. //depot/projects/vap/sys/dev/cxgb/common/cxgb_t3_hw.c#6 integrate
.. //depot/projects/vap/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/common/cxgb_vsc7323.c#3 integrate
.. //depot/projects/vap/sys/dev/cxgb/common/cxgb_vsc8211.c#5 integrate
.. //depot/projects/vap/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_adapter.h#10 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_config.h#5 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_include.h#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#14 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_multiq.c#3 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_offload.c#7 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_offload.h#6 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_osdep.h#7 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#12 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_t3fw.c#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/sys/cxgb_support.c#5 integrate
.. //depot/projects/vap/sys/dev/cxgb/sys/mbufq.h#5 integrate
.. //depot/projects/vap/sys/dev/cxgb/sys/mvec.h#6 integrate
.. //depot/projects/vap/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#3 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#11 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#10 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#6 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_defs.h#5 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_listen.c#5 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom.c#5 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom.h#3 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#5 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate
.. //depot/projects/vap/sys/dev/drm/drm_drv.c#8 integrate
.. //depot/projects/vap/sys/dev/drm/drm_fops.c#6 integrate
.. //depot/projects/vap/sys/dev/fb/fb.c#6 integrate
.. //depot/projects/vap/sys/dev/fb/vgareg.h#4 integrate
.. //depot/projects/vap/sys/dev/firewire/firewire.h#5 integrate
.. //depot/projects/vap/sys/dev/firewire/fwdev.c#6 integrate
.. //depot/projects/vap/sys/dev/hptiop/hptiop.c#4 integrate
.. //depot/projects/vap/sys/dev/hwpmc/hwpmc_amd.c#7 integrate
.. //depot/projects/vap/sys/dev/hwpmc/hwpmc_mod.c#7 integrate
.. //depot/projects/vap/sys/dev/hwpmc/hwpmc_piv.c#6 integrate
.. //depot/projects/vap/sys/dev/hwpmc/hwpmc_ppro.c#6 integrate
.. //depot/projects/vap/sys/dev/iir/iir_ctrl.c#5 integrate
.. //depot/projects/vap/sys/dev/iscsi/initiator/isc_cam.c#3 integrate
.. //depot/projects/vap/sys/dev/iscsi/initiator/iscsi.c#4 integrate
.. //depot/projects/vap/sys/dev/isp/isp_freebsd.c#6 integrate
.. //depot/projects/vap/sys/dev/jme/if_jme.c#4 integrate
.. //depot/projects/vap/sys/dev/jme/if_jmereg.h#3 integrate
.. //depot/projects/vap/sys/dev/joy/joy.c#5 integrate
.. //depot/projects/vap/sys/dev/kbd/kbd.c#7 integrate
.. //depot/projects/vap/sys/dev/kbdmux/kbdmux.c#5 integrate
.. //depot/projects/vap/sys/dev/le/if_le_cbus.c#3 integrate
.. //depot/projects/vap/sys/dev/le/if_le_isa.c#3 integrate
.. //depot/projects/vap/sys/dev/le/if_le_lebuffer.c#3 integrate
.. //depot/projects/vap/sys/dev/le/if_le_pci.c#3 integrate
.. //depot/projects/vap/sys/dev/le/lebuffer_sbus.c#3 integrate
.. //depot/projects/vap/sys/dev/led/led.c#8 integrate
.. //depot/projects/vap/sys/dev/mlx/mlx.c#7 integrate
.. //depot/projects/vap/sys/dev/mly/mly.c#6 integrate
.. //depot/projects/vap/sys/dev/mse/mse.c#6 integrate
.. //depot/projects/vap/sys/dev/msk/if_msk.c#9 integrate
.. //depot/projects/vap/sys/dev/msk/if_mskreg.h#5 integrate
.. //depot/projects/vap/sys/dev/pbio/pbio.c#6 integrate
.. //depot/projects/vap/sys/dev/pci/vga_pci.c#3 integrate
.. //depot/projects/vap/sys/dev/powermac_nvram/powermac_nvram.c#4 integrate
.. //depot/projects/vap/sys/dev/ppbus/if_plip.c#6 integrate
.. //depot/projects/vap/sys/dev/ppbus/lpt.c#6 integrate
.. //depot/projects/vap/sys/dev/ppbus/pcfclock.c#3 integrate
.. //depot/projects/vap/sys/dev/ppbus/ppbconf.c#7 integrate
.. //depot/projects/vap/sys/dev/ppbus/ppbconf.h#4 integrate
.. //depot/projects/vap/sys/dev/ppbus/ppi.c#5 integrate
.. //depot/projects/vap/sys/dev/ppbus/pps.c#6 integrate
.. //depot/projects/vap/sys/dev/ppc/ppc.c#7 integrate
.. //depot/projects/vap/sys/dev/ppc/ppc_acpi.c#4 integrate
.. //depot/projects/vap/sys/dev/ppc/ppc_isa.c#5 integrate
.. //depot/projects/vap/sys/dev/ppc/ppc_pci.c#3 integrate
.. //depot/projects/vap/sys/dev/ppc/ppc_puc.c#5 integrate
.. //depot/projects/vap/sys/dev/ppc/ppcreg.h#6 integrate
.. //depot/projects/vap/sys/dev/ppc/ppcvar.h#5 integrate
.. //depot/projects/vap/sys/dev/rp/rpvar.h#5 integrate
.. //depot/projects/vap/sys/dev/siba/siba.c#1 branch
.. //depot/projects/vap/sys/dev/siba/siba_ids.h#1 branch
.. //depot/projects/vap/sys/dev/siba/siba_pcib.c#1 branch
.. //depot/projects/vap/sys/dev/siba/siba_pcibvar.h#1 branch
.. //depot/projects/vap/sys/dev/siba/sibareg.h#1 branch
.. //depot/projects/vap/sys/dev/siba/sibavar.h#1 branch
.. //depot/projects/vap/sys/dev/snp/snp.c#9 integrate
.. //depot/projects/vap/sys/dev/sound/midi/sequencer.c#5 integrate
.. //depot/projects/vap/sys/dev/sound/pci/emu10kx.c#3 integrate
.. //depot/projects/vap/sys/dev/sound/pci/hda/hdac.c#10 integrate
.. //depot/projects/vap/sys/dev/sound/pcm/dsp.c#8 integrate
.. //depot/projects/vap/sys/dev/sound/pcm/mixer.c#6 integrate
.. //depot/projects/vap/sys/dev/speaker/spkr.c#5 integrate
.. //depot/projects/vap/sys/dev/streams/streams.c#7 integrate
.. //depot/projects/vap/sys/dev/tdfx/tdfx_pci.c#7 integrate
.. //depot/projects/vap/sys/dev/twa/tw_osl_freebsd.c#5 integrate
.. //depot/projects/vap/sys/dev/twe/twe_freebsd.c#6 integrate
.. //depot/projects/vap/sys/dev/usb/if_zyd.c#28 integrate
.. //depot/projects/vap/sys/dev/usb/ubsa.c#11 integrate
.. //depot/projects/vap/sys/dev/usb/ucomvar.h#8 integrate
.. //depot/projects/vap/sys/dev/usb/ufm.c#5 integrate
.. //depot/projects/vap/sys/dev/usb/ugen.c#6 integrate
.. //depot/projects/vap/sys/dev/usb/uhid.c#6 integrate
.. //depot/projects/vap/sys/dev/usb/ulpt.c#5 integrate
.. //depot/projects/vap/sys/dev/usb/umass.c#11 integrate
.. //depot/projects/vap/sys/dev/usb/ums.c#9 integrate
.. //depot/projects/vap/sys/dev/usb/urio.c#5 integrate
.. //depot/projects/vap/sys/dev/usb/usb.c#7 integrate
.. //depot/projects/vap/sys/dev/usb/usbdevs#30 integrate
.. //depot/projects/vap/sys/dev/usb/uscanner.c#9 integrate
.. //depot/projects/vap/sys/dev/vkbd/vkbd.c#8 integrate
.. //depot/projects/vap/sys/dev/xen/blkfront/blkfront.c#3 integrate
.. //depot/projects/vap/sys/dev/xen/console/console.c#4 integrate
.. //depot/projects/vap/sys/dev/xen/netfront/netfront.c#3 integrate
.. //depot/projects/vap/sys/fs/coda/coda_fbsd.c#4 integrate
.. //depot/projects/vap/sys/fs/devfs/devfs_devs.c#8 integrate
.. //depot/projects/vap/sys/fs/devfs/devfs_vnops.c#14 integrate
.. //depot/projects/vap/sys/fs/fdescfs/fdesc_vnops.c#11 integrate
.. //depot/projects/vap/sys/fs/hpfs/hpfs_vnops.c#8 integrate
.. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate
.. //depot/projects/vap/sys/fs/ntfs/ntfs_vnops.c#7 integrate
.. //depot/projects/vap/sys/fs/portalfs/portal_vnops.c#8 integrate
.. //depot/projects/vap/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate
.. //depot/projects/vap/sys/fs/smbfs/smbfs_node.c#12 integrate
.. //depot/projects/vap/sys/fs/tmpfs/tmpfs.h#5 integrate
.. //depot/projects/vap/sys/fs/tmpfs/tmpfs_subr.c#7 integrate
.. //depot/projects/vap/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate
.. //depot/projects/vap/sys/fs/udf/udf_vnops.c#8 integrate
.. //depot/projects/vap/sys/geom/geom_dev.c#9 integrate
.. //depot/projects/vap/sys/geom/geom_io.c#6 integrate
.. //depot/projects/vap/sys/geom/part/g_part.c#10 integrate
.. //depot/projects/vap/sys/geom/part/g_part_bsd.c#5 integrate
.. //depot/projects/vap/sys/geom/part/g_part_pc98.c#5 integrate
.. //depot/projects/vap/sys/gnu/fs/ext2fs/ext2_inode.c#3 integrate
.. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#3 integrate
.. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#6 integrate
.. //depot/projects/vap/sys/i386/acpica/acpi_machdep.c#7 integrate
.. //depot/projects/vap/sys/i386/bios/apm.c#8 integrate
.. //depot/projects/vap/sys/i386/bios/apm.h#5 integrate
.. //depot/projects/vap/sys/i386/bios/smapi.c#5 integrate
.. //depot/projects/vap/sys/i386/conf/GENERIC#23 integrate
.. //depot/projects/vap/sys/i386/i386/bios.c#6 integrate
.. //depot/projects/vap/sys/i386/i386/db_trace.c#6 integrate
.. //depot/projects/vap/sys/i386/i386/elf_machdep.c#5 integrate
.. //depot/projects/vap/sys/i386/i386/identcpu.c#10 integrate
.. //depot/projects/vap/sys/i386/i386/intr_machdep.c#9 integrate
.. //depot/projects/vap/sys/i386/i386/mem.c#5 integrate
.. //depot/projects/vap/sys/i386/i386/pmap.c#19 integrate
.. //depot/projects/vap/sys/i386/ibcs2/ibcs2_sysvec.c#6 integrate
.. //depot/projects/vap/sys/i386/include/param.h#6 integrate
.. //depot/projects/vap/sys/i386/include/smp.h#7 integrate
.. //depot/projects/vap/sys/i386/include/specialreg.h#8 integrate
.. //depot/projects/vap/sys/i386/include/xen/evtchn.h#2 integrate
.. //depot/projects/vap/sys/i386/linux/linux_sysvec.c#10 integrate
.. //depot/projects/vap/sys/i386/xen/mp_machdep.c#2 integrate
.. //depot/projects/vap/sys/i386/xen/pmap.c#5 integrate
.. //depot/projects/vap/sys/i386/xen/xen_machdep.c#6 integrate
.. //depot/projects/vap/sys/ia64/ia64/efi.c#3 integrate
.. //depot/projects/vap/sys/ia64/ia64/elf_machdep.c#6 integrate
.. //depot/projects/vap/sys/ia64/ia64/mem.c#3 integrate
.. //depot/projects/vap/sys/ia64/ia64/sal.c#5 integrate
.. //depot/projects/vap/sys/kern/imgact_aout.c#7 integrate
.. //depot/projects/vap/sys/kern/init_main.c#11 integrate
.. //depot/projects/vap/sys/kern/init_sysent.c#15 integrate
.. //depot/projects/vap/sys/kern/kern_condvar.c#8 integrate
.. //depot/projects/vap/sys/kern/kern_conf.c#14 integrate
.. //depot/projects/vap/sys/kern/kern_intr.c#15 integrate
.. //depot/projects/vap/sys/kern/kern_pmc.c#6 integrate
.. //depot/projects/vap/sys/kern/kern_priv.c#4 integrate
.. //depot/projects/vap/sys/kern/kern_proc.c#13 integrate
.. //depot/projects/vap/sys/kern/kern_shutdown.c#11 integrate
.. //depot/projects/vap/sys/kern/kern_synch.c#13 integrate
.. //depot/projects/vap/sys/kern/kern_syscalls.c#5 integrate
.. //depot/projects/vap/sys/kern/makesyscalls.sh#7 integrate
.. //depot/projects/vap/sys/kern/subr_clist.c#3 integrate
.. //depot/projects/vap/sys/kern/subr_pcpu.c#5 integrate
.. //depot/projects/vap/sys/kern/subr_rman.c#7 integrate
.. //depot/projects/vap/sys/kern/subr_sleepqueue.c#16 integrate
.. //depot/projects/vap/sys/kern/subr_turnstile.c#9 integrate
.. //depot/projects/vap/sys/kern/subr_witness.c#19 integrate
.. //depot/projects/vap/sys/kern/sys_generic.c#8 integrate
.. //depot/projects/vap/sys/kern/syscalls.c#15 integrate
.. //depot/projects/vap/sys/kern/syscalls.master#15 integrate
.. //depot/projects/vap/sys/kern/systrace_args.c#12 integrate
.. //depot/projects/vap/sys/kern/tty.c#14 integrate
.. //depot/projects/vap/sys/kern/tty_pts.c#7 integrate
.. //depot/projects/vap/sys/kern/tty_ttydisc.c#4 integrate
.. //depot/projects/vap/sys/kern/uipc_mqueue.c#7 integrate
.. //depot/projects/vap/sys/kern/vfs_bio.c#15 integrate
.. //depot/projects/vap/sys/kern/vfs_cache.c#13 integrate
.. //depot/projects/vap/sys/kern/vfs_mount.c#22 integrate
.. //depot/projects/vap/sys/kern/vfs_vnops.c#11 integrate
.. //depot/projects/vap/sys/libkern/memcmp.c#1 branch
.. //depot/projects/vap/sys/mips/adm5120/obio.c#3 integrate
.. //depot/projects/vap/sys/mips/conf/IDT#5 integrate
.. //depot/projects/vap/sys/mips/idt/obio.c#3 integrate
.. //depot/projects/vap/sys/mips/malta/gt_pci.c#3 integrate
.. //depot/projects/vap/sys/mips/mips/elf_machdep.c#2 integrate
.. //depot/projects/vap/sys/mips/mips/intr_machdep.c#3 integrate
.. //depot/projects/vap/sys/mips/mips/mem.c#2 integrate
.. //depot/projects/vap/sys/mips/mips/support.S#2 integrate
.. //depot/projects/vap/sys/mips/sentry5/s5_machdep.c#3 integrate
.. //depot/projects/vap/sys/modules/cxgb/Makefile#6 integrate
.. //depot/projects/vap/sys/modules/cxgb/cxgb/Makefile#7 integrate
.. //depot/projects/vap/sys/modules/cxgb/cxgb_t3fw/Makefile#3 integrate
.. //depot/projects/vap/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate
.. //depot/projects/vap/sys/modules/cxgb/toecore/Makefile#2 integrate
.. //depot/projects/vap/sys/modules/cxgb/tom/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/wlan/Makefile#12 integrate
.. //depot/projects/vap/sys/net/if.c#16 integrate
.. //depot/projects/vap/sys/net/if_clone.c#9 integrate
.. //depot/projects/vap/sys/net/if_clone.h#8 integrate
.. //depot/projects/vap/sys/net/if_lagg.c#8 integrate
.. //depot/projects/vap/sys/net/if_stf.c#11 integrate
.. //depot/projects/vap/sys/net/if_tap.c#10 integrate
.. //depot/projects/vap/sys/net/if_tun.c#8 integrate
.. //depot/projects/vap/sys/net/route.c#13 integrate
.. //depot/projects/vap/sys/net/route.h#10 integrate
.. //depot/projects/vap/sys/net80211/ieee80211.h#18 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#15 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_crypto.c#20 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_crypto.h#20 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#28 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#35 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#37 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#26 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ht.c#54 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ht.h#23 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#66 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#25 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_node.c#47 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_node.h#29 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_output.c#60 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_sta.c#19 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_var.h#53 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_wds.c#11 integrate
.. //depot/projects/vap/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 integrate
.. //depot/projects/vap/sys/netgraph/netgraph.h#10 integrate
.. //depot/projects/vap/sys/netgraph/ng_base.c#22 integrate
.. //depot/projects/vap/sys/netgraph/ng_device.c#6 integrate
.. //depot/projects/vap/sys/netgraph/ng_source.c#7 integrate
.. //depot/projects/vap/sys/netinet/ip.h#5 integrate
.. //depot/projects/vap/sys/netinet/ip_fw.h#12 integrate
.. //depot/projects/vap/sys/netinet/ip_fw2.c#18 integrate
.. //depot/projects/vap/sys/netinet/ip_input.c#11 integrate
.. //depot/projects/vap/sys/netinet/tcp_input.c#13 integrate
.. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#14 integrate
.. //depot/projects/vap/sys/netipx/ipx.c#5 integrate
.. //depot/projects/vap/sys/netsmb/smb_dev.c#6 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#16 integrate
.. //depot/projects/vap/sys/nfsserver/nfs.h#6 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_serv.c#12 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_srvsock.c#8 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_srvsubs.c#10 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_syscalls.c#8 integrate
.. //depot/projects/vap/sys/pc98/cbus/gdc.c#4 integrate
.. //depot/projects/vap/sys/pc98/cbus/olpt.c#3 integrate
.. //depot/projects/vap/sys/powerpc/aim/clock.c#6 integrate
.. //depot/projects/vap/sys/powerpc/aim/machdep.c#11 integrate
.. //depot/projects/vap/sys/powerpc/aim/mmu_oea.c#6 integrate
.. //depot/projects/vap/sys/powerpc/aim/mp_cpudep.c#3 integrate
.. //depot/projects/vap/sys/powerpc/aim/swtch.S#4 integrate
.. //depot/projects/vap/sys/powerpc/aim/trap_subr.S#4 integrate
.. //depot/projects/vap/sys/powerpc/booke/machdep.c#7 integrate
.. //depot/projects/vap/sys/powerpc/include/cpufunc.h#6 integrate
.. //depot/projects/vap/sys/powerpc/include/dbdma.h#2 integrate
.. //depot/projects/vap/sys/powerpc/include/md_var.h#6 integrate
.. //depot/projects/vap/sys/powerpc/include/pmap.h#6 integrate
.. //depot/projects/vap/sys/powerpc/include/pte.h#6 integrate
.. //depot/projects/vap/sys/powerpc/include/smp.h#4 integrate
.. //depot/projects/vap/sys/powerpc/ofw/ofw_syscons.c#6 integrate
.. //depot/projects/vap/sys/powerpc/powermac/ata_dbdma.c#1 branch
.. //depot/projects/vap/sys/powerpc/powermac/ata_dbdma.h#1 branch
.. //depot/projects/vap/sys/powerpc/powermac/ata_kauai.c#7 integrate
.. //depot/projects/vap/sys/powerpc/powermac/ata_macio.c#4 integrate
.. //depot/projects/vap/sys/powerpc/powermac/dbdma.c#2 integrate
.. //depot/projects/vap/sys/powerpc/powermac/dbdmavar.h#2 integrate
.. //depot/projects/vap/sys/powerpc/powerpc/cpu.c#9 integrate
.. //depot/projects/vap/sys/powerpc/powerpc/elf_machdep.c#5 integrate
.. //depot/projects/vap/sys/powerpc/powerpc/mem.c#5 integrate
.. //depot/projects/vap/sys/powerpc/powerpc/mp_machdep.c#8 integrate
.. //depot/projects/vap/sys/powerpc/powerpc/syncicache.c#5 integrate
.. //depot/projects/vap/sys/security/audit/audit_pipe.c#7 integrate
.. //depot/projects/vap/sys/security/mac_bsdextended/mac_bsdextended.c#10 integrate
.. //depot/projects/vap/sys/sparc64/include/smp.h#8 integrate
.. //depot/projects/vap/sys/sparc64/include/tick.h#5 integrate
.. //depot/projects/vap/sys/sparc64/pci/psycho.c#11 integrate
.. //depot/projects/vap/sys/sparc64/pci/psychoreg.h#5 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/elf_machdep.c#5 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/genassym.c#10 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/intr_machdep.c#11 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/mem.c#6 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/mp_machdep.c#13 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/tick.c#8 integrate
.. //depot/projects/vap/sys/sys/clist.h#4 integrate
.. //depot/projects/vap/sys/sys/conf.h#12 integrate
.. //depot/projects/vap/sys/sys/interrupt.h#9 integrate
.. //depot/projects/vap/sys/sys/libkern.h#8 integrate
.. //depot/projects/vap/sys/sys/mount.h#10 integrate
.. //depot/projects/vap/sys/sys/param.h#30 integrate
.. //depot/projects/vap/sys/sys/pmckern.h#6 integrate
.. //depot/projects/vap/sys/sys/priv.h#8 integrate
.. //depot/projects/vap/sys/sys/proc.h#22 integrate
.. //depot/projects/vap/sys/sys/syscall.h#15 integrate
.. //depot/projects/vap/sys/sys/syscall.mk#15 integrate
.. //depot/projects/vap/sys/sys/sysent.h#5 integrate
.. //depot/projects/vap/sys/sys/sysproto.h#15 integrate
.. //depot/projects/vap/sys/sys/systm.h#12 integrate
.. //depot/projects/vap/sys/sys/tty.h#9 integrate
.. //depot/projects/vap/sys/sys/ttydevsw.h#3 integrate
.. //depot/projects/vap/sys/sys/ttydisc.h#3 integrate
.. //depot/projects/vap/sys/sys/ttyhook.h#1 branch
.. //depot/projects/vap/sys/sys/ttyqueue.h#3 integrate
.. //depot/projects/vap/sys/sys/types.h#8 integrate
.. //depot/projects/vap/sys/sys/vnode.h#16 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_extern.h#7 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_inode.c#7 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_snapshot.c#11 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_softdep.c#13 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#17 integrate
.. //depot/projects/vap/sys/ufs/ufs/dirhash.h#4 integrate
.. //depot/projects/vap/sys/ufs/ufs/inode.h#8 integrate
.. //depot/projects/vap/sys/ufs/ufs/ufs_dirhash.c#7 integrate
.. //depot/projects/vap/sys/ufs/ufs/ufs_inode.c#6 integrate
.. //depot/projects/vap/sys/ufs/ufs/ufs_lookup.c#11 integrate
.. //depot/projects/vap/sys/ufs/ufs/ufs_vnops.c#11 integrate
.. //depot/projects/vap/sys/ufs/ufs/ufsmount.h#7 integrate
.. //depot/projects/vap/sys/vm/device_pager.c#6 integrate
.. //depot/projects/vap/sys/vm/vm_mmap.c#14 integrate
.. //depot/projects/vap/sys/vm/vm_page.c#13 integrate
.. //depot/projects/vap/sys/vm/vm_page.h#7 integrate
.. //depot/projects/vap/sys/vm/vm_pageout.c#8 integrate
.. //depot/projects/vap/sys/xen/evtchn/evtchn.c#3 integrate
.. //depot/projects/vap/sys/xen/gnttab.c#3 integrate
.. //depot/projects/vap/sys/xen/gnttab.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/arch-ia64.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/arch-powerpc.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/arch-x86/cpuid.h#1 branch
.. //depot/projects/vap/sys/xen/interface/arch-x86/hvm/save.h#1 branch
.. //depot/projects/vap/sys/xen/interface/arch-x86/xen-mca.h#1 branch
.. //depot/projects/vap/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/arch-x86/xen.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/callback.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/domctl.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/features.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/foreign/mkchecker.py#2 integrate
.. //depot/projects/vap/sys/xen/interface/foreign/mkheader.py#2 integrate
.. //depot/projects/vap/sys/xen/interface/foreign/structs.py#2 integrate
.. //depot/projects/vap/sys/xen/interface/grant_table.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/hvm/hvm_op.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/hvm/ioreq.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/hvm/params.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/hvm/save.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/io/blkif.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/io/fbif.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/io/kbdif.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/io/netif.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/io/pciif.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/io/protocols.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/io/ring.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/io/xenbus.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/io/xs_wire.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/kexec.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/libelf.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/memory.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/physdev.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/platform.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/sysctl.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/trace.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/vcpu.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/xen-compat.h#2 integrate
.. //depot/projects/vap/sys/xen/interface/xen.h#2 integrate
.. //depot/projects/vap/tools/build/options/WITHOUT_ACCT#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_AMD#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_APM#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_AT#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_BSNMP#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_CTM#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_FLOPPY#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_FREEBSD_UPDATE#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_IPFW#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_JAIL#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_LEGACY_CONSOLE#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_LOCATE#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_MAIL#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_MAKE#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_NDIS#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_NETGRAPH#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_NETGRAPH_SUPPORT#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_NTP#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_PKGTOOLS#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_PMC#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_PORTSNAP#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_PPP#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_QUOTAS#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_ROUTED#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_SLIP#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_SYSINSTALL#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_TELNET#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_TEXTPROC#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_WIRELESS#1 branch
.. //depot/projects/vap/tools/build/options/WITHOUT_WIRELESS_SUPPORT#1 branch
.. //depot/projects/vap/tools/tools/nanobsd/nanobsd.sh#9 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/config#8 integrate
.. //depot/projects/vap/usr.bin/Makefile#11 integrate
.. //depot/projects/vap/usr.bin/ar/Makefile#2 integrate
.. //depot/projects/vap/usr.bin/ar/acplex.l#1 branch
.. //depot/projects/vap/usr.bin/ar/acpyacc.y#1 branch
.. //depot/projects/vap/usr.bin/ar/ar.c#3 integrate
.. //depot/projects/vap/usr.bin/ar/ar.h#3 integrate
.. //depot/projects/vap/usr.bin/ar/write.c#4 integrate
.. //depot/projects/vap/usr.bin/netstat/Makefile#3 integrate
.. //depot/projects/vap/usr.bin/netstat/main.c#6 integrate
.. //depot/projects/vap/usr.bin/netstat/netstat.h#7 integrate
.. //depot/projects/vap/usr.sbin/Makefile#14 integrate
.. //depot/projects/vap/usr.sbin/pmcstat/pmcstat.8#5 integrate
.. //depot/projects/vap/usr.sbin/pmcstat/pmcstat.c#5 integrate
.. //depot/projects/vap/usr.sbin/pstat/pstat.8#4 integrate
.. //depot/projects/vap/usr.sbin/pstat/pstat.c#6 integrate
.. //depot/projects/vap/usr.sbin/syslogd/syslogd.8#4 integrate
.. //depot/projects/vap/usr.sbin/syslogd/syslogd.c#8 integrate
.. //depot/projects/vap/usr.sbin/timed/timed/globals.h#3 integrate
Differences ...
==== //depot/projects/vap/Makefile.inc1#16 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.610 2008/08/19 14:23:26 jhb Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -27,6 +27,10 @@
.include <bsd.own.mk>
+.if ${MACHINE_ARCH} == "mips"
+MK_RESCUE=no # not yet
+.endif
+
# We must do share/info early so that installation of info `dir'
# entries works correctly. Do it first since it is less likely to
# grow dependencies on include and lib than vice versa.
==== //depot/projects/vap/ObsoleteFiles.inc#19 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.160 2008/09/14 17:49:46 antoine Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.162 2008/09/21 16:11:11 antoine Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,9 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20080917: removal of manpage for axed kernel primitive suser(9)
+OLD_FILES+=usr/share/man/man9/suser.9.gz
+OLD_FILES+=usr/share/man/man9/suser_cred.9.gz
# 20080913: pax removed from rescue
OLD_FILES+=rescue/pax
# 20080823: removal of unneeded pt_chown, to implement grantpt(3)
==== //depot/projects/vap/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#3 (text+ko) ====
@@ -306,7 +306,7 @@
case sizeof (double):
return (dt_printf(dtp, fp, format,
*((double *)addr) / n));
-#if !defined(__arm__) && !defined(__powerpc__)
+#if !defined(__arm__) && !defined(__powerpc__) && !defined(__mips__)
case sizeof (long double):
return (dt_printf(dtp, fp, format,
*((long double *)addr) / ldn));
==== //depot/projects/vap/contrib/libpcap/pcap-bpf.c#3 (text+ko) ====
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD: src/contrib/libpcap/pcap-bpf.c,v 1.4 2007/10/16 02:07:55 mlaier Exp $
+ * $FreeBSD: src/contrib/libpcap/pcap-bpf.c,v 1.5 2008/09/16 20:32:29 csjp Exp $
*/
#ifndef lint
static const char rcsid[] _U_ =
@@ -30,6 +30,7 @@
#endif
#include <sys/param.h> /* optionally get BSD define */
+#include <sys/mman.h>
#include <sys/time.h>
#include <sys/timeb.h>
#include <sys/socket.h>
@@ -86,6 +87,10 @@
#endif /* _AIX */
+#ifdef BIOCSETBUFMODE
+#include <machine/atomic.h>
+#endif
+
#include <ctype.h>
#include <errno.h>
#include <netdb.h>
@@ -139,6 +144,159 @@
return (0);
}
+#ifdef BIOCGETBUFMODE
+/*
+ * Zero-copy BPF buffer routines to check for and acknowledge BPF data in
+ * shared memory buffers.
+ *
+ * pcap_next_zbuf_shm(): Check for a newly available shared memory buffer,
+ * and set up p->buffer and cc to reflect one if available. Notice that if
+ * there was no prior buffer, we select zbuf1 as this will be the first
+ * buffer filled for a fresh BPF session.
+ */
+static int
+pcap_next_zbuf_shm(pcap_t *p, int *cc)
+{
+ struct bpf_zbuf_header *bzh;
+
+ if (p->zbuffer == p->zbuf2 || p->zbuffer == NULL) {
+ bzh = (struct bpf_zbuf_header *)p->zbuf1;
+ if (bzh->bzh_user_gen !=
+ atomic_load_acq_int(&bzh->bzh_kernel_gen)) {
+ p->bzh = bzh;
+ p->zbuffer = (u_char *)p->zbuf1;
+ p->buffer = p->zbuffer + sizeof(*bzh);
+ *cc = bzh->bzh_kernel_len;
+ return (1);
+ }
+ } else if (p->zbuffer == p->zbuf1) {
+ bzh = (struct bpf_zbuf_header *)p->zbuf2;
+ if (bzh->bzh_user_gen !=
+ atomic_load_acq_int(&bzh->bzh_kernel_gen)) {
+ p->bzh = bzh;
+ p->zbuffer = (u_char *)p->zbuf2;
+ p->buffer = p->zbuffer + sizeof(*bzh);
+ *cc = bzh->bzh_kernel_len;
+ return (1);
+ }
+ }
+ *cc = 0;
+ return (0);
+}
+
+/*
+ * pcap_next_zbuf() -- Similar to pcap_next_zbuf_shm(), except wait using
+ * select() for data or a timeout, and possibly force rotation of the buffer
+ * in the event we time out or are in immediate mode. Invoke the shared
+ * memory check before doing system calls in order to avoid doing avoidable
+ * work.
+ */
+static int
+pcap_next_zbuf(pcap_t *p, int *cc)
+{
+ struct bpf_zbuf bz;
+ struct timeval tv;
+ struct timespec cur;
+ fd_set r_set;
+ int data, r;
+ int tmout, expire;
+
+#define TSTOMILLI(ts) (((ts)->tv_sec * 1000) + ((ts)->tv_nsec / 1000000))
+ /*
+ * Start out by seeing whether anything is waiting by checking the
+ * next shared memory buffer for data.
+ */
+ data = pcap_next_zbuf_shm(p, cc);
+ if (data)
+ return (data);
+ /*
+ * If a previous sleep was interrupted due to signal delivery, make
+ * sure that the timeout gets adjusted accordingly. This requires
+ * that we analyze when the timeout should be been expired, and
+ * subtract the current time from that. If after this operation,
+ * our timeout is less then or equal to zero, handle it like a
+ * regular timeout.
+ */
+ tmout = p->to_ms;
+ if (tmout)
+ (void) clock_gettime(CLOCK_MONOTONIC, &cur);
+ if (p->interrupted && p->to_ms) {
+ expire = TSTOMILLI(&p->firstsel) + p->to_ms;
+ tmout = expire - TSTOMILLI(&cur);
+#undef TSTOMILLI
+ if (tmout <= 0) {
+ p->interrupted = 0;
+ data = pcap_next_zbuf_shm(p, cc);
+ if (data)
+ return (data);
+ if (ioctl(p->fd, BIOCROTZBUF, &bz) < 0) {
+ (void) snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+ "BIOCROTZBUF: %s", strerror(errno));
+ return (-1);
+ }
+ return (pcap_next_zbuf_shm(p, cc));
+ }
+ }
+ /*
+ * No data in the buffer, so must use select() to wait for data or
+ * the next timeout.
+ */
+ FD_ZERO(&r_set);
+ FD_SET(p->fd, &r_set);
+ if (tmout != 0) {
+ tv.tv_sec = tmout / 1000;
+ tv.tv_usec = (tmout * 1000) % 1000000;
+ }
+ r = select(p->fd + 1, &r_set, NULL, NULL, p->to_ms != 0 ? &tv :
+ NULL);
+ if (r < 0 && errno == EINTR) {
+ if (!p->interrupted && p->to_ms) {
+ p->interrupted = 1;
+ p->firstsel = cur;
+ }
+ return (0);
+ } else if (r < 0) {
+ (void) snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+ "select: %s", strerror(errno));
+ return (-1);
+ }
+ p->interrupted = 0;
+ /*
+ * Check again for data, which may exist now that we've either been
+ * woken up as a result of data or timed out. Try the "there's data"
+ * case first since it doesn't require a system call.
+ */
+ data = pcap_next_zbuf_shm(p, cc);
+ if (data)
+ return (data);
+
+ /*
+ * Try forcing a buffer rotation to dislodge timed out or immediate
+ * data.
+ */
+ if (ioctl(p->fd, BIOCROTZBUF, &bz) < 0) {
+ (void) snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+ "BIOCROTZBUF: %s", strerror(errno));
+ return (-1);
+ }
+ return (pcap_next_zbuf_shm(p, cc));
+}
+
+/*
+ * Notify kernel that we are done with the buffer. We don't reset zbuffer so
+ * that we know which buffer to use next time around.
+ */
+static int
+pcap_ack_zbuf(pcap_t *p)
+{
+
+ atomic_store_rel_int(&p->bzh->bzh_user_gen, p->bzh->bzh_kernel_gen);
+ p->bzh = NULL;
+ p->buffer = NULL;
+ return (0);
+}
+#endif
+
static int
pcap_read_bpf(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
{
@@ -147,6 +305,9 @@
register u_char *bp, *ep;
u_char *datap;
struct bpf_insn *fcode;
+#ifdef BIOCSETBUFMODE
+ int i;
+#endif
#ifdef PCAP_FDDIPAD
register int pad;
#endif
@@ -167,7 +328,27 @@
}
cc = p->cc;
if (p->cc == 0) {
- cc = read(p->fd, (char *)p->buffer, p->bufsize);
+ /*
+ * When reading without zero-copy from a file descriptor, we
+ * use a single buffer and return a length of data in the
+ * buffer. With zero-copy, we update the p->buffer pointer
+ * to point at whatever underlying buffer contains the next
+ * data and update cc to reflect the data found in the
+ * buffer.
+ */
+#ifdef BIOCSETBUFMODE
+ if (p->zerocopy) {
+ if (p->buffer != NULL)
+ pcap_ack_zbuf(p);
+ i = pcap_next_zbuf(p, &cc);
+ if (i == 0)
+ goto again;
+ if (i < 0)
+ return (-1);
+ } else
+#endif
+ cc = read(p->fd, (char *)p->buffer, p->bufsize);
+
if (cc < 0) {
/* Don't choke when we get ptraced */
switch (errno) {
@@ -609,6 +790,10 @@
struct bpf_insn total_insn;
struct bpf_program total_prog;
struct utsname osinfo;
+#ifdef BIOCSETBUFMODE
+ struct bpf_zbuf bz;
+ u_int bufmode, zbufmax;
+#endif
#ifdef HAVE_DAG_API
if (strstr(device, "dag")) {
@@ -646,41 +831,105 @@
goto bad;
}
+#ifdef BIOCSETBUFMODE
/*
- * Try finding a good size for the buffer; 32768 may be too
- * big, so keep cutting it in half until we find a size
- * that works, or run out of sizes to try. If the default
- * is larger, don't make it smaller.
- *
- * XXX - there should be a user-accessible hook to set the
- * initial buffer size.
+ * If the BPF extension to set buffer mode is present, try setting
+ * the mode to zero-copy. If that fails, use regular buffering. If
+ * it succeeds but other setup fails, return an error to the user.
*/
- if ((ioctl(fd, BIOCGBLEN, (caddr_t)&v) < 0) || v < 32768)
- v = 32768;
- for ( ; v != 0; v >>= 1) {
- /* Ignore the return value - this is because the call fails
- * on BPF systems that don't have kernel malloc. And if
- * the call fails, it's no big deal, we just continue to
- * use the standard buffer size.
+ bufmode = BPF_BUFMODE_ZBUF;
+ if (ioctl(fd, BIOCSETBUFMODE, (caddr_t)&bufmode) == 0) {
+ p->zerocopy = 1;
+
+ /*
+ * How to pick a buffer size: first, query the maximum buffer
+ * size supported by zero-copy. This also lets us quickly
+ * determine whether the kernel generally supports zero-copy.
+ * Then, query the default buffer size, which reflects kernel
+ * policy for a desired default. Round to the nearest page
+ * size.
*/
- (void) ioctl(fd, BIOCSBLEN, (caddr_t)&v);
-
+ if (ioctl(fd, BIOCGETZMAX, (caddr_t)&zbufmax) < 0) {
+ snprintf(ebuf, PCAP_ERRBUF_SIZE, "BIOCGETZMAX: %s",
+ pcap_strerror(errno));
+ goto bad;
+ }
+ if ((ioctl(fd, BIOCGBLEN, (caddr_t)&v) < 0) || v < 32768)
+ v = 32768;
+#ifndef roundup
+#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) /* to any y */
+#endif
+ p->zbufsize = roundup(v, getpagesize());
+ if (p->zbufsize > zbufmax)
+ p->zbufsize = zbufmax;
+ p->zbuf1 = mmap(NULL, p->zbufsize, PROT_READ | PROT_WRITE,
+ MAP_ANON, -1, 0);
+ p->zbuf2 = mmap(NULL, p->zbufsize, PROT_READ | PROT_WRITE,
+ MAP_ANON, -1, 0);
+ if (p->zbuf1 == MAP_FAILED || p->zbuf2 == MAP_FAILED) {
+ snprintf(ebuf, PCAP_ERRBUF_SIZE, "mmap: %s",
+ pcap_strerror(errno));
+ goto bad;
+ }
+ bzero(&bz, sizeof(bz));
+ bz.bz_bufa = p->zbuf1;
+ bz.bz_bufb = p->zbuf2;
+ bz.bz_buflen = p->zbufsize;
+ if (ioctl(fd, BIOCSETZBUF, (caddr_t)&bz) < 0) {
+ snprintf(ebuf, PCAP_ERRBUF_SIZE, "BIOCSETZBUF: %s",
+ pcap_strerror(errno));
+ goto bad;
+ }
(void)strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
- if (ioctl(fd, BIOCSETIF, (caddr_t)&ifr) >= 0)
- break; /* that size worked; we're done */
-
- if (errno != ENOBUFS) {
+ if (ioctl(fd, BIOCSETIF, (caddr_t)&ifr) < 0) {
snprintf(ebuf, PCAP_ERRBUF_SIZE, "BIOCSETIF: %s: %s",
device, pcap_strerror(errno));
goto bad;
}
- }
+ v = p->zbufsize - sizeof(struct bpf_zbuf_header);
+ } else {
+#endif
+
+ /*
+ * Try finding a good size for the buffer; 32768 may be too
+ * big, so keep cutting it in half until we find a size
+ * that works, or run out of sizes to try. If the default
+ * is larger, don't make it smaller.
+ *
+ * XXX - there should be a user-accessible hook to set the
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list