PERFORCE change 119709 for review
Matt Jacob
mjacob at FreeBSD.org
Sat May 12 02:20:16 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=119709
Change 119709 by mjacob at mjexp on 2007/05/12 02:19:43
IFC
Affected files ...
.. //depot/projects/mjexp/ObsoleteFiles.inc#15 integrate
.. //depot/projects/mjexp/bin/df/df.c#4 integrate
.. //depot/projects/mjexp/bin/sh/var.c#2 integrate
.. //depot/projects/mjexp/cddl/lib/libzfs/Makefile#3 integrate
.. //depot/projects/mjexp/compat/opensolaris/include/devid.h#2 integrate
.. //depot/projects/mjexp/compat/opensolaris/misc/deviceid.c#1 branch
.. //depot/projects/mjexp/contrib/gdb/gdb/ppcfbsd-nat.c#2 integrate
.. //depot/projects/mjexp/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate
.. //depot/projects/mjexp/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#5 integrate
.. //depot/projects/mjexp/contrib/top/commands.c#3 integrate
.. //depot/projects/mjexp/contrib/top/machine.h#3 integrate
.. //depot/projects/mjexp/contrib/top/top.X#4 integrate
.. //depot/projects/mjexp/contrib/top/top.c#4 integrate
.. //depot/projects/mjexp/contrib/traceroute/traceroute.c#3 integrate
.. //depot/projects/mjexp/etc/rc.d/netoptions#3 integrate
.. //depot/projects/mjexp/etc/rc.d/routing#2 integrate
.. //depot/projects/mjexp/gnu/usr.bin/gdb/arch/powerpc/Makefile#2 integrate
.. //depot/projects/mjexp/gnu/usr.bin/gdb/arch/powerpc/init.c#2 integrate
.. //depot/projects/mjexp/include/stdlib.h#2 integrate
.. //depot/projects/mjexp/lib/libarchive/Makefile#10 integrate
.. //depot/projects/mjexp/lib/libarchive/archive.h.in#11 integrate
.. //depot/projects/mjexp/lib/libc/Versions.def#2 integrate
.. //depot/projects/mjexp/lib/libc/amd64/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/arm/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/compat-43/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/db/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/gdtoa/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/gdtoa/_hdtoa.c#3 integrate
.. //depot/projects/mjexp/lib/libc/gen/Symbol.map#5 integrate
.. //depot/projects/mjexp/lib/libc/gmon/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/i386/Symbol.map#3 integrate
.. //depot/projects/mjexp/lib/libc/ia64/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/inet/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/locale/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/locale/isdigit.3#3 integrate
.. //depot/projects/mjexp/lib/libc/nameser/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/net/Symbol.map#3 integrate
.. //depot/projects/mjexp/lib/libc/nls/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/posix1e/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/powerpc/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/quad/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/regex/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/resolv/Symbol.map#3 integrate
.. //depot/projects/mjexp/lib/libc/rpc/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/softfloat/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/sparc64/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/stdio/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/stdio/vfprintf.c#4 integrate
.. //depot/projects/mjexp/lib/libc/stdlib/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/stdlib/getenv.3#4 integrate
.. //depot/projects/mjexp/lib/libc/stdlib/getenv.c#3 integrate
.. //depot/projects/mjexp/lib/libc/stdlib/putenv.c#3 integrate
.. //depot/projects/mjexp/lib/libc/stdlib/setenv.c#3 integrate
.. //depot/projects/mjexp/lib/libc/stdtime/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/string/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/sys/Makefile.inc#4 integrate
.. //depot/projects/mjexp/lib/libc/sys/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/uuid/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/xdr/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libc/yp/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libelf/Version.map#3 integrate
.. //depot/projects/mjexp/lib/libfetch/http.c#2 integrate
.. //depot/projects/mjexp/lib/libgeom/Makefile#2 integrate
.. //depot/projects/mjexp/lib/libgeom/geom_getxml.c#2 integrate
.. //depot/projects/mjexp/lib/libgeom/geom_util.c#1 branch
.. //depot/projects/mjexp/lib/libgeom/libgeom.3#2 integrate
.. //depot/projects/mjexp/lib/libgeom/libgeom.h#2 integrate
.. //depot/projects/mjexp/lib/libipsec/pfkey_dump.c#2 integrate
.. //depot/projects/mjexp/lib/libpthread/pthread.map#2 integrate
.. //depot/projects/mjexp/lib/libpthread/thread/thr_private.h#3 integrate
.. //depot/projects/mjexp/lib/librt/Makefile#2 integrate
.. //depot/projects/mjexp/lib/librt/Version.map#1 branch
.. //depot/projects/mjexp/lib/libthr/pthread.map#2 integrate
.. //depot/projects/mjexp/lib/libthr/thread/thr_init.c#4 integrate
.. //depot/projects/mjexp/lib/libthr/thread/thr_mutex.c#5 integrate
.. //depot/projects/mjexp/lib/libthr/thread/thr_umtx.c#5 integrate
.. //depot/projects/mjexp/lib/libthread_db/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/libthread_db/arch/powerpc/libpthread_md.c#2 integrate
.. //depot/projects/mjexp/lib/libutil/Makefile#2 integrate
.. //depot/projects/mjexp/lib/libutil/flopen.3#1 branch
.. //depot/projects/mjexp/lib/libutil/flopen.c#1 branch
.. //depot/projects/mjexp/lib/libutil/libutil.h#2 integrate
.. //depot/projects/mjexp/lib/libutil/login_class.c#2 integrate
.. //depot/projects/mjexp/lib/libutil/pidfile.c#2 integrate
.. //depot/projects/mjexp/lib/msun/Symbol.map#3 integrate
.. //depot/projects/mjexp/lib/msun/amd64/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/msun/arm/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/msun/bsdsrc/b_tgamma.c#2 integrate
.. //depot/projects/mjexp/lib/msun/i387/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/msun/ia64/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/msun/powerpc/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/msun/sparc64/Symbol.map#2 integrate
.. //depot/projects/mjexp/lib/msun/src/e_lgamma_r.c#2 integrate
.. //depot/projects/mjexp/lib/msun/src/e_lgammaf_r.c#2 integrate
.. //depot/projects/mjexp/libexec/pppoed/pppoed.c#2 integrate
.. //depot/projects/mjexp/libexec/rtld-elf/Makefile#4 integrate
.. //depot/projects/mjexp/libexec/rtld-elf/Symbol.map#3 integrate
.. //depot/projects/mjexp/libexec/rtld-elf/Versions.def#3 delete
.. //depot/projects/mjexp/libexec/rtld-elf/i386/Symbol.map#3 integrate
.. //depot/projects/mjexp/libexec/rtld-elf/rtld.c#5 integrate
.. //depot/projects/mjexp/release/Makefile#7 integrate
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#6 integrate
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/installation/common/install.sgml#3 integrate
.. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#15 integrate
.. //depot/projects/mjexp/release/doc/share/misc/dev.archlist.txt#6 integrate
.. //depot/projects/mjexp/sbin/fdisk/fdisk.8#4 integrate
.. //depot/projects/mjexp/sbin/fdisk/fdisk.c#2 integrate
.. //depot/projects/mjexp/sbin/fdisk_pc98/fdisk.8#3 integrate
.. //depot/projects/mjexp/sbin/geom/class/eli/geom_eli.c#5 integrate
.. //depot/projects/mjexp/sbin/geom/class/multipath/gmultipath.8#2 integrate
.. //depot/projects/mjexp/sbin/ipfw/ipfw.8#5 integrate
.. //depot/projects/mjexp/sbin/ipfw/ipfw2.c#5 integrate
.. //depot/projects/mjexp/sbin/mdmfs/mdmfs.c#5 integrate
.. //depot/projects/mjexp/sbin/setkey/setkey.8#2 integrate
.. //depot/projects/mjexp/sbin/setkey/token.l#2 integrate
.. //depot/projects/mjexp/secure/lib/libcrypto/Makefile#4 integrate
.. //depot/projects/mjexp/secure/lib/libcrypto/Makefile.inc#4 integrate
.. //depot/projects/mjexp/secure/lib/libcrypto/opensslconf-amd64.h#3 integrate
.. //depot/projects/mjexp/secure/lib/libcrypto/opensslconf-i386.h#3 integrate
.. //depot/projects/mjexp/share/man/man4/Makefile#13 integrate
.. //depot/projects/mjexp/share/man/man4/altq.4#6 integrate
.. //depot/projects/mjexp/share/man/man4/hptiop.4#1 branch
.. //depot/projects/mjexp/share/man/man4/rum.4#1 branch
.. //depot/projects/mjexp/share/man/man4/snd_hda.4#7 integrate
.. //depot/projects/mjexp/share/man/man4/twa.4#2 integrate
.. //depot/projects/mjexp/share/man/man4/ubsa.4#4 integrate
.. //depot/projects/mjexp/share/man/man4/uftdi.4#4 integrate
.. //depot/projects/mjexp/share/man/man4/vlan.4#4 integrate
.. //depot/projects/mjexp/share/man/man5/passwd.5#2 integrate
.. //depot/projects/mjexp/share/man/man9/disk.9#4 integrate
.. //depot/projects/mjexp/share/man/man9/g_bio.9#3 integrate
.. //depot/projects/mjexp/share/man/man9/make_dev.9#3 integrate
.. //depot/projects/mjexp/share/man/man9/rman.9#3 integrate
.. //depot/projects/mjexp/share/misc/bsd-family-tree#5 integrate
.. //depot/projects/mjexp/share/misc/committers-ports.dot#7 integrate
.. //depot/projects/mjexp/share/misc/committers-src.dot#5 integrate
.. //depot/projects/mjexp/share/mk/bsd.symver.mk#2 integrate
.. //depot/projects/mjexp/share/mklocale/ja_JP.eucJP.src#2 integrate
.. //depot/projects/mjexp/sys/amd64/acpica/madt.c#4 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/intr_machdep.c#7 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/io_apic.c#7 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/local_apic.c#8 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/mp_machdep.c#7 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/mptable.c#3 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/mptable_pci.c#5 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/msi.c#4 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/nexus.c#7 integrate
.. //depot/projects/mjexp/sys/amd64/conf/GENERIC#9 integrate
.. //depot/projects/mjexp/sys/amd64/conf/NOTES#4 integrate
.. //depot/projects/mjexp/sys/amd64/include/apicvar.h#7 integrate
.. //depot/projects/mjexp/sys/amd64/include/intr_machdep.h#8 integrate
.. //depot/projects/mjexp/sys/amd64/include/vmparam.h#3 integrate
.. //depot/projects/mjexp/sys/amd64/isa/atpic.c#4 integrate
.. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#14 integrate
.. //depot/projects/mjexp/sys/amd64/pci/pci_bus.c#5 integrate
.. //depot/projects/mjexp/sys/arm/include/vmparam.h#2 integrate
.. //depot/projects/mjexp/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate
.. //depot/projects/mjexp/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate
.. //depot/projects/mjexp/sys/arm/xscale/ixp425/avila_machdep.c#4 integrate
.. //depot/projects/mjexp/sys/boot/common/loader.8#5 integrate
.. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_misc.c#4 integrate
.. //depot/projects/mjexp/sys/compat/linprocfs/linprocfs.c#12 integrate
.. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate
.. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate
.. //depot/projects/mjexp/sys/conf/NOTES#20 integrate
.. //depot/projects/mjexp/sys/conf/files#23 integrate
.. //depot/projects/mjexp/sys/conf/kern.pre.mk#4 integrate
.. //depot/projects/mjexp/sys/conf/options#17 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate
.. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate
.. //depot/projects/mjexp/sys/crypto/camellia/camellia-api.c#1 branch
.. //depot/projects/mjexp/sys/crypto/camellia/camellia.c#1 branch
.. //depot/projects/mjexp/sys/crypto/camellia/camellia.h#1 branch
.. //depot/projects/mjexp/sys/dev/acpica/acpi.c#6 integrate
.. //depot/projects/mjexp/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate
.. //depot/projects/mjexp/sys/dev/acpica/acpi_pcib_pci.c#4 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-disk.c#5 integrate
.. //depot/projects/mjexp/sys/dev/ata/atapi-cam.c#7 integrate
.. //depot/projects/mjexp/sys/dev/bce/if_bce.c#12 integrate
.. //depot/projects/mjexp/sys/dev/bce/if_bcefw.h#2 integrate
.. //depot/projects/mjexp/sys/dev/bce/if_bcereg.h#6 integrate
.. //depot/projects/mjexp/sys/dev/bge/if_bge.c#13 integrate
.. //depot/projects/mjexp/sys/dev/bge/if_bgereg.h#8 integrate
.. //depot/projects/mjexp/sys/dev/ciss/ciss.c#7 integrate
.. //depot/projects/mjexp/sys/dev/ciss/cissvar.h#2 integrate
.. //depot/projects/mjexp/sys/dev/em/LICENSE#2 integrate
.. //depot/projects/mjexp/sys/dev/em/README#2 integrate
.. //depot/projects/mjexp/sys/dev/em/e1000_80003es2lan.c#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_80003es2lan.h#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_82540.c#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_82541.c#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_82541.h#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_82542.c#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_82543.c#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_82543.h#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_82571.c#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_82571.h#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_82575.c#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_82575.h#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_api.c#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_api.h#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_defines.h#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_hw.h#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_ich8lan.c#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_ich8lan.h#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_mac.c#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_mac.h#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_manage.c#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_manage.h#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_nvm.c#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_nvm.h#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_osdep.h#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_phy.c#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_phy.h#1 branch
.. //depot/projects/mjexp/sys/dev/em/e1000_regs.h#1 branch
.. //depot/projects/mjexp/sys/dev/em/if_em.c#6 integrate
.. //depot/projects/mjexp/sys/dev/em/if_em.h#4 integrate
.. //depot/projects/mjexp/sys/dev/em/if_em_hw.c#3 delete
.. //depot/projects/mjexp/sys/dev/em/if_em_hw.h#3 delete
.. //depot/projects/mjexp/sys/dev/em/if_em_osdep.h#3 delete
.. //depot/projects/mjexp/sys/dev/firewire/firewire.c#4 integrate
.. //depot/projects/mjexp/sys/dev/firewire/firewirereg.h#3 integrate
.. //depot/projects/mjexp/sys/dev/firewire/fwdev.c#5 integrate
.. //depot/projects/mjexp/sys/dev/firewire/fwohci.c#4 integrate
.. //depot/projects/mjexp/sys/dev/firewire/fwohcireg.h#2 integrate
.. //depot/projects/mjexp/sys/dev/firewire/if_fwip.c#4 integrate
.. //depot/projects/mjexp/sys/dev/firewire/sbp.c#7 integrate
.. //depot/projects/mjexp/sys/dev/firewire/sbp_targ.c#4 integrate
.. //depot/projects/mjexp/sys/dev/gem/if_gem.c#3 integrate
.. //depot/projects/mjexp/sys/dev/gem/if_gem_pci.c#3 integrate
.. //depot/projects/mjexp/sys/dev/gem/if_gemvar.h#3 integrate
.. //depot/projects/mjexp/sys/dev/hme/if_hme.c#3 integrate
.. //depot/projects/mjexp/sys/dev/hptiop/hptiop.c#1 branch
.. //depot/projects/mjexp/sys/dev/hptiop/hptiop.h#1 branch
.. //depot/projects/mjexp/sys/dev/ipmi/ipmi_smbios.c#2 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp.c#21 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#25 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.h#18 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#27 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_sbus.c#15 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_tpublic.h#7 integrate
.. //depot/projects/mjexp/sys/dev/mfi/mfi.c#8 integrate
.. //depot/projects/mjexp/sys/dev/mfi/mfi_disk.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mfi/mfi_ioctl.h#4 integrate
.. //depot/projects/mjexp/sys/dev/mfi/mfi_pci.c#4 integrate
.. //depot/projects/mjexp/sys/dev/mfi/mfivar.h#3 integrate
.. //depot/projects/mjexp/sys/dev/mii/brgphy.c#10 integrate
.. //depot/projects/mjexp/sys/dev/mii/mii.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt.c#8 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt.h#13 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#22 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.h#5 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt_pci.c#12 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt_raid.c#7 integrate
.. //depot/projects/mjexp/sys/dev/mxge/eth_z8e.dat.gz.uu#3 integrate
.. //depot/projects/mjexp/sys/dev/mxge/ethp_z8e.dat.gz.uu#3 integrate
.. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#12 integrate
.. //depot/projects/mjexp/sys/dev/mxge/mxge_mcp.h#2 integrate
.. //depot/projects/mjexp/sys/dev/nve/if_nve.c#3 integrate
.. //depot/projects/mjexp/sys/dev/pci/pci.c#16 integrate
.. //depot/projects/mjexp/sys/dev/pci/pci_if.m#5 integrate
.. //depot/projects/mjexp/sys/dev/pci/pci_pci.c#8 integrate
.. //depot/projects/mjexp/sys/dev/pci/pci_private.h#6 integrate
.. //depot/projects/mjexp/sys/dev/pci/pcib_if.m#4 integrate
.. //depot/projects/mjexp/sys/dev/pci/pcib_private.h#6 integrate
.. //depot/projects/mjexp/sys/dev/pci/pcivar.h#8 integrate
.. //depot/projects/mjexp/sys/dev/sk/if_sk.c#7 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/emu10kx.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#12 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac_private.h#5 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/ich.c#8 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/buffer.h#5 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/sound.h#5 integrate
.. //depot/projects/mjexp/sys/dev/stge/if_stge.c#5 integrate
.. //depot/projects/mjexp/sys/dev/stge/if_stgereg.h#2 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_cl.h#2 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_cl_externs.h#2 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_cl_fwif.h#2 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_cl_fwimg.c#2 delete
.. //depot/projects/mjexp/sys/dev/twa/tw_cl_init.c#2 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_cl_intr.c#2 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_cl_io.c#2 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_cl_ioctl.h#2 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_cl_misc.c#2 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_cl_share.h#2 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_osl.h#2 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_osl_cam.c#5 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_osl_externs.h#2 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_osl_freebsd.c#4 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_osl_includes.h#3 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_osl_inline.h#3 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_osl_ioctl.h#2 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_osl_share.h#3 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_osl_types.h#2 integrate
.. //depot/projects/mjexp/sys/dev/uart/uart_kbd_sun.c#5 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_axe.c#4 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_axereg.h#2 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_rum.c#1 branch
.. //depot/projects/mjexp/sys/dev/usb/if_rumreg.h#1 branch
.. //depot/projects/mjexp/sys/dev/usb/if_rumvar.h#1 branch
.. //depot/projects/mjexp/sys/dev/usb/if_ural.c#9 integrate
.. //depot/projects/mjexp/sys/dev/usb/if_uralvar.h#2 integrate
.. //depot/projects/mjexp/sys/dev/usb/rt2573_ucode.h#1 branch
.. //depot/projects/mjexp/sys/dev/usb/ubsa.c#5 integrate
.. //depot/projects/mjexp/sys/dev/usb/uftdi.c#2 integrate
.. //depot/projects/mjexp/sys/dev/usb/usb_subr.c#5 integrate
.. //depot/projects/mjexp/sys/dev/usb/usbdevs#10 integrate
.. //depot/projects/mjexp/sys/fs/procfs/procfs_ioctl.c#4 integrate
.. //depot/projects/mjexp/sys/geom/eli/g_eli_ctl.c#3 integrate
.. //depot/projects/mjexp/sys/geom/geom.h#3 integrate
.. //depot/projects/mjexp/sys/geom/geom_dev.c#5 integrate
.. //depot/projects/mjexp/sys/geom/geom_disk.c#4 integrate
.. //depot/projects/mjexp/sys/geom/geom_disk.h#3 integrate
.. //depot/projects/mjexp/sys/geom/geom_io.c#6 integrate
.. //depot/projects/mjexp/sys/geom/geom_slice.c#3 integrate
.. //depot/projects/mjexp/sys/geom/geom_subr.c#2 integrate
.. //depot/projects/mjexp/sys/geom/part/g_part.c#3 integrate
.. //depot/projects/mjexp/sys/geom/part/g_part.h#2 integrate
.. //depot/projects/mjexp/sys/geom/part/g_part_apm.c#2 integrate
.. //depot/projects/mjexp/sys/geom/part/g_part_gpt.c#2 integrate
.. //depot/projects/mjexp/sys/i386/acpica/madt.c#4 integrate
.. //depot/projects/mjexp/sys/i386/conf/GENERIC#7 integrate
.. //depot/projects/mjexp/sys/i386/conf/NOTES#5 integrate
.. //depot/projects/mjexp/sys/i386/conf/PAE#2 integrate
.. //depot/projects/mjexp/sys/i386/i386/intr_machdep.c#7 integrate
.. //depot/projects/mjexp/sys/i386/i386/io_apic.c#7 integrate
.. //depot/projects/mjexp/sys/i386/i386/local_apic.c#8 integrate
.. //depot/projects/mjexp/sys/i386/i386/mp_machdep.c#8 integrate
.. //depot/projects/mjexp/sys/i386/i386/mptable.c#3 integrate
.. //depot/projects/mjexp/sys/i386/i386/mptable_pci.c#5 integrate
.. //depot/projects/mjexp/sys/i386/i386/msi.c#4 integrate
.. //depot/projects/mjexp/sys/i386/i386/nexus.c#8 integrate
.. //depot/projects/mjexp/sys/i386/include/apicvar.h#7 integrate
.. //depot/projects/mjexp/sys/i386/include/intr_machdep.h#8 integrate
.. //depot/projects/mjexp/sys/i386/include/vmparam.h#4 integrate
.. //depot/projects/mjexp/sys/i386/isa/atpic.c#4 integrate
.. //depot/projects/mjexp/sys/i386/linux/linux_machdep.c#11 integrate
.. //depot/projects/mjexp/sys/i386/pci/pci_bus.c#5 integrate
.. //depot/projects/mjexp/sys/ia64/ia64/machdep.c#6 integrate
.. //depot/projects/mjexp/sys/ia64/include/vmparam.h#3 integrate
.. //depot/projects/mjexp/sys/kern/kern_condvar.c#5 integrate
.. //depot/projects/mjexp/sys/kern/kern_descrip.c#11 integrate
.. //depot/projects/mjexp/sys/kern/kern_intr.c#11 integrate
.. //depot/projects/mjexp/sys/kern/kern_mutex.c#8 integrate
.. //depot/projects/mjexp/sys/kern/kern_rwlock.c#7 integrate
.. //depot/projects/mjexp/sys/kern/kern_sx.c#8 integrate
.. //depot/projects/mjexp/sys/kern/kern_synch.c#12 integrate
.. //depot/projects/mjexp/sys/kern/kern_timeout.c#3 integrate
.. //depot/projects/mjexp/sys/kern/sys_generic.c#7 integrate
.. //depot/projects/mjexp/sys/kern/uipc_debug.c#2 integrate
.. //depot/projects/mjexp/sys/kern/uipc_sockbuf.c#3 integrate
.. //depot/projects/mjexp/sys/kern/uipc_socket.c#11 integrate
.. //depot/projects/mjexp/sys/kern/uipc_syscalls.c#10 integrate
.. //depot/projects/mjexp/sys/kern/uipc_usrreq.c#11 integrate
.. //depot/projects/mjexp/sys/kern/vfs_syscalls.c#12 integrate
.. //depot/projects/mjexp/sys/modules/Makefile#12 integrate
.. //depot/projects/mjexp/sys/modules/crypto/Makefile#3 integrate
.. //depot/projects/mjexp/sys/modules/em/Makefile#2 integrate
.. //depot/projects/mjexp/sys/modules/hptiop/Makefile#1 branch
.. //depot/projects/mjexp/sys/modules/rum/Makefile#1 branch
.. //depot/projects/mjexp/sys/modules/twa/Makefile#2 integrate
.. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.c#3 integrate
.. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.h#3 integrate
.. //depot/projects/mjexp/sys/net/if.h#2 integrate
.. //depot/projects/mjexp/sys/net/if_lagg.c#2 integrate
.. //depot/projects/mjexp/sys/net/if_lagg.h#2 integrate
.. //depot/projects/mjexp/sys/net/pfkeyv2.h#2 integrate
.. //depot/projects/mjexp/sys/net80211/ieee80211_amrr.c#2 integrate
.. //depot/projects/mjexp/sys/netatalk/ddp_usrreq.c#3 integrate
.. //depot/projects/mjexp/sys/netgraph/ng_mppc.c#2 integrate
.. //depot/projects/mjexp/sys/netgraph/ng_socket.c#4 integrate
.. //depot/projects/mjexp/sys/netinet/if_ether.c#7 integrate
.. //depot/projects/mjexp/sys/netinet/in.c#6 integrate
.. //depot/projects/mjexp/sys/netinet/in_cksum.c#2 integrate
.. //depot/projects/mjexp/sys/netinet/in_gif.c#2 integrate
.. //depot/projects/mjexp/sys/netinet/in_pcb.c#8 integrate
.. //depot/projects/mjexp/sys/netinet/in_pcb.h#5 integrate
.. //depot/projects/mjexp/sys/netinet/in_rmx.c#2 integrate
.. //depot/projects/mjexp/sys/netinet/ip.h#3 integrate
.. //depot/projects/mjexp/sys/netinet/ip_divert.c#5 integrate
.. //depot/projects/mjexp/sys/netinet/ip_dummynet.c#3 integrate
.. //depot/projects/mjexp/sys/netinet/ip_ecn.c#2 integrate
.. //depot/projects/mjexp/sys/netinet/ip_encap.c#2 integrate
.. //depot/projects/mjexp/sys/netinet/ip_fw.h#3 integrate
.. //depot/projects/mjexp/sys/netinet/ip_fw2.c#11 integrate
.. //depot/projects/mjexp/sys/netinet/ip_icmp.c#3 integrate
.. //depot/projects/mjexp/sys/netinet/ip_id.c#2 integrate
.. //depot/projects/mjexp/sys/netinet/ip_input.c#5 integrate
.. //depot/projects/mjexp/sys/netinet/ip_ipsec.c#2 integrate
.. //depot/projects/mjexp/sys/netinet/ip_mroute.c#10 integrate
.. //depot/projects/mjexp/sys/netinet/ip_options.c#3 integrate
.. //depot/projects/mjexp/sys/netinet/ip_options.h#2 integrate
.. //depot/projects/mjexp/sys/netinet/ip_output.c#7 integrate
.. //depot/projects/mjexp/sys/netinet/libalias/alias_proxy.c#4 integrate
.. //depot/projects/mjexp/sys/netinet/raw_ip.c#7 integrate
.. //depot/projects/mjexp/sys/netinet/sctp.h#4 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_asconf.c#8 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_asconf.h#5 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_auth.c#7 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_auth.h#4 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_bsd_addr.c#5 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_bsd_addr.h#5 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_constants.h#8 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_crc32.c#5 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_crc32.h#3 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_header.h#3 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_indata.c#11 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_indata.h#4 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_input.c#11 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_input.h#3 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_lock_bsd.h#5 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_os.h#6 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_os_bsd.h#8 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_output.c#12 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_output.h#5 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_pcb.c#11 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_pcb.h#8 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_peeloff.c#7 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_peeloff.h#3 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_structs.h#11 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_sysctl.c#3 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_sysctl.h#3 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_timer.c#9 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_timer.h#3 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_uio.h#11 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_usrreq.c#11 integrate
.. //depot/projects/mjexp/sys/netinet/sctp_var.h#9 integrate
.. //depot/projects/mjexp/sys/netinet/sctputil.c#11 integrate
.. //depot/projects/mjexp/sys/netinet/sctputil.h#9 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_debug.c#2 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_fsm.h#2 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_input.c#13 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_output.c#9 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_reass.c#1 branch
.. //depot/projects/mjexp/sys/netinet/tcp_sack.c#5 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_subr.c#10 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_syncache.c#9 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_timer.c#6 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_timewait.c#1 branch
.. //depot/projects/mjexp/sys/netinet/tcp_usrreq.c#8 integrate
.. //depot/projects/mjexp/sys/netinet/tcp_var.h#7 integrate
.. //depot/projects/mjexp/sys/netinet/udp_usrreq.c#9 integrate
.. //depot/projects/mjexp/sys/netinet6/esp_camellia.c#1 branch
.. //depot/projects/mjexp/sys/netinet6/esp_camellia.h#1 branch
.. //depot/projects/mjexp/sys/netinet6/esp_core.c#2 integrate
.. //depot/projects/mjexp/sys/netinet6/in6_pcb.c#4 integrate
.. //depot/projects/mjexp/sys/netinet6/in6_pcb.h#2 integrate
.. //depot/projects/mjexp/sys/netinet6/in6_proto.c#5 integrate
.. //depot/projects/mjexp/sys/netinet6/in6_src.c#5 integrate
.. //depot/projects/mjexp/sys/netinet6/nd6.c#7 integrate
.. //depot/projects/mjexp/sys/netinet6/nd6_nbr.c#3 integrate
.. //depot/projects/mjexp/sys/netinet6/raw_ip6.c#4 integrate
.. //depot/projects/mjexp/sys/netinet6/sctp6_usrreq.c#9 integrate
.. //depot/projects/mjexp/sys/netinet6/sctp6_var.h#4 integrate
.. //depot/projects/mjexp/sys/netipsec/xform_esp.c#2 integrate
.. //depot/projects/mjexp/sys/netipx/ipx.c#3 integrate
.. //depot/projects/mjexp/sys/netipx/ipx.h#3 integrate
.. //depot/projects/mjexp/sys/netipx/ipx_cksum.c#3 integrate
.. //depot/projects/mjexp/sys/netipx/ipx_if.h#3 integrate
.. //depot/projects/mjexp/sys/netipx/ipx_input.c#3 integrate
.. //depot/projects/mjexp/sys/netipx/ipx_outputfl.c#3 integrate
.. //depot/projects/mjexp/sys/netipx/ipx_pcb.c#4 integrate
.. //depot/projects/mjexp/sys/netipx/ipx_pcb.h#3 integrate
.. //depot/projects/mjexp/sys/netipx/ipx_usrreq.c#4 integrate
.. //depot/projects/mjexp/sys/netipx/ipx_var.h#3 integrate
.. //depot/projects/mjexp/sys/netipx/spx_debug.c#3 integrate
.. //depot/projects/mjexp/sys/netipx/spx_debug.h#3 integrate
.. //depot/projects/mjexp/sys/opencrypto/cryptodev.c#4 integrate
.. //depot/projects/mjexp/sys/opencrypto/cryptodev.h#3 integrate
.. //depot/projects/mjexp/sys/opencrypto/cryptosoft.c#3 integrate
.. //depot/projects/mjexp/sys/opencrypto/xform.c#2 integrate
.. //depot/projects/mjexp/sys/opencrypto/xform.h#2 integrate
.. //depot/projects/mjexp/sys/pc98/conf/GENERIC#6 integrate
.. //depot/projects/mjexp/sys/pci/if_tl.c#3 integrate
.. //depot/projects/mjexp/sys/powerpc/include/vmparam.h#2 integrate
.. //depot/projects/mjexp/sys/sparc64/include/profile.h#2 integrate
.. //depot/projects/mjexp/sys/sparc64/include/vmparam.h#3 integrate
.. //depot/projects/mjexp/sys/sparc64/sparc64/machdep.c#6 integrate
.. //depot/projects/mjexp/sys/sparc64/sparc64/upa.c#5 integrate
.. //depot/projects/mjexp/sys/sun4v/include/profile.h#2 integrate
.. //depot/projects/mjexp/sys/sun4v/include/vmparam.h#3 integrate
.. //depot/projects/mjexp/sys/sys/callout.h#2 integrate
.. //depot/projects/mjexp/sys/sys/disk.h#2 integrate
.. //depot/projects/mjexp/sys/sys/filedesc.h#3 integrate
.. //depot/projects/mjexp/sys/sys/interrupt.h#5 integrate
.. //depot/projects/mjexp/sys/sys/param.h#15 integrate
.. //depot/projects/mjexp/sys/sys/rwlock.h#6 integrate
.. //depot/projects/mjexp/sys/sys/socketvar.h#4 integrate
.. //depot/projects/mjexp/sys/sys/sx.h#6 integrate
.. //depot/projects/mjexp/sys/ufs/ffs/ffs_softdep.c#8 integrate
.. //depot/projects/mjexp/sys/vm/uma_int.h#2 integrate
.. //depot/projects/mjexp/sys/vm/vm_page.c#9 integrate
.. //depot/projects/mjexp/sys/vm/vm_page.h#5 integrate
.. //depot/projects/mjexp/tools/regression/sockets/sblock/Makefile#1 branch
.. //depot/projects/mjexp/tools/regression/sockets/sblock/sblock.c#1 branch
.. //depot/projects/mjexp/usr.bin/calendar/calendar.c#2 integrate
.. //depot/projects/mjexp/usr.bin/calendar/calendar.h#2 integrate
.. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.freebsd#12 integrate
.. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.usholiday#2 integrate
.. //depot/projects/mjexp/usr.bin/calendar/day.c#2 integrate
.. //depot/projects/mjexp/usr.bin/calendar/io.c#2 integrate
.. //depot/projects/mjexp/usr.bin/calendar/ostern.c#2 integrate
.. //depot/projects/mjexp/usr.bin/calendar/paskha.c#2 integrate
.. //depot/projects/mjexp/usr.bin/du/du.c#2 integrate
.. //depot/projects/mjexp/usr.bin/env/env.c#2 integrate
.. //depot/projects/mjexp/usr.bin/lastcomm/Makefile#2 integrate
.. //depot/projects/mjexp/usr.bin/lastcomm/lastcomm.c#4 integrate
.. //depot/projects/mjexp/usr.bin/limits/limits.c#2 integrate
.. //depot/projects/mjexp/usr.bin/logger/Makefile#2 integrate
.. //depot/projects/mjexp/usr.bin/logger/logger.c#2 integrate
.. //depot/projects/mjexp/usr.bin/login/login.c#3 integrate
.. //depot/projects/mjexp/usr.bin/login/login.h#3 integrate
.. //depot/projects/mjexp/usr.bin/login/login_audit.c#2 integrate
.. //depot/projects/mjexp/usr.bin/login/login_fbtab.c#2 integrate
.. //depot/projects/mjexp/usr.bin/netstat/inet.c#3 integrate
.. //depot/projects/mjexp/usr.bin/quota/quota.c#6 integrate
.. //depot/projects/mjexp/usr.bin/su/su.c#3 integrate
.. //depot/projects/mjexp/usr.bin/tar/read.c#7 integrate
.. //depot/projects/mjexp/usr.bin/tar/write.c#10 integrate
.. //depot/projects/mjexp/usr.bin/time/Makefile#2 integrate
.. //depot/projects/mjexp/usr.bin/time/time.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/diskinfo/diskinfo.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/mixer/mixer.8#2 integrate
.. //depot/projects/mjexp/usr.sbin/nologin/nologin.5#2 integrate
.. //depot/projects/mjexp/usr.sbin/pstat/pstat.c#4 integrate
.. //depot/projects/mjexp/usr.sbin/rpcbind/rpcbind.c#3 integrate
.. //depot/projects/mjexp/usr.sbin/sade/main.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/sade/variable.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/sysinstall/main.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/sysinstall/variable.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/traceroute6/traceroute6.c#3 integrate
Differences ...
==== //depot/projects/mjexp/ObsoleteFiles.inc#15 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.81 2007/04/24 16:58:54 emax Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.82 2007/05/10 13:25:27 roberto 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.
#
+# 20070510: zpool/zfs moved to /sbin
+OLD_FILES+=usr/sbin/zfs
+OLD_FILES+=usr/sbin/zpool
# 20070423: rc.bluetooth (examples) removed
OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth
# 20070421: worm.4 removed
==== //depot/projects/mjexp/bin/df/df.c#4 (text+ko) ====
@@ -44,7 +44,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.68 2007/04/06 15:36:43 kan Exp $");
+__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.70 2007/05/01 16:02:44 ache Exp $");
#include <sys/param.h>
#include <sys/stat.h>
==== //depot/projects/mjexp/bin/sh/var.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.32 2006/06/15 07:00:49 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.35 2007/05/01 16:02:43 ache Exp $");
#include <unistd.h>
#include <stdlib.h>
==== //depot/projects/mjexp/cddl/lib/libzfs/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
+# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.3 2007/05/06 01:39:38 pjd Exp $
.PATH: ${.CURDIR}/../../../compat/opensolaris/misc
.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
@@ -9,7 +9,8 @@
DPADD= ${LIBUTIL}
LDADD= -lutil
-SRCS= mnttab.c \
+SRCS= deviceid.c \
+ mnttab.c \
mkdirp.c \
zmount.c \
fsshare.c \
==== //depot/projects/mjexp/compat/opensolaris/include/devid.h#2 (text+ko) ====
@@ -27,23 +27,28 @@
#ifndef _OPENSOLARIS_DEVID_H_
#define _OPENSOLARIS_DEVID_H_
-#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/disk.h>
#include <stdlib.h>
-typedef int ddi_devid_t;
+typedef struct ddi_devid {
+ char devid[DISK_IDENT_SIZE];
+} ddi_devid_t;
typedef struct devid_nmlist {
- char *devname;
+ char devname[MAXPATHLEN];
dev_t dev;
} devid_nmlist_t;
-static inline int devid_str_decode(char *devidstr, ddi_devid_t *retdevid, char **retminor_name) { abort(); }
-static inline int devid_deviceid_to_nmlist(char *search_path, ddi_devid_t devid, char *minor_name, devid_nmlist_t **retlist) { abort(); }
-static inline void devid_str_free(char *str) { abort(); }
-static inline void devid_free(ddi_devid_t devid) { abort(); }
-static inline void devid_free_nmlist(devid_nmlist_t *list) { abort(); }
-static inline int devid_get(int fd, ddi_devid_t *retdevid) { return -1; }
-static inline int devid_get_minor_name(int fd, char **retminor_name) { abort(); }
-static inline char *devid_str_encode(ddi_devid_t devid, char *minor_name) { abort(); }
+int devid_str_decode(char *devidstr, ddi_devid_t *retdevid,
+ char **retminor_name);
+int devid_deviceid_to_nmlist(char *search_path, ddi_devid_t devid,
+ char *minor_name, devid_nmlist_t **retlist);
+void devid_str_free(char *str);
+void devid_free(ddi_devid_t devid);
+void devid_free_nmlist(devid_nmlist_t *list);
+int devid_get(int fd, ddi_devid_t *retdevid);
+int devid_get_minor_name(int fd, char **retminor_name);
+char *devid_str_encode(ddi_devid_t devid, char *minor_name);
#endif /* !_OPENSOLARIS_DEVID_H_ */
==== //depot/projects/mjexp/contrib/gdb/gdb/ppcfbsd-nat.c#2 (text+ko) ====
@@ -143,11 +143,23 @@
}
void
+supply_gregset (char *regs)
+{
+ ppcfbsd_supply_reg (regs, -1);
+}
+
+void
fill_fpregset (char *fpregs, int regnum)
{
ppcfbsd_fill_fpreg (fpregs, regnum);
}
+void
+supply_fpregset (char *fpregs)
+{
+ ppcfbsd_supply_fpreg (fpregs, -1);
+}
+
/* Provide a prototype to silence -Wmissing-prototypes. */
void _initialize_ppcfbsd_nat (void);
==== //depot/projects/mjexp/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 (text+ko) ====
@@ -159,18 +159,14 @@
static boolean_t
is_provider(const char *name)
{
- off_t mediasize;
int fd;
- fd = open(name, O_RDONLY);
- if (fd == -1)
- return (B_FALSE);
- if (ioctl(fd, DIOCGMEDIASIZE, &mediasize) == -1) {
- close(fd);
- return (B_FALSE);
+ fd = g_open(name, 0);
+ if (fd >= 0) {
+ g_close(fd);
+ return (B_TRUE);
}
- close(fd);
- return (B_TRUE);
+ return (B_FALSE);
}
/*
@@ -183,9 +179,11 @@
nvlist_t *
make_leaf_vdev(const char *arg)
{
- char path[MAXPATHLEN];
+ char ident[DISK_IDENT_SIZE], path[MAXPATHLEN];
+ struct stat64 statbuf;
nvlist_t *vdev = NULL;
char *type = NULL;
+ boolean_t wholedisk = B_FALSE;
if (strncmp(arg, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
strlcpy(path, arg, sizeof (path));
@@ -212,6 +210,41 @@
verify(nvlist_add_uint64(vdev, ZPOOL_CONFIG_WHOLE_DISK,
(uint64_t)B_FALSE) == 0);
+ /*
+ * For a whole disk, defer getting its devid until after labeling it.
+ */
+ if (1 || (S_ISBLK(statbuf.st_mode) && !wholedisk)) {
+ /*
+ * Get the devid for the device.
+ */
+ int fd;
+ ddi_devid_t devid;
+ char *minor = NULL, *devid_str = NULL;
+
+ if ((fd = open(path, O_RDONLY)) < 0) {
+ (void) fprintf(stderr, gettext("cannot open '%s': "
+ "%s\n"), path, strerror(errno));
+ nvlist_free(vdev);
+ return (NULL);
+ }
+
+ if (devid_get(fd, &devid) == 0) {
+ if (devid_get_minor_name(fd, &minor) == 0 &&
+ (devid_str = devid_str_encode(devid, minor)) !=
+ NULL) {
+ verify(nvlist_add_string(vdev,
+ ZPOOL_CONFIG_DEVID, devid_str) == 0);
+ }
+ if (devid_str != NULL)
+ devid_str_free(devid_str);
+ if (minor != NULL)
+ devid_str_free(minor);
+ devid_free(devid);
+ }
+
+ (void) close(fd);
+ }
+
return (vdev);
}
==== //depot/projects/mjexp/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#5 (text+ko) ====
@@ -446,10 +446,6 @@
extern int ddi_strtoul(const char *str, char **nptr, int base,
unsigned long *result);
-#ifdef __cplusplus
-}
-#endif
-
/* ZFS Boot Related stuff. */
struct _buf {
@@ -508,4 +504,8 @@
#define ERESTART (-1)
#endif
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _SYS_ZFS_CONTEXT_H */
==== //depot/projects/mjexp/contrib/top/commands.c#3 (text+ko) ====
@@ -8,7 +8,7 @@
* Copyright (c) 1984, 1989, William LeFebvre, Rice University
* Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
*
- * $FreeBSD: src/contrib/top/commands.c,v 1.13 2007/04/17 03:12:39 rafan Exp $
+ * $FreeBSD: src/contrib/top/commands.c,v 1.15 2007/05/04 15:42:58 rafan Exp $
*/
/*
@@ -73,7 +73,7 @@
e - list errors generated by last \"kill\" or \"renice\" command\n\
H - toggle the displaying of threads\n\
i or I - toggle the displaying of idle processes\n\
-j - toggle the displaying of jail id\n\
+j - toggle the displaying of jail ID\n\
k - kill processes; send a signal to a list of processes\n\
m - toggle the display between 'cpu' and 'io' modes\n\
n or # - change number of processes to display\n", stdout);
@@ -89,6 +89,7 @@
r - renice a process\n\
s - change number of seconds to delay between updates\n\
S - toggle the displaying of system processes\n\
+a - toggle the displaying of process titles\n\
t - toggle the display of this process\n\
u - display processes for only one user (+ selects all users)\n\
\n\
==== //depot/projects/mjexp/contrib/top/machine.h#3 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/contrib/top/machine.h,v 1.8 2007/04/17 03:12:39 rafan Exp $
+ * $FreeBSD: src/contrib/top/machine.h,v 1.9 2007/05/04 15:42:58 rafan Exp $
*/
/*
@@ -62,7 +62,7 @@
int thread; /* show threads */
int uid; /* only this uid (unless uid == -1) */
int wcpu; /* show weighted cpu */
- int jail; /* show jail id */
+ int jail; /* show jail ID */
char *command; /* only this command (unless == NULL) */
};
==== //depot/projects/mjexp/contrib/top/top.X#4 (text+ko) ====
@@ -1,6 +1,6 @@
.\" NOTE: changes to the manual page for "top" should be made in the
.\" file "top.X" and NOT in the file "top.1".
-.\" $FreeBSD: src/contrib/top/top.X,v 1.18 2007/04/17 03:12:39 rafan Exp $
+.\" $FreeBSD: src/contrib/top/top.X,v 1.20 2007/05/04 15:42:58 rafan Exp $
.nr N %topn%
.nr D %delay%
.TH TOP 1 Local
@@ -105,7 +105,7 @@
.B \-j
Display the
.IR jail (8)
-id.
+ID.
.TP
.B \-t
Do not display the
@@ -255,6 +255,9 @@
.B S
Toggle the display of system processes.
.TP
+.B a
+Toggle the display of process titles.
+.TP
.B k
Send a signal (\*(lqkill\*(rq by default) to a list of processes. This
acts similarly to the command
@@ -291,7 +294,7 @@
.B j
Toggle the display of
.IR jail (8)
-id.
+ID.
.TP
.B t
Toggle the display of the
==== //depot/projects/mjexp/contrib/top/top.c#4 (text+ko) ====
@@ -13,7 +13,7 @@
* Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
* Copyright (c) 1996, William LeFebvre, Group sys Consulting
*
- * $FreeBSD: src/contrib/top/top.c,v 1.22 2007/04/19 14:24:54 rafan Exp $
+ * $FreeBSD: src/contrib/top/top.c,v 1.23 2007/05/04 15:42:58 rafan Exp $
*/
/*
@@ -1064,7 +1064,7 @@
case CMD_jidtog:
ps.jail = !ps.jail;
new_message(MT_standout | MT_delayed,
- " %sisplaying jail id.",
+ " %sisplaying jail ID.",
ps.jail ? "D" : "Not d");
header_text = format_header(uname_field);
reset_display();
==== //depot/projects/mjexp/contrib/traceroute/traceroute.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
"@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)";
#endif
static const char rcsid[] =
- "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.32 2006/10/15 17:44:49 dwmalone Exp $";
+ "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.33 2007/04/30 19:08:12 maxim Exp $";
#endif
/*
@@ -630,7 +630,7 @@
case 'w':
waittime = str2val(optarg, "wait time",
- 2, 24 * 60 * 60);
+ 1, 24 * 60 * 60);
break;
case 'z':
==== //depot/projects/mjexp/etc/rc.d/netoptions#3 (text+ko) ====
@@ -1,17 +1,17 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/netoptions,v 1.142 2007/04/09 10:09:39 des Exp $
+# $FreeBSD: src/etc/rc.d/netoptions,v 1.144 2007/05/02 15:49:30 mtm Exp $
#
# PROVIDE: netoptions
-# REQUIRE: localpkg
+# REQUIRE: FILESYSTEMS
# KEYWORD: nojail
. /etc/rc.subr
load_rc_config 'XXX'
-echo -n 'Additional TCP options:'
+echo -n 'Additional IP options:'
case ${log_in_vain} in
[Nn][Oo] | '')
log_in_vain=0
@@ -32,4 +32,46 @@
sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null
sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null
)
+
+case ${tcp_extensions} in
+[Yy][Ee][Ss] | '')
+ ;;
+*)
+ echo -n ' tcp extensions=NO'
+ sysctl net.inet.tcp.rfc1323=0 >/dev/null
+ ;;
+esac
+
+case ${tcp_keepalive} in
+[Nn][Oo])
+ echo -n ' TCP keepalive=NO'
+ sysctl net.inet.tcp.always_keepalive=0 >/dev/null
+ ;;
+esac
+
+case ${tcp_drop_synfin} in
+[Yy][Ee][Ss])
+ echo -n ' drop SYN+FIN packets=YES'
+ sysctl net.inet.tcp.drop_synfin=1 >/dev/null
+ ;;
+esac
+
+case ${ip_portrange_first} in
+[Nn][Oo] | '')
+ ;;
+*)
+ echo -n " ip_portrange_first=$ip_portrange_first"
+ sysctl net.inet.ip.portrange.first=$ip_portrange_first >/dev/null
+ ;;
+esac
+
+case ${ip_portrange_last} in
+[Nn][Oo] | '')
+ ;;
+*)
+ echo -n " ip_portrange_last=$ip_portrange_last"
+ sysctl net.inet.ip.portrange.last=$ip_portrange_last >/dev/null
+ ;;
+esac
+
echo '.'
==== //depot/projects/mjexp/etc/rc.d/routing#2 (text+ko) ====
@@ -2,7 +2,7 @@
#
# Configure routing and miscellaneous network tunables
#
-# $FreeBSD: src/etc/rc.d/routing,v 1.142 2005/10/28 16:07:52 yar Exp $
+# $FreeBSD: src/etc/rc.d/routing,v 1.143 2007/05/02 15:49:30 mtm Exp $
#
# PROVIDE: routing
@@ -61,15 +61,6 @@
options_start()
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list