From owner-p4-projects@FreeBSD.ORG Sun Sep 28 16:02:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAB6A1065689; Sun, 28 Sep 2008 16:02:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D27B106564A for ; Sun, 28 Sep 2008 16:02:09 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 68D788FC1A for ; Sun, 28 Sep 2008 16:02:09 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8SG29SD075762 for ; Sun, 28 Sep 2008 16:02:09 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8SG27Ni075566 for perforce@freebsd.org; Sun, 28 Sep 2008 16:02:07 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sun, 28 Sep 2008 16:02:07 GMT Message-Id: <200809281602.m8SG27Ni075566@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 150605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Sep 2008 16:02:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=150605 Change 150605 by nwhitehorn@nwhitehorn_trantor on 2008/09/28 16:02:07 IFC @183437 Affected files ... .. //depot/projects/ppc-g5/Makefile.inc1#2 integrate .. //depot/projects/ppc-g5/ObsoleteFiles.inc#3 integrate .. //depot/projects/ppc-g5/UPDATING#3 integrate .. //depot/projects/ppc-g5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 integrate .. //depot/projects/ppc-g5/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/ppc-g5/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/ppc-g5/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/ppc-g5/crypto/openssh/sshconnect2.c#2 integrate .. //depot/projects/ppc-g5/crypto/openssl/FREEBSD-Xlist#2 delete .. //depot/projects/ppc-g5/crypto/openssl/FREEBSD-upgrade#2 delete .. //depot/projects/ppc-g5/etc/Makefile#2 integrate .. //depot/projects/ppc-g5/etc/defaults/rc.conf#3 integrate .. //depot/projects/ppc-g5/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/ppc-g5/etc/periodic/monthly/Makefile#2 integrate .. //depot/projects/ppc-g5/etc/periodic/security/Makefile#2 integrate .. //depot/projects/ppc-g5/etc/periodic/weekly/Makefile#2 integrate .. //depot/projects/ppc-g5/etc/rc.d/jail#2 integrate .. //depot/projects/ppc-g5/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/ppc-g5/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/ppc-g5/gnu/lib/libgomp/Makefile#3 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 integrate .. //depot/projects/ppc-g5/include/Makefile#2 integrate .. //depot/projects/ppc-g5/include/unistd.h#2 integrate .. //depot/projects/ppc-g5/include/uuid.h#2 integrate .. //depot/projects/ppc-g5/lib/Makefile#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_mtree.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/config_freebsd.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_read_format_mtree.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/gen/getosreldate.3#2 integrate .. //depot/projects/ppc-g5/lib/libc/powerpc/gen/syncicache.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/rpc/clnt_dg.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/uuid/Symbol.map#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/Makefile#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.3#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.k7.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc.k8.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc.p4.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc.p5.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc.p6.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc.tsc.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc_allocate.3#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc_disable.3#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc_start.3#2 integrate .. //depot/projects/ppc-g5/lib/libthr/thread/thr_event.c#2 integrate .. //depot/projects/ppc-g5/lib/libthread_db/libpthread_db.c#2 integrate .. //depot/projects/ppc-g5/lib/libthread_db/libthr_db.c#2 integrate .. //depot/projects/ppc-g5/lib/libthread_db/thread_db.c#2 integrate .. //depot/projects/ppc-g5/lib/libthread_db/thread_db.h#2 integrate .. //depot/projects/ppc-g5/lib/libthread_db/thread_db_int.h#2 integrate .. //depot/projects/ppc-g5/libexec/Makefile#2 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/rtld_lock.c#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/Makefile#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/errata/Makefile#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/errata/article.sgml#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/hardware/Makefile#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/hardware/article.sgml#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/readme/Makefile#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/relnotes/article.sgml#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/share/sgml/catalog#2 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/share/sgml/release.dsl#2 integrate .. //depot/projects/ppc-g5/release/i386/fixit_crunch.conf#2 integrate .. //depot/projects/ppc-g5/release/pc98/fixit-small_crunch.conf#2 integrate .. //depot/projects/ppc-g5/release/pc98/fixit_crunch.conf#2 integrate .. //depot/projects/ppc-g5/sbin/Makefile#2 integrate .. //depot/projects/ppc-g5/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/ppc-g5/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/ppc-g5/sbin/fdisk/Makefile#2 integrate .. //depot/projects/ppc-g5/sbin/fsck_ffs/fsck_ffs.8#2 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/regdomain.c#2 integrate .. //depot/projects/ppc-g5/sbin/init/init.c#2 integrate .. //depot/projects/ppc-g5/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/ppc-g5/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/ppc-g5/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/ppc-g5/share/Makefile#2 integrate .. //depot/projects/ppc-g5/share/examples/drivers/make_pseudo_driver.sh#2 integrate .. //depot/projects/ppc-g5/share/man/man4/age.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/ddb.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/hwpmc.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/snd_hda.4#3 integrate .. //depot/projects/ppc-g5/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/ppc-g5/share/man/man5/src.conf.5#2 integrate .. //depot/projects/ppc-g5/share/man/man9/DB_COMMAND.9#1 branch .. //depot/projects/ppc-g5/share/man/man9/Makefile#3 integrate .. //depot/projects/ppc-g5/share/man/man9/make_dev.9#3 integrate .. //depot/projects/ppc-g5/share/man/man9/priv.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/spl.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/suser.9#2 delete .. //depot/projects/ppc-g5/share/man/man9/ucred.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/vfs_suser.9#2 integrate .. //depot/projects/ppc-g5/share/misc/committers-src.dot#2 integrate .. //depot/projects/ppc-g5/share/mk/bsd.own.mk#2 integrate .. //depot/projects/ppc-g5/share/zoneinfo/africa#2 integrate .. //depot/projects/ppc-g5/share/zoneinfo/asia#2 integrate .. //depot/projects/ppc-g5/share/zoneinfo/europe#2 integrate .. //depot/projects/ppc-g5/share/zoneinfo/southamerica#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/arm/mem.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/cam.h#2 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/ppc-g5/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/ppc-g5/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate .. //depot/projects/ppc-g5/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/ppc-g5/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/ppc-g5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/ppc-g5/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/ppc-g5/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/ppc-g5/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/ppc-g5/sys/conf/files#2 integrate .. //depot/projects/ppc-g5/sys/conf/files.amd64#2 integrate .. //depot/projects/ppc-g5/sys/conf/files.i386#3 integrate .. //depot/projects/ppc-g5/sys/conf/files.ia64#2 integrate .. //depot/projects/ppc-g5/sys/conf/files.mips#3 integrate .. //depot/projects/ppc-g5/sys/conf/files.powerpc#3 integrate .. //depot/projects/ppc-g5/sys/conf/files.sparc64#3 integrate .. //depot/projects/ppc-g5/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/ppc-g5/sys/conf/ldscript.mips#2 integrate .. //depot/projects/ppc-g5/sys/conf/options.mips#2 integrate .. //depot/projects/ppc-g5/sys/conf/options.sparc64#2 integrate .. //depot/projects/ppc-g5/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/ppc-g5/sys/ddb/db_command.c#2 integrate .. //depot/projects/ppc-g5/sys/ddb/db_command.h#2 integrate .. //depot/projects/ppc-g5/sys/ddb/db_main.c#2 integrate .. //depot/projects/ppc-g5/sys/ddb/ddb.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/agp/agp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/amr/amr.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/asr/asr.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cfe/cfe_api.c#1 branch .. //depot/projects/ppc-g5/sys/dev/cfe/cfe_api.h#1 branch .. //depot/projects/ppc-g5/sys/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/ppc-g5/sys/dev/cfe/cfe_console.c#1 branch .. //depot/projects/ppc-g5/sys/dev/cfe/cfe_error.h#1 branch .. //depot/projects/ppc-g5/sys/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/ppc-g5/sys/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/ppc-g5/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cpuctl/cpuctl.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/fb/fb.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iscsi/initiator/isc_cam.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iscsi/initiator/iscsi.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/jme/if_jmereg.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/joy/joy.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/le/if_le_isa.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/le/if_le_lebuffer.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/le/lebuffer_sbus.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/led/led.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mlx/mlx.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/mly/mly.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mse/mse.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/pbio/pbio.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppc_acpi.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppc_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppcreg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ppc/ppcvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/siba/siba.c#1 branch .. //depot/projects/ppc-g5/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/ppc-g5/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/ppc-g5/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/ppc-g5/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/siba/sibavar.h#1 branch .. //depot/projects/ppc-g5/sys/dev/snp/snp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/speaker/spkr.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/streams/streams.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/if_zyd.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/umass.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ums.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/urio.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/ppc-g5/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/geom_dev.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/geom_io.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/bios/apm.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/bios/apm.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/bios.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/mem.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/param.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/pmc_mdep.h#3 integrate .. //depot/projects/ppc-g5/sys/i386/include/smp.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/xen/evtchn.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/mem.c#2 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/sal.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/init_main.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/init_sysent.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_conf.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_intr.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_priv.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_proc.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_synch.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/ppc-g5/sys/kern/subr_clist.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/subr_rman.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/subr_witness.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/sys_generic.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/syscalls.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/syscalls.master#2 integrate .. //depot/projects/ppc-g5/sys/kern/systrace_args.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/tty.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/tty_pts.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/tty_ttydisc.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/libkern/memcmp.c#1 branch .. //depot/projects/ppc-g5/sys/mips/adm5120/if_admsw.c#3 integrate .. //depot/projects/ppc-g5/sys/mips/adm5120/obio.c#3 integrate .. //depot/projects/ppc-g5/sys/mips/conf/IDT#3 integrate .. //depot/projects/ppc-g5/sys/mips/idt/obio.c#3 integrate .. //depot/projects/ppc-g5/sys/mips/malta/gt_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/intr_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/mips/mips/mem.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/support.S#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/trap.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/cxgb/tom/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/svr4/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/wlan/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/net/if.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_clone.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_clone.h#2 integrate .. //depot/projects/ppc-g5/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_lagg.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_stf.c#2 integrate .. //depot/projects/ppc-g5/sys/net/if_tap.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_tun.c#2 integrate .. //depot/projects/ppc-g5/sys/net/route.c#3 integrate .. //depot/projects/ppc-g5/sys/net/route.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_hostap.c#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_wds.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/if_ether.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in_var.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_input.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/ppc-g5/sys/netipx/ipx.c#2 integrate .. //depot/projects/ppc-g5/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/ppc-g5/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/ppc-g5/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/ppc-g5/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/ppc-g5/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/ppc-g5/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/ppc-g5/sys/pc98/cbus/olpt.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/clock.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/mp_cpudep.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/trap_subr.S#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/cpufunc.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/md_var.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/pmap.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/pte.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/smp.h#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_dbdma.c#1 branch .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_dbdma.h#1 branch .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_kauai.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_macio.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/autoconf.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/syncicache.c#3 integrate .. //depot/projects/ppc-g5/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/ppc-g5/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/include/smp.h#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/include/tick.h#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/psychoreg.h#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/schizo.c#1 branch .. //depot/projects/ppc-g5/sys/sparc64/pci/schizoreg.h#1 branch .. //depot/projects/ppc-g5/sys/sparc64/pci/schizovar.h#1 branch .. //depot/projects/ppc-g5/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/tick.c#3 integrate .. //depot/projects/ppc-g5/sys/sys/clist.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/conf.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/interrupt.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/libkern.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/mount.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/param.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/pmc.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/pmckern.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/priv.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/proc.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/procfs.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/syscall.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/syscall.mk#2 integrate .. //depot/projects/ppc-g5/sys/sys/sysent.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/sysproto.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/systm.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/tty.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/ttydevsw.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/ttydisc.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/ttyhook.h#1 branch .. //depot/projects/ppc-g5/sys/sys/ttyqueue.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/types.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/vnode.h#3 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_extern.h#3 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/dirhash.h#2 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/inode.h#2 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/ppc-g5/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/ppc-g5/sys/vm/device_pager.c#2 integrate .. //depot/projects/ppc-g5/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/ppc-g5/sys/vm/vm_page.c#2 integrate .. //depot/projects/ppc-g5/sys/vm/vm_page.h#2 integrate .. //depot/projects/ppc-g5/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/ppc-g5/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/ppc-g5/sys/xen/gnttab.c#2 integrate .. //depot/projects/ppc-g5/sys/xen/gnttab.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/arch-ia64.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/arch-powerpc.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/arch-x86/cpuid.h#1 branch .. //depot/projects/ppc-g5/sys/xen/interface/arch-x86/hvm/save.h#1 branch .. //depot/projects/ppc-g5/sys/xen/interface/arch-x86/xen-mca.h#1 branch .. //depot/projects/ppc-g5/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/arch-x86/xen.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/callback.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/domctl.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/features.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/foreign/mkchecker.py#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/foreign/mkheader.py#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/foreign/structs.py#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/grant_table.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/hvm/hvm_op.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/hvm/ioreq.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/hvm/params.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/hvm/save.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/blkif.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/fbif.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/kbdif.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/netif.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/pciif.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/protocols.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/ring.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/xenbus.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/io/xs_wire.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/kexec.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/libelf.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/memory.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/physdev.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/platform.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/sysctl.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/trace.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/vcpu.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/xen-compat.h#2 integrate .. //depot/projects/ppc-g5/sys/xen/interface/xen.h#2 integrate .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_ACCT#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_AMD#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_APM#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_AT#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_BSNMP#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_CTM#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_FLOPPY#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_FREEBSD_UPDATE#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_IPFW#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_JAIL#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_LEGACY_CONSOLE#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_LOCATE#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_MAIL#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_MAKE#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_NDIS#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_NETGRAPH#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_NETGRAPH_SUPPORT#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_NTP#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_PKGTOOLS#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_PMC#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_PORTSNAP#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_PPP#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_QUOTAS#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_ROUTED#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_SLIP#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_SYSINSTALL#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_TELNET#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_TEXTPROC#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_WIRELESS#1 branch .. //depot/projects/ppc-g5/tools/build/options/WITHOUT_WIRELESS_SUPPORT#1 branch .. //depot/projects/ppc-g5/tools/tools/nanobsd/nanobsd.sh#3 integrate .. //depot/projects/ppc-g5/tools/tools/net80211/scripts/config#2 integrate .. //depot/projects/ppc-g5/usr.bin/Makefile#3 integrate .. //depot/projects/ppc-g5/usr.bin/ar/Makefile#2 integrate .. //depot/projects/ppc-g5/usr.bin/ar/acplex.l#1 branch .. //depot/projects/ppc-g5/usr.bin/ar/acpyacc.y#1 branch .. //depot/projects/ppc-g5/usr.bin/ar/ar.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/ar/ar.h#2 integrate .. //depot/projects/ppc-g5/usr.bin/ar/write.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/netstat/Makefile#2 integrate .. //depot/projects/ppc-g5/usr.bin/netstat/main.c#3 integrate .. //depot/projects/ppc-g5/usr.bin/netstat/netstat.h#3 integrate .. //depot/projects/ppc-g5/usr.bin/tar/config_freebsd.h#2 integrate .. //depot/projects/ppc-g5/usr.bin/tar/write.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/Makefile#2 integrate .. //depot/projects/ppc-g5/usr.sbin/pmcstat/pmcstat.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/pmcstat/pmcstat.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/portsnap/portsnap/portsnap.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/pstat/pstat.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/pstat/pstat.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/quot/quot.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/syslogd/syslogd.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/syslogd/syslogd.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/timed/timed/globals.h#2 integrate .. //depot/projects/ppc-g5/usr.sbin/ypbind/yp_ping.c#2 integrate Differences ... ==== //depot/projects/ppc-g5/Makefile.inc1#2 (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 +.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/ppc-g5/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.159 2008/09/13 17:29:49 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,11 @@ # 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) OLD_FILES+=usr/libexec/pt_chown # 20080822: ntp 4.2.4p5 import ==== //depot/projects/ppc-g5/UPDATING#3 (text+ko) ==== @@ -30,10 +30,10 @@ drivers have not yet been ported to the new TTY layer: PCI/ISA: - cy, digi, rc, rp, si, sio + cy, digi, rc, rp, sio USB: - ubser, ucycom, ufoma + ubser, ucycom Line disciplines: ng_h4, ng_tty, ppp, sl, snp @@ -1126,4 +1126,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.541 2008/09/03 08:30:17 roberto Exp $ +$FreeBSD: src/UPDATING,v 1.542 2008/09/14 19:25:57 ed Exp $ ==== //depot/projects/ppc-g5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 (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/ppc-g5/contrib/libpcap/pcap-bpf.c#2 (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 /* optionally get BSD define */ +#include #include #include #include @@ -86,6 +87,10 @@ #endif /* _AIX */ +#ifdef BIOCSETBUFMODE +#include +#endif + #include #include #include @@ -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; >>> TRUNCATED FOR MAIL (1000 lines) <<<