From owner-svn-src-user@FreeBSD.ORG Sun Nov 6 03:18:50 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78F3B106566B; Sun, 6 Nov 2011 03:18:50 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 692B48FC13; Sun, 6 Nov 2011 03:18:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA63IoYw096784; Sun, 6 Nov 2011 03:18:50 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA63IoCc096782; Sun, 6 Nov 2011 03:18:50 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201111060318.pA63IoCc096782@svn.freebsd.org> From: Adrian Chadd Date: Sun, 6 Nov 2011 03:18:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227129 - user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 03:18:50 -0000 Author: adrian Date: Sun Nov 6 03:18:50 2011 New Revision: 227129 URL: http://svn.freebsd.org/changeset/base/227129 Log: Add in some code from linux/atheros which only enables a subset of ANI behaviour when running in hostap mode. Obtained from: Linux, Atheros Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c Sun Nov 6 02:10:40 2011 (r227128) +++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c Sun Nov 6 03:18:50 2011 (r227129) @@ -593,6 +593,16 @@ ar5416AniReset(struct ath_hal *ah, const goto finish; } + /* + * Use a restrictive set of ANI parameters for hostap mode. + */ + if (opmode == HAL_M_HOSTAP) { + if (IEEE80211_IS_CHAN_2GHZ(chan)) + AH5416(ah)->ah_ani_function = + HAL_ANI_SPUR_IMMUNITY_LEVEL | HAL_ANI_FIRSTEP_LEVEL; + else + AH5416(ah)->ah_ani_function = 0; + } /* * Automatic processing is done only in station mode right now. From owner-svn-src-user@FreeBSD.ORG Tue Nov 8 02:53:12 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D00AB1065672; Tue, 8 Nov 2011 02:53:12 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BBBCF8FC16; Tue, 8 Nov 2011 02:53:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA82rCuL009292; Tue, 8 Nov 2011 02:53:12 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA82rCq3009261; Tue, 8 Nov 2011 02:53:12 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201111080253.pA82rCq3009261@svn.freebsd.org> From: Adrian Chadd Date: Tue, 8 Nov 2011 02:53:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227329 - in user/adrian/if_ath_tx: . bin/cat bin/ln bin/mkdir bin/mv bin/ps bin/rm bin/sh bin/test cddl/lib/libzfs cddl/sbin/zfs cddl/sbin/zpool cddl/usr.bin/zinject cddl/usr.bin/ztest... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Nov 2011 02:53:12 -0000 Author: adrian Date: Tue Nov 8 02:53:11 2011 New Revision: 227329 URL: http://svn.freebsd.org/changeset/base/227329 Log: IFC. Added: user/adrian/if_ath_tx/lib/libc/sys/posix_fadvise.2 - copied unchanged from r227328, head/lib/libc/sys/posix_fadvise.2 user/adrian/if_ath_tx/share/man/man4/qlxgb.4 - copied unchanged from r227328, head/share/man/man4/qlxgb.4 user/adrian/if_ath_tx/sys/dev/esp/am53c974reg.h - copied unchanged from r227328, head/sys/dev/esp/am53c974reg.h user/adrian/if_ath_tx/sys/dev/esp/esp_pci.c - copied unchanged from r227328, head/sys/dev/esp/esp_pci.c user/adrian/if_ath_tx/sys/dev/mii/mii_bitbang.c - copied unchanged from r227328, head/sys/dev/mii/mii_bitbang.c user/adrian/if_ath_tx/sys/dev/mii/mii_bitbang.h - copied unchanged from r227328, head/sys/dev/mii/mii_bitbang.h user/adrian/if_ath_tx/sys/dev/qlxgb/ - copied from r227328, head/sys/dev/qlxgb/ user/adrian/if_ath_tx/sys/modules/qlxgb/ - copied from r227328, head/sys/modules/qlxgb/ Modified: user/adrian/if_ath_tx/Makefile.inc1 user/adrian/if_ath_tx/ObsoleteFiles.inc user/adrian/if_ath_tx/UPDATING user/adrian/if_ath_tx/bin/cat/cat.c user/adrian/if_ath_tx/bin/ln/ln.c user/adrian/if_ath_tx/bin/mkdir/mkdir.c user/adrian/if_ath_tx/bin/mv/mv.c user/adrian/if_ath_tx/bin/ps/print.c user/adrian/if_ath_tx/bin/ps/ps.1 user/adrian/if_ath_tx/bin/rm/rm.c user/adrian/if_ath_tx/bin/sh/sh.1 user/adrian/if_ath_tx/bin/test/test.c user/adrian/if_ath_tx/cddl/lib/libzfs/Makefile user/adrian/if_ath_tx/cddl/sbin/zfs/Makefile user/adrian/if_ath_tx/cddl/sbin/zpool/Makefile user/adrian/if_ath_tx/cddl/usr.bin/zinject/Makefile user/adrian/if_ath_tx/cddl/usr.bin/ztest/Makefile user/adrian/if_ath_tx/cddl/usr.sbin/zdb/Makefile user/adrian/if_ath_tx/contrib/llvm/tools/clang/lib/Basic/Targets.cpp user/adrian/if_ath_tx/contrib/tzdata/australasia user/adrian/if_ath_tx/contrib/tzdata/backward user/adrian/if_ath_tx/contrib/tzdata/europe user/adrian/if_ath_tx/contrib/tzdata/northamerica user/adrian/if_ath_tx/contrib/tzdata/zone.tab user/adrian/if_ath_tx/etc/rc.d/nfsd user/adrian/if_ath_tx/games/bcd/bcd.c user/adrian/if_ath_tx/games/caesar/caesar.c user/adrian/if_ath_tx/games/fortune/fortune/fortune.c user/adrian/if_ath_tx/games/fortune/unstr/unstr.c user/adrian/if_ath_tx/games/grdc/grdc.c user/adrian/if_ath_tx/games/morse/morse.c user/adrian/if_ath_tx/games/number/number.c user/adrian/if_ath_tx/gnu/lib/libstdc++/config.h user/adrian/if_ath_tx/lib/clang/include/llvm/Config/config.h user/adrian/if_ath_tx/lib/clang/include/llvm/Config/llvm-config.h user/adrian/if_ath_tx/lib/libc/amd64/gen/setjmp.S user/adrian/if_ath_tx/lib/libc/amd64/gen/sigsetjmp.S user/adrian/if_ath_tx/lib/libc/i386/gen/setjmp.S user/adrian/if_ath_tx/lib/libc/i386/gen/sigsetjmp.S user/adrian/if_ath_tx/lib/libc/stdlib/realpath.c user/adrian/if_ath_tx/lib/libc/sys/Makefile.inc user/adrian/if_ath_tx/lib/libc/sys/Symbol.map user/adrian/if_ath_tx/lib/libc/sys/madvise.2 user/adrian/if_ath_tx/lib/libpam/modules/pam_lastlog/pam_lastlog.c user/adrian/if_ath_tx/lib/libpam/modules/pam_unix/pam_unix.8 user/adrian/if_ath_tx/lib/libpam/modules/pam_unix/pam_unix.c user/adrian/if_ath_tx/libexec/rshd/rshd.c user/adrian/if_ath_tx/release/doc/en_US.ISO8859-1/hardware/article.sgml user/adrian/if_ath_tx/release/doc/share/misc/dev.archlist.txt user/adrian/if_ath_tx/release/ia64/mkisoimages.sh user/adrian/if_ath_tx/sbin/atm/atmconfig/atmconfig_device.c user/adrian/if_ath_tx/sbin/atm/atmconfig/diag.c user/adrian/if_ath_tx/sbin/atm/atmconfig/main.c user/adrian/if_ath_tx/sbin/badsect/badsect.c user/adrian/if_ath_tx/sbin/bsdlabel/bsdlabel.c user/adrian/if_ath_tx/sbin/camcontrol/camcontrol.c user/adrian/if_ath_tx/sbin/ccdconfig/ccdconfig.c user/adrian/if_ath_tx/sbin/devfs/rule.c user/adrian/if_ath_tx/sbin/dmesg/dmesg.c user/adrian/if_ath_tx/sbin/dumpfs/dumpfs.c user/adrian/if_ath_tx/sbin/fdisk/fdisk.8 user/adrian/if_ath_tx/sbin/fdisk/fdisk.c user/adrian/if_ath_tx/sbin/fdisk_pc98/fdisk.8 user/adrian/if_ath_tx/sbin/ffsinfo/ffsinfo.c user/adrian/if_ath_tx/sbin/fsck/fsck.c user/adrian/if_ath_tx/sbin/fsck/preen.c user/adrian/if_ath_tx/sbin/fsck_msdosfs/dir.c user/adrian/if_ath_tx/sbin/fsirand/fsirand.c user/adrian/if_ath_tx/sbin/growfs/growfs.c user/adrian/if_ath_tx/sbin/init/init.c user/adrian/if_ath_tx/sbin/mount/mount.c user/adrian/if_ath_tx/sbin/mount/mount_fs.c user/adrian/if_ath_tx/sbin/mount_cd9660/mount_cd9660.c user/adrian/if_ath_tx/sbin/mount_nullfs/mount_nullfs.c user/adrian/if_ath_tx/sbin/mount_udf/mount_udf.c user/adrian/if_ath_tx/sbin/natd/natd.c user/adrian/if_ath_tx/sbin/newfs/mkfs.c user/adrian/if_ath_tx/sbin/newfs/newfs.h user/adrian/if_ath_tx/sbin/rcorder/rcorder.c user/adrian/if_ath_tx/sbin/recoverdisk/recoverdisk.c user/adrian/if_ath_tx/sbin/shutdown/shutdown.c user/adrian/if_ath_tx/sbin/swapon/swapon.c user/adrian/if_ath_tx/sbin/tunefs/tunefs.c user/adrian/if_ath_tx/sbin/umount/umount.c user/adrian/if_ath_tx/share/man/man4/Makefile user/adrian/if_ath_tx/share/man/man4/altq.4 user/adrian/if_ath_tx/share/man/man4/esp.4 user/adrian/if_ath_tx/share/man/man9/kqueue.9 user/adrian/if_ath_tx/share/misc/bsd-family-tree user/adrian/if_ath_tx/sys/amd64/amd64/mp_machdep.c user/adrian/if_ath_tx/sys/amd64/amd64/pmap.c user/adrian/if_ath_tx/sys/amd64/amd64/trap.c user/adrian/if_ath_tx/sys/amd64/conf/GENERIC user/adrian/if_ath_tx/sys/amd64/include/segments.h user/adrian/if_ath_tx/sys/amd64/include/trap.h user/adrian/if_ath_tx/sys/amd64/linux32/linux32_sysvec.c user/adrian/if_ath_tx/sys/arm/arm/busdma_machdep.c user/adrian/if_ath_tx/sys/arm/arm/vm_machdep.c user/adrian/if_ath_tx/sys/arm/conf/GUMSTIX user/adrian/if_ath_tx/sys/arm/xscale/i80321/iq31244_7seg.c user/adrian/if_ath_tx/sys/arm/xscale/i8134x/iq81342_7seg.c user/adrian/if_ath_tx/sys/arm/xscale/ixp425/if_npe.c user/adrian/if_ath_tx/sys/arm/xscale/pxa/pxa_smi.c user/adrian/if_ath_tx/sys/arm/xscale/pxa/pxa_space.c user/adrian/if_ath_tx/sys/boot/common/loader.8 user/adrian/if_ath_tx/sys/cam/ata/ata_da.c user/adrian/if_ath_tx/sys/cam/ata/ata_pmp.c user/adrian/if_ath_tx/sys/cam/cam_periph.c user/adrian/if_ath_tx/sys/cam/cam_queue.c user/adrian/if_ath_tx/sys/cam/cam_sim.c user/adrian/if_ath_tx/sys/cam/scsi/scsi_cd.c user/adrian/if_ath_tx/sys/cam/scsi/scsi_ch.c user/adrian/if_ath_tx/sys/cam/scsi/scsi_da.c user/adrian/if_ath_tx/sys/cam/scsi/scsi_low.c user/adrian/if_ath_tx/sys/cam/scsi/scsi_sa.c user/adrian/if_ath_tx/sys/cam/scsi/scsi_ses.c user/adrian/if_ath_tx/sys/cam/scsi/scsi_targ_bh.c user/adrian/if_ath_tx/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c user/adrian/if_ath_tx/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c user/adrian/if_ath_tx/sys/cddl/dev/cyclic/cyclic.c user/adrian/if_ath_tx/sys/cddl/dev/fbt/fbt.c user/adrian/if_ath_tx/sys/compat/freebsd32/freebsd32_misc.c user/adrian/if_ath_tx/sys/compat/freebsd32/freebsd32_proto.h user/adrian/if_ath_tx/sys/compat/freebsd32/freebsd32_syscall.h user/adrian/if_ath_tx/sys/compat/freebsd32/freebsd32_syscalls.c user/adrian/if_ath_tx/sys/compat/freebsd32/freebsd32_sysent.c user/adrian/if_ath_tx/sys/compat/freebsd32/freebsd32_systrace_args.c user/adrian/if_ath_tx/sys/compat/freebsd32/syscalls.master user/adrian/if_ath_tx/sys/compat/ia32/ia32_sysvec.c user/adrian/if_ath_tx/sys/compat/linux/linux_futex.c user/adrian/if_ath_tx/sys/compat/linux/linux_mib.c user/adrian/if_ath_tx/sys/compat/x86bios/x86bios.c user/adrian/if_ath_tx/sys/conf/NOTES user/adrian/if_ath_tx/sys/conf/files user/adrian/if_ath_tx/sys/conf/files.amd64 user/adrian/if_ath_tx/sys/conf/options user/adrian/if_ath_tx/sys/contrib/pf/net/pf.c user/adrian/if_ath_tx/sys/dev/aac/aac.c user/adrian/if_ath_tx/sys/dev/aac/aac_cam.c user/adrian/if_ath_tx/sys/dev/acpi_support/acpi_wmi.c user/adrian/if_ath_tx/sys/dev/acpica/Osd/OsdInterrupt.c user/adrian/if_ath_tx/sys/dev/acpica/Osd/OsdMemory.c user/adrian/if_ath_tx/sys/dev/acpica/Osd/OsdSchedule.c user/adrian/if_ath_tx/sys/dev/acpica/Osd/OsdSynch.c user/adrian/if_ath_tx/sys/dev/acpica/acpi.c user/adrian/if_ath_tx/sys/dev/acpica/acpi_cmbat.c user/adrian/if_ath_tx/sys/dev/acpica/acpi_ec.c user/adrian/if_ath_tx/sys/dev/acpica/acpi_pci_link.c user/adrian/if_ath_tx/sys/dev/acpica/acpi_perf.c user/adrian/if_ath_tx/sys/dev/acpica/acpi_powerres.c user/adrian/if_ath_tx/sys/dev/acpica/acpi_smbat.c user/adrian/if_ath_tx/sys/dev/acpica/acpi_video.c user/adrian/if_ath_tx/sys/dev/ahci/ahci.c user/adrian/if_ath_tx/sys/dev/amr/amr.c user/adrian/if_ath_tx/sys/dev/amr/amr_cam.c user/adrian/if_ath_tx/sys/dev/an/if_an.c user/adrian/if_ath_tx/sys/dev/ata/ata-all.c user/adrian/if_ath_tx/sys/dev/ata/ata-pci.c user/adrian/if_ath_tx/sys/dev/ata/chipsets/ata-promise.c user/adrian/if_ath_tx/sys/dev/ata/chipsets/ata-siliconimage.c user/adrian/if_ath_tx/sys/dev/ath/ah_osdep.c user/adrian/if_ath_tx/sys/dev/ath/if_ath.c user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h user/adrian/if_ath_tx/sys/dev/atkbdc/psm.c user/adrian/if_ath_tx/sys/dev/bce/if_bce.c user/adrian/if_ath_tx/sys/dev/bge/if_bge.c user/adrian/if_ath_tx/sys/dev/bktr/bktr_os.c user/adrian/if_ath_tx/sys/dev/bm/if_bm.c user/adrian/if_ath_tx/sys/dev/bm/if_bmreg.h user/adrian/if_ath_tx/sys/dev/bm/if_bmvar.h user/adrian/if_ath_tx/sys/dev/bwn/if_bwn.c user/adrian/if_ath_tx/sys/dev/bxe/if_bxe.c user/adrian/if_ath_tx/sys/dev/cardbus/cardbus.c user/adrian/if_ath_tx/sys/dev/ciss/ciss.c user/adrian/if_ath_tx/sys/dev/cs/if_cs.c user/adrian/if_ath_tx/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c user/adrian/if_ath_tx/sys/dev/cxgbe/t4_main.c user/adrian/if_ath_tx/sys/dev/dc/if_dc.c user/adrian/if_ath_tx/sys/dev/dc/if_dcreg.h user/adrian/if_ath_tx/sys/dev/dcons/dcons_os.c user/adrian/if_ath_tx/sys/dev/e1000/if_em.c user/adrian/if_ath_tx/sys/dev/e1000/if_igb.c user/adrian/if_ath_tx/sys/dev/esp/esp_sbus.c user/adrian/if_ath_tx/sys/dev/esp/ncr53c9x.c user/adrian/if_ath_tx/sys/dev/esp/ncr53c9xreg.h user/adrian/if_ath_tx/sys/dev/esp/ncr53c9xvar.h user/adrian/if_ath_tx/sys/dev/fb/vesa.c user/adrian/if_ath_tx/sys/dev/fdc/fdc.c user/adrian/if_ath_tx/sys/dev/firewire/fwmem.c user/adrian/if_ath_tx/sys/dev/firewire/if_fwe.c user/adrian/if_ath_tx/sys/dev/firewire/if_fwip.c user/adrian/if_ath_tx/sys/dev/firewire/sbp.c user/adrian/if_ath_tx/sys/dev/firewire/sbp_targ.c user/adrian/if_ath_tx/sys/dev/hifn/hifn7751.c user/adrian/if_ath_tx/sys/dev/iicbus/ad7417.c user/adrian/if_ath_tx/sys/dev/iicbus/max6690.c user/adrian/if_ath_tx/sys/dev/iir/iir.c user/adrian/if_ath_tx/sys/dev/ipmi/ipmi.c user/adrian/if_ath_tx/sys/dev/iscsi/initiator/isc_subr.c user/adrian/if_ath_tx/sys/dev/iscsi/initiator/iscsi.c user/adrian/if_ath_tx/sys/dev/iscsi/initiator/iscsivar.h user/adrian/if_ath_tx/sys/dev/isp/isp_freebsd.c user/adrian/if_ath_tx/sys/dev/isp/isp_freebsd.h user/adrian/if_ath_tx/sys/dev/kbd/kbd.c user/adrian/if_ath_tx/sys/dev/malo/if_malo.c user/adrian/if_ath_tx/sys/dev/malo/if_malo_pci.c user/adrian/if_ath_tx/sys/dev/md/md.c user/adrian/if_ath_tx/sys/dev/mfi/mfi.c user/adrian/if_ath_tx/sys/dev/mmc/mmc.c user/adrian/if_ath_tx/sys/dev/mps/mps_sas.c user/adrian/if_ath_tx/sys/dev/mpt/mpt.c user/adrian/if_ath_tx/sys/dev/mvs/mvs.c user/adrian/if_ath_tx/sys/dev/mwl/if_mwl.c user/adrian/if_ath_tx/sys/dev/mwl/mwlhal.c user/adrian/if_ath_tx/sys/dev/nge/if_nge.c user/adrian/if_ath_tx/sys/dev/nge/if_ngereg.h user/adrian/if_ath_tx/sys/dev/nmdm/nmdm.c user/adrian/if_ath_tx/sys/dev/pccard/pccard.c user/adrian/if_ath_tx/sys/dev/pccbb/pccbb.c user/adrian/if_ath_tx/sys/dev/pccbb/pccbb_isa.c user/adrian/if_ath_tx/sys/dev/puc/puc.c user/adrian/if_ath_tx/sys/dev/quicc/quicc_core.c user/adrian/if_ath_tx/sys/dev/re/if_re.c user/adrian/if_ath_tx/sys/dev/rndtest/rndtest.c user/adrian/if_ath_tx/sys/dev/rt/if_rt.c user/adrian/if_ath_tx/sys/dev/safe/safe.c user/adrian/if_ath_tx/sys/dev/scc/scc_core.c user/adrian/if_ath_tx/sys/dev/sdhci/sdhci.c user/adrian/if_ath_tx/sys/dev/siis/siis.c user/adrian/if_ath_tx/sys/dev/sis/if_sis.c user/adrian/if_ath_tx/sys/dev/sis/if_sisreg.h user/adrian/if_ath_tx/sys/dev/smc/if_smc.c user/adrian/if_ath_tx/sys/dev/sound/midi/midi.c user/adrian/if_ath_tx/sys/dev/sound/pci/envy24.c user/adrian/if_ath_tx/sys/dev/sound/pci/envy24ht.c user/adrian/if_ath_tx/sys/dev/sound/pci/maestro.c user/adrian/if_ath_tx/sys/dev/sound/pci/spicds.c user/adrian/if_ath_tx/sys/dev/sound/pcm/ac97.c user/adrian/if_ath_tx/sys/dev/sound/pcm/feeder.c user/adrian/if_ath_tx/sys/dev/sound/pcm/mixer.c user/adrian/if_ath_tx/sys/dev/sound/usb/uaudio.c user/adrian/if_ath_tx/sys/dev/ste/if_ste.c user/adrian/if_ath_tx/sys/dev/ste/if_stereg.h user/adrian/if_ath_tx/sys/dev/stge/if_stge.c user/adrian/if_ath_tx/sys/dev/stge/if_stgereg.h user/adrian/if_ath_tx/sys/dev/syscons/syscons.c user/adrian/if_ath_tx/sys/dev/tdfx/tdfx_pci.c user/adrian/if_ath_tx/sys/dev/ti/if_ti.c user/adrian/if_ath_tx/sys/dev/ti/if_tireg.h user/adrian/if_ath_tx/sys/dev/tl/if_tl.c user/adrian/if_ath_tx/sys/dev/tl/if_tlreg.h user/adrian/if_ath_tx/sys/dev/twa/tw_osl_freebsd.c user/adrian/if_ath_tx/sys/dev/twe/twe_freebsd.c user/adrian/if_ath_tx/sys/dev/uart/uart_core.c user/adrian/if_ath_tx/sys/dev/uart/uart_dev_ns8250.c user/adrian/if_ath_tx/sys/dev/ubsec/ubsec.c user/adrian/if_ath_tx/sys/dev/usb/controller/at91dci.c user/adrian/if_ath_tx/sys/dev/usb/controller/atmegadci.c user/adrian/if_ath_tx/sys/dev/usb/controller/avr32dci.c user/adrian/if_ath_tx/sys/dev/usb/controller/ehci.c user/adrian/if_ath_tx/sys/dev/usb/controller/musb_otg.c user/adrian/if_ath_tx/sys/dev/usb/controller/ohci.c user/adrian/if_ath_tx/sys/dev/usb/controller/uhci.c user/adrian/if_ath_tx/sys/dev/usb/controller/usb_controller.c user/adrian/if_ath_tx/sys/dev/usb/controller/uss820dci.c user/adrian/if_ath_tx/sys/dev/usb/controller/xhci.c user/adrian/if_ath_tx/sys/dev/usb/input/atp.c user/adrian/if_ath_tx/sys/dev/usb/input/uep.c user/adrian/if_ath_tx/sys/dev/usb/input/uhid.c user/adrian/if_ath_tx/sys/dev/usb/input/ukbd.c user/adrian/if_ath_tx/sys/dev/usb/input/ums.c user/adrian/if_ath_tx/sys/dev/usb/misc/udbp.c user/adrian/if_ath_tx/sys/dev/usb/net/if_aue.c user/adrian/if_ath_tx/sys/dev/usb/net/if_axe.c user/adrian/if_ath_tx/sys/dev/usb/net/if_cdce.c user/adrian/if_ath_tx/sys/dev/usb/net/if_cue.c user/adrian/if_ath_tx/sys/dev/usb/net/if_ipheth.c user/adrian/if_ath_tx/sys/dev/usb/net/if_kue.c user/adrian/if_ath_tx/sys/dev/usb/net/if_mos.c user/adrian/if_ath_tx/sys/dev/usb/net/if_rue.c user/adrian/if_ath_tx/sys/dev/usb/net/if_udav.c user/adrian/if_ath_tx/sys/dev/usb/net/if_usie.c user/adrian/if_ath_tx/sys/dev/usb/net/uhso.c user/adrian/if_ath_tx/sys/dev/usb/net/usb_ethernet.c user/adrian/if_ath_tx/sys/dev/usb/serial/u3g.c user/adrian/if_ath_tx/sys/dev/usb/serial/ubsa.c user/adrian/if_ath_tx/sys/dev/usb/serial/ubser.c user/adrian/if_ath_tx/sys/dev/usb/serial/uchcom.c user/adrian/if_ath_tx/sys/dev/usb/serial/uftdi.c user/adrian/if_ath_tx/sys/dev/usb/serial/ulpt.c user/adrian/if_ath_tx/sys/dev/usb/serial/umcs.c user/adrian/if_ath_tx/sys/dev/usb/serial/umodem.c user/adrian/if_ath_tx/sys/dev/usb/serial/umoscom.c user/adrian/if_ath_tx/sys/dev/usb/serial/uplcom.c user/adrian/if_ath_tx/sys/dev/usb/serial/usb_serial.c user/adrian/if_ath_tx/sys/dev/usb/serial/uslcom.c user/adrian/if_ath_tx/sys/dev/usb/serial/uvisor.c user/adrian/if_ath_tx/sys/dev/usb/serial/uvscom.c user/adrian/if_ath_tx/sys/dev/usb/storage/umass.c user/adrian/if_ath_tx/sys/dev/usb/storage/urio.c user/adrian/if_ath_tx/sys/dev/usb/usb_dev.c user/adrian/if_ath_tx/sys/dev/usb/usb_device.c user/adrian/if_ath_tx/sys/dev/usb/usb_generic.c user/adrian/if_ath_tx/sys/dev/usb/usb_hub.c user/adrian/if_ath_tx/sys/dev/usb/usb_msctest.c user/adrian/if_ath_tx/sys/dev/usb/usb_process.c user/adrian/if_ath_tx/sys/dev/usb/wlan/if_rum.c user/adrian/if_ath_tx/sys/dev/usb/wlan/if_run.c user/adrian/if_ath_tx/sys/dev/usb/wlan/if_uath.c user/adrian/if_ath_tx/sys/dev/usb/wlan/if_upgt.c user/adrian/if_ath_tx/sys/dev/usb/wlan/if_ural.c user/adrian/if_ath_tx/sys/dev/usb/wlan/if_urtw.c user/adrian/if_ath_tx/sys/dev/usb/wlan/if_zyd.c user/adrian/if_ath_tx/sys/dev/wb/if_wb.c user/adrian/if_ath_tx/sys/dev/wb/if_wbreg.h user/adrian/if_ath_tx/sys/dev/wi/if_wi.c user/adrian/if_ath_tx/sys/dev/xe/if_xe.c user/adrian/if_ath_tx/sys/dev/xen/balloon/balloon.c user/adrian/if_ath_tx/sys/dev/xen/blkback/blkback.c user/adrian/if_ath_tx/sys/dev/xen/blkfront/blkfront.c user/adrian/if_ath_tx/sys/dev/xl/if_xl.c user/adrian/if_ath_tx/sys/dev/xl/if_xlreg.h user/adrian/if_ath_tx/sys/fs/devfs/devfs_vnops.c user/adrian/if_ath_tx/sys/fs/ext2fs/ext2_alloc.c user/adrian/if_ath_tx/sys/fs/ntfs/ntfs_subr.c user/adrian/if_ath_tx/sys/fs/nwfs/nwfs_mount.h user/adrian/if_ath_tx/sys/fs/procfs/procfs_status.c user/adrian/if_ath_tx/sys/fs/pseudofs/pseudofs_vncache.c user/adrian/if_ath_tx/sys/fs/smbfs/smbfs.h user/adrian/if_ath_tx/sys/fs/smbfs/smbfs_node.c user/adrian/if_ath_tx/sys/fs/tmpfs/tmpfs_vfsops.c user/adrian/if_ath_tx/sys/fs/tmpfs/tmpfs_vnops.c user/adrian/if_ath_tx/sys/fs/udf/udf_vnops.c user/adrian/if_ath_tx/sys/geom/cache/g_cache.c user/adrian/if_ath_tx/sys/geom/concat/g_concat.c user/adrian/if_ath_tx/sys/geom/concat/g_concat.h user/adrian/if_ath_tx/sys/geom/gate/g_gate.c user/adrian/if_ath_tx/sys/geom/geom_dev.c user/adrian/if_ath_tx/sys/geom/geom_disk.c user/adrian/if_ath_tx/sys/geom/geom_event.c user/adrian/if_ath_tx/sys/geom/geom_vfs.c user/adrian/if_ath_tx/sys/geom/journal/g_journal.c user/adrian/if_ath_tx/sys/geom/mirror/g_mirror.c user/adrian/if_ath_tx/sys/geom/mountver/g_mountver.c user/adrian/if_ath_tx/sys/geom/multipath/g_multipath.c user/adrian/if_ath_tx/sys/geom/nop/g_nop.c user/adrian/if_ath_tx/sys/geom/part/g_part.c user/adrian/if_ath_tx/sys/geom/raid/tr_raid1.c user/adrian/if_ath_tx/sys/geom/raid/tr_raid1e.c user/adrian/if_ath_tx/sys/geom/raid3/g_raid3.c user/adrian/if_ath_tx/sys/geom/sched/gs_rr.c user/adrian/if_ath_tx/sys/geom/shsec/g_shsec.c user/adrian/if_ath_tx/sys/geom/stripe/g_stripe.c user/adrian/if_ath_tx/sys/geom/uzip/g_uzip.c user/adrian/if_ath_tx/sys/geom/vinum/geom_vinum.c user/adrian/if_ath_tx/sys/geom/virstor/g_virstor.c user/adrian/if_ath_tx/sys/geom/zero/g_zero.c user/adrian/if_ath_tx/sys/gnu/fs/xfs/FreeBSD/support/debug.c user/adrian/if_ath_tx/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c user/adrian/if_ath_tx/sys/i386/conf/GENERIC user/adrian/if_ath_tx/sys/i386/i386/mp_machdep.c user/adrian/if_ath_tx/sys/i386/i386/pmap.c user/adrian/if_ath_tx/sys/i386/i386/trap.c user/adrian/if_ath_tx/sys/i386/include/segments.h user/adrian/if_ath_tx/sys/i386/include/trap.h user/adrian/if_ath_tx/sys/i386/xen/pmap.c user/adrian/if_ath_tx/sys/ia64/ia64/busdma_machdep.c user/adrian/if_ath_tx/sys/ia64/ia64/machdep.c user/adrian/if_ath_tx/sys/ia64/ia64/mca.c user/adrian/if_ath_tx/sys/ia64/ia64/pmap.c user/adrian/if_ath_tx/sys/ia64/ia64/sapic.c user/adrian/if_ath_tx/sys/ia64/ia64/sscdisk.c user/adrian/if_ath_tx/sys/ia64/ia64/unwind.c user/adrian/if_ath_tx/sys/kern/init_sysent.c user/adrian/if_ath_tx/sys/kern/kern_clock.c user/adrian/if_ath_tx/sys/kern/kern_cpu.c user/adrian/if_ath_tx/sys/kern/kern_descrip.c user/adrian/if_ath_tx/sys/kern/kern_dtrace.c user/adrian/if_ath_tx/sys/kern/kern_et.c user/adrian/if_ath_tx/sys/kern/kern_fail.c user/adrian/if_ath_tx/sys/kern/kern_jail.c user/adrian/if_ath_tx/sys/kern/kern_ktr.c user/adrian/if_ath_tx/sys/kern/kern_linker.c user/adrian/if_ath_tx/sys/kern/kern_lock.c user/adrian/if_ath_tx/sys/kern/kern_lockf.c user/adrian/if_ath_tx/sys/kern/kern_malloc.c user/adrian/if_ath_tx/sys/kern/kern_poll.c user/adrian/if_ath_tx/sys/kern/kern_proc.c user/adrian/if_ath_tx/sys/kern/kern_rctl.c user/adrian/if_ath_tx/sys/kern/kern_resource.c user/adrian/if_ath_tx/sys/kern/kern_rwlock.c user/adrian/if_ath_tx/sys/kern/kern_shutdown.c user/adrian/if_ath_tx/sys/kern/kern_sig.c user/adrian/if_ath_tx/sys/kern/kern_sx.c user/adrian/if_ath_tx/sys/kern/kern_tc.c user/adrian/if_ath_tx/sys/kern/kern_thr.c user/adrian/if_ath_tx/sys/kern/kern_timeout.c user/adrian/if_ath_tx/sys/kern/kern_umtx.c user/adrian/if_ath_tx/sys/kern/sched_4bsd.c user/adrian/if_ath_tx/sys/kern/subr_devstat.c user/adrian/if_ath_tx/sys/kern/subr_kdb.c user/adrian/if_ath_tx/sys/kern/subr_lock.c user/adrian/if_ath_tx/sys/kern/subr_pcpu.c user/adrian/if_ath_tx/sys/kern/subr_prof.c user/adrian/if_ath_tx/sys/kern/subr_rman.c user/adrian/if_ath_tx/sys/kern/subr_sleepqueue.c user/adrian/if_ath_tx/sys/kern/subr_smp.c user/adrian/if_ath_tx/sys/kern/subr_syscall.c user/adrian/if_ath_tx/sys/kern/subr_turnstile.c user/adrian/if_ath_tx/sys/kern/subr_witness.c user/adrian/if_ath_tx/sys/kern/syscalls.c user/adrian/if_ath_tx/sys/kern/syscalls.master user/adrian/if_ath_tx/sys/kern/systrace_args.c user/adrian/if_ath_tx/sys/kern/uipc_mqueue.c user/adrian/if_ath_tx/sys/kern/uipc_usrreq.c user/adrian/if_ath_tx/sys/kern/vfs_cache.c user/adrian/if_ath_tx/sys/kern/vfs_default.c user/adrian/if_ath_tx/sys/kern/vfs_mount.c user/adrian/if_ath_tx/sys/kern/vfs_subr.c user/adrian/if_ath_tx/sys/kern/vfs_syscalls.c user/adrian/if_ath_tx/sys/kern/vfs_vnops.c user/adrian/if_ath_tx/sys/kern/vnode_if.src user/adrian/if_ath_tx/sys/libkern/iconv.c user/adrian/if_ath_tx/sys/mips/cavium/usb/octusb.c user/adrian/if_ath_tx/sys/mips/mips/busdma_machdep.c user/adrian/if_ath_tx/sys/mips/mips/pmap.c user/adrian/if_ath_tx/sys/modules/Makefile user/adrian/if_ath_tx/sys/modules/esp/Makefile user/adrian/if_ath_tx/sys/modules/ipfw/Makefile user/adrian/if_ath_tx/sys/modules/mii/Makefile user/adrian/if_ath_tx/sys/net/bpf.c user/adrian/if_ath_tx/sys/net/flowtable.c user/adrian/if_ath_tx/sys/net/if.c user/adrian/if_ath_tx/sys/net/if_arcsubr.c user/adrian/if_ath_tx/sys/net/if_atmsubr.c user/adrian/if_ath_tx/sys/net/if_bridge.c user/adrian/if_ath_tx/sys/net/if_enc.c user/adrian/if_ath_tx/sys/net/if_epair.c user/adrian/if_ath_tx/sys/net/if_ethersubr.c user/adrian/if_ath_tx/sys/net/if_fwsubr.c user/adrian/if_ath_tx/sys/net/if_gif.c user/adrian/if_ath_tx/sys/net/if_gre.c user/adrian/if_ath_tx/sys/net/if_iso88025subr.c user/adrian/if_ath_tx/sys/net/if_lagg.c user/adrian/if_ath_tx/sys/net/if_mib.c user/adrian/if_ath_tx/sys/net/if_spppsubr.c user/adrian/if_ath_tx/sys/net/if_stf.c user/adrian/if_ath_tx/sys/net/if_tap.c user/adrian/if_ath_tx/sys/net/if_tun.c user/adrian/if_ath_tx/sys/net/if_vlan.c user/adrian/if_ath_tx/sys/net/netisr.c user/adrian/if_ath_tx/sys/net/raw_cb.c user/adrian/if_ath_tx/sys/net/rtsock.c user/adrian/if_ath_tx/sys/net/vnet.c user/adrian/if_ath_tx/sys/net80211/ieee80211_acl.c user/adrian/if_ath_tx/sys/net80211/ieee80211_dfs.c user/adrian/if_ath_tx/sys/net80211/ieee80211_freebsd.c user/adrian/if_ath_tx/sys/net80211/ieee80211_hwmp.c user/adrian/if_ath_tx/sys/net80211/ieee80211_mesh.c user/adrian/if_ath_tx/sys/net80211/ieee80211_power.c user/adrian/if_ath_tx/sys/netgraph/atm/ng_atm.c user/adrian/if_ath_tx/sys/netgraph/atm/ngatmbase.c user/adrian/if_ath_tx/sys/netgraph/atm/uni/ng_uni.c user/adrian/if_ath_tx/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c user/adrian/if_ath_tx/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c user/adrian/if_ath_tx/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c user/adrian/if_ath_tx/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c user/adrian/if_ath_tx/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c user/adrian/if_ath_tx/sys/netgraph/netgraph.h user/adrian/if_ath_tx/sys/netgraph/ng_async.c user/adrian/if_ath_tx/sys/netgraph/ng_atmllc.c user/adrian/if_ath_tx/sys/netgraph/ng_base.c user/adrian/if_ath_tx/sys/netgraph/ng_bpf.c user/adrian/if_ath_tx/sys/netgraph/ng_bridge.c user/adrian/if_ath_tx/sys/netgraph/ng_cisco.c user/adrian/if_ath_tx/sys/netgraph/ng_deflate.c user/adrian/if_ath_tx/sys/netgraph/ng_gif_demux.c user/adrian/if_ath_tx/sys/netgraph/ng_hub.c user/adrian/if_ath_tx/sys/netgraph/ng_iface.c user/adrian/if_ath_tx/sys/netgraph/ng_ksocket.c user/adrian/if_ath_tx/sys/netgraph/ng_l2tp.c user/adrian/if_ath_tx/sys/netgraph/ng_mppc.c user/adrian/if_ath_tx/sys/netgraph/ng_parse.c user/adrian/if_ath_tx/sys/netgraph/ng_ppp.c user/adrian/if_ath_tx/sys/netgraph/ng_pppoe.c user/adrian/if_ath_tx/sys/netgraph/ng_pred1.c user/adrian/if_ath_tx/sys/netgraph/ng_sample.c user/adrian/if_ath_tx/sys/netgraph/ng_socket.c user/adrian/if_ath_tx/sys/netgraph/ng_sppp.c user/adrian/if_ath_tx/sys/netgraph/ng_tag.c user/adrian/if_ath_tx/sys/netinet/accf_http.c user/adrian/if_ath_tx/sys/netinet/if_ether.c user/adrian/if_ath_tx/sys/netinet/igmp.c user/adrian/if_ath_tx/sys/netinet/in_mcast.c user/adrian/if_ath_tx/sys/netinet/in_pcb.c user/adrian/if_ath_tx/sys/netinet/in_pcb.h user/adrian/if_ath_tx/sys/netinet/ip_divert.c user/adrian/if_ath_tx/sys/netinet/ip_mroute.c user/adrian/if_ath_tx/sys/netinet/ip_output.c user/adrian/if_ath_tx/sys/netinet/ipfw/dn_heap.c user/adrian/if_ath_tx/sys/netinet/ipfw/ip_dn_io.c user/adrian/if_ath_tx/sys/netinet/ipfw/ip_fw2.c user/adrian/if_ath_tx/sys/netinet/ipfw/ip_fw_dynamic.c user/adrian/if_ath_tx/sys/netinet/ipfw/ip_fw_log.c user/adrian/if_ath_tx/sys/netinet/ipfw/ip_fw_pfil.c user/adrian/if_ath_tx/sys/netinet/ipfw/ip_fw_sockopt.c user/adrian/if_ath_tx/sys/netinet/ipfw/ip_fw_table.c user/adrian/if_ath_tx/sys/netinet/libalias/alias_sctp.c user/adrian/if_ath_tx/sys/netinet/sctp_output.c user/adrian/if_ath_tx/sys/netinet/sctp_pcb.c user/adrian/if_ath_tx/sys/netinet/tcp_hostcache.c user/adrian/if_ath_tx/sys/netinet/tcp_input.c user/adrian/if_ath_tx/sys/netinet/tcp_output.c user/adrian/if_ath_tx/sys/netinet/tcp_reass.c user/adrian/if_ath_tx/sys/netinet/tcp_syncache.c user/adrian/if_ath_tx/sys/netinet6/icmp6.c user/adrian/if_ath_tx/sys/netinet6/in6_mcast.c user/adrian/if_ath_tx/sys/netinet6/in6_pcb.c user/adrian/if_ath_tx/sys/netinet6/in6_src.c user/adrian/if_ath_tx/sys/netinet6/ip6_mroute.c user/adrian/if_ath_tx/sys/netinet6/ip6_output.c user/adrian/if_ath_tx/sys/netinet6/mld6.c user/adrian/if_ath_tx/sys/netinet6/send.c user/adrian/if_ath_tx/sys/netipx/ipx_proto.c user/adrian/if_ath_tx/sys/netipx/spx_reass.c user/adrian/if_ath_tx/sys/netsmb/smb_conn.c user/adrian/if_ath_tx/sys/netsmb/smb_rq.c user/adrian/if_ath_tx/sys/netsmb/smb_subr.c user/adrian/if_ath_tx/sys/nfs/nfs_lock.c user/adrian/if_ath_tx/sys/nlm/nlm_prot_impl.c user/adrian/if_ath_tx/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c user/adrian/if_ath_tx/sys/ofed/include/linux/linux_idr.c user/adrian/if_ath_tx/sys/ofed/include/linux/linux_radix.c user/adrian/if_ath_tx/sys/pc98/conf/GENERIC user/adrian/if_ath_tx/sys/pci/if_rl.c user/adrian/if_ath_tx/sys/pci/if_rlreg.h user/adrian/if_ath_tx/sys/powerpc/fpu/fpu_emu.c user/adrian/if_ath_tx/sys/powerpc/ofw/ofw_real.c user/adrian/if_ath_tx/sys/powerpc/ofw/ofw_syscons.c user/adrian/if_ath_tx/sys/powerpc/ofw/rtas.c user/adrian/if_ath_tx/sys/powerpc/powermac/dbdma.c user/adrian/if_ath_tx/sys/powerpc/powermac/fcu.c user/adrian/if_ath_tx/sys/powerpc/powermac/powermac_thermal.c user/adrian/if_ath_tx/sys/powerpc/powermac/smu.c user/adrian/if_ath_tx/sys/powerpc/powermac/smusat.c user/adrian/if_ath_tx/sys/powerpc/powerpc/busdma_machdep.c user/adrian/if_ath_tx/sys/powerpc/powerpc/intr_machdep.c user/adrian/if_ath_tx/sys/powerpc/ps3/ps3disk.c user/adrian/if_ath_tx/sys/rpc/clnt_dg.c user/adrian/if_ath_tx/sys/security/audit/audit.c user/adrian/if_ath_tx/sys/security/mac_biba/mac_biba.c user/adrian/if_ath_tx/sys/security/mac_bsdextended/mac_bsdextended.c user/adrian/if_ath_tx/sys/security/mac_ifoff/mac_ifoff.c user/adrian/if_ath_tx/sys/security/mac_lomac/mac_lomac.c user/adrian/if_ath_tx/sys/security/mac_mls/mac_mls.c user/adrian/if_ath_tx/sys/security/mac_partition/mac_partition.c user/adrian/if_ath_tx/sys/security/mac_portacl/mac_portacl.c user/adrian/if_ath_tx/sys/security/mac_seeotheruids/mac_seeotheruids.c user/adrian/if_ath_tx/sys/security/mac_stub/mac_stub.c user/adrian/if_ath_tx/sys/security/mac_test/mac_test.c user/adrian/if_ath_tx/sys/sparc64/conf/GENERIC user/adrian/if_ath_tx/sys/sparc64/sbus/dma_sbus.c user/adrian/if_ath_tx/sys/sparc64/sbus/lsi64854.c user/adrian/if_ath_tx/sys/sparc64/sbus/lsi64854var.h user/adrian/if_ath_tx/sys/sparc64/sparc64/identcpu.c user/adrian/if_ath_tx/sys/sparc64/sparc64/iommu.c user/adrian/if_ath_tx/sys/sparc64/sparc64/tick.c user/adrian/if_ath_tx/sys/sys/cdefs.h user/adrian/if_ath_tx/sys/sys/event.h user/adrian/if_ath_tx/sys/sys/fcntl.h user/adrian/if_ath_tx/sys/sys/file.h user/adrian/if_ath_tx/sys/sys/param.h user/adrian/if_ath_tx/sys/sys/sdt.h user/adrian/if_ath_tx/sys/sys/syscall.h user/adrian/if_ath_tx/sys/sys/syscall.mk user/adrian/if_ath_tx/sys/sys/sysproto.h user/adrian/if_ath_tx/sys/sys/user.h user/adrian/if_ath_tx/sys/sys/vnode.h user/adrian/if_ath_tx/sys/ufs/ffs/ffs_softdep.c user/adrian/if_ath_tx/sys/ufs/ufs/extattr.h user/adrian/if_ath_tx/sys/ufs/ufs/ufs_vnops.c user/adrian/if_ath_tx/sys/vm/memguard.c user/adrian/if_ath_tx/sys/vm/redzone.c user/adrian/if_ath_tx/sys/vm/vm_contig.c user/adrian/if_ath_tx/sys/vm/vm_extern.h user/adrian/if_ath_tx/sys/vm/vm_object.c user/adrian/if_ath_tx/sys/vm/vm_object.h user/adrian/if_ath_tx/sys/vm/vm_page.c user/adrian/if_ath_tx/sys/vm/vm_page.h user/adrian/if_ath_tx/sys/vm/vm_phys.c user/adrian/if_ath_tx/sys/vm/vm_phys.h user/adrian/if_ath_tx/sys/vm/vm_reserv.c user/adrian/if_ath_tx/sys/vm/vm_reserv.h user/adrian/if_ath_tx/sys/vm/vnode_pager.c user/adrian/if_ath_tx/sys/x86/acpica/acpi_apm.c user/adrian/if_ath_tx/sys/x86/acpica/madt.c user/adrian/if_ath_tx/sys/x86/bios/vpd.c user/adrian/if_ath_tx/sys/x86/x86/busdma_machdep.c user/adrian/if_ath_tx/sys/x86/x86/io_apic.c user/adrian/if_ath_tx/sys/x86/x86/mca.c user/adrian/if_ath_tx/tools/regression/fifo/fifo_misc/fifo_misc.c user/adrian/if_ath_tx/usr.bin/at/at.c user/adrian/if_ath_tx/usr.bin/at/parsetime.c user/adrian/if_ath_tx/usr.bin/banner/banner.c user/adrian/if_ath_tx/usr.bin/c99/c99.c user/adrian/if_ath_tx/usr.bin/calendar/calendars/calendar.birthday user/adrian/if_ath_tx/usr.bin/calendar/calendars/calendar.freebsd user/adrian/if_ath_tx/usr.bin/cap_mkdb/cap_mkdb.c user/adrian/if_ath_tx/usr.bin/catman/catman.c user/adrian/if_ath_tx/usr.bin/checknr/checknr.c user/adrian/if_ath_tx/usr.bin/chpass/chpass.h user/adrian/if_ath_tx/usr.bin/chpass/table.c user/adrian/if_ath_tx/usr.bin/cmp/extern.h user/adrian/if_ath_tx/usr.bin/col/col.c user/adrian/if_ath_tx/usr.bin/colcrt/colcrt.c user/adrian/if_ath_tx/usr.bin/column/column.c user/adrian/if_ath_tx/usr.bin/comm/comm.c user/adrian/if_ath_tx/usr.bin/compress/compress.c user/adrian/if_ath_tx/usr.bin/cpuset/cpuset.c user/adrian/if_ath_tx/usr.bin/csplit/csplit.c user/adrian/if_ath_tx/usr.bin/cut/cut.c user/adrian/if_ath_tx/usr.bin/dc/Makefile user/adrian/if_ath_tx/usr.bin/dc/dc.c user/adrian/if_ath_tx/usr.bin/du/du.c user/adrian/if_ath_tx/usr.bin/enigma/enigma.c user/adrian/if_ath_tx/usr.bin/expand/expand.c user/adrian/if_ath_tx/usr.bin/fold/fold.c user/adrian/if_ath_tx/usr.bin/fstat/fstat.c user/adrian/if_ath_tx/usr.bin/fstat/fuser.c user/adrian/if_ath_tx/usr.bin/id/id.c user/adrian/if_ath_tx/usr.bin/join/join.c user/adrian/if_ath_tx/usr.bin/lam/lam.c user/adrian/if_ath_tx/usr.bin/last/last.c user/adrian/if_ath_tx/usr.bin/lock/lock.c user/adrian/if_ath_tx/usr.bin/logger/logger.c user/adrian/if_ath_tx/usr.bin/look/look.c user/adrian/if_ath_tx/usr.bin/m4/gnum4.c user/adrian/if_ath_tx/usr.bin/m4/main.c user/adrian/if_ath_tx/usr.bin/make/globals.h user/adrian/if_ath_tx/usr.bin/make/make.1 user/adrian/if_ath_tx/usr.bin/ministat/ministat.c user/adrian/if_ath_tx/usr.bin/mt/mt.c user/adrian/if_ath_tx/usr.bin/paste/paste.c user/adrian/if_ath_tx/usr.bin/pr/extern.h user/adrian/if_ath_tx/usr.bin/pr/pr.c user/adrian/if_ath_tx/usr.bin/procstat/procstat.1 user/adrian/if_ath_tx/usr.bin/procstat/procstat_vm.c user/adrian/if_ath_tx/usr.bin/quota/quota.c user/adrian/if_ath_tx/usr.bin/rs/rs.c user/adrian/if_ath_tx/usr.bin/ruptime/ruptime.c user/adrian/if_ath_tx/usr.bin/rusers/rusers.c user/adrian/if_ath_tx/usr.bin/rwall/rwall.c user/adrian/if_ath_tx/usr.bin/rwho/rwho.c user/adrian/if_ath_tx/usr.bin/seq/seq.c user/adrian/if_ath_tx/usr.bin/split/split.c user/adrian/if_ath_tx/usr.bin/tail/forward.c user/adrian/if_ath_tx/usr.bin/tail/tail.c user/adrian/if_ath_tx/usr.bin/talk/ctl.c user/adrian/if_ath_tx/usr.bin/talk/init_disp.c user/adrian/if_ath_tx/usr.bin/talk/invite.c user/adrian/if_ath_tx/usr.bin/talk/talk.h user/adrian/if_ath_tx/usr.bin/tcopy/tcopy.c user/adrian/if_ath_tx/usr.bin/tee/tee.c user/adrian/if_ath_tx/usr.bin/tr/tr.c user/adrian/if_ath_tx/usr.bin/tsort/tsort.c user/adrian/if_ath_tx/usr.bin/ul/ul.c user/adrian/if_ath_tx/usr.bin/uname/uname.c user/adrian/if_ath_tx/usr.bin/unexpand/unexpand.c user/adrian/if_ath_tx/usr.bin/unifdef/unifdef.c user/adrian/if_ath_tx/usr.bin/uniq/uniq.c user/adrian/if_ath_tx/usr.bin/units/units.c user/adrian/if_ath_tx/usr.bin/usbhidaction/usbhidaction.c user/adrian/if_ath_tx/usr.bin/usbhidctl/usbhid.c user/adrian/if_ath_tx/usr.bin/uuencode/uuencode.c user/adrian/if_ath_tx/usr.bin/vis/vis.c user/adrian/if_ath_tx/usr.bin/w/w.c user/adrian/if_ath_tx/usr.bin/wall/wall.c user/adrian/if_ath_tx/usr.bin/wc/wc.c user/adrian/if_ath_tx/usr.bin/whereis/whereis.c user/adrian/if_ath_tx/usr.bin/which/which.c user/adrian/if_ath_tx/usr.bin/whois/whois.c user/adrian/if_ath_tx/usr.bin/xinstall/xinstall.c user/adrian/if_ath_tx/usr.bin/xlint/xlint/xlint.c user/adrian/if_ath_tx/usr.bin/xstr/xstr.c user/adrian/if_ath_tx/usr.sbin/apm/apm.c user/adrian/if_ath_tx/usr.sbin/boot0cfg/boot0cfg.8 user/adrian/if_ath_tx/usr.sbin/boot0cfg/boot0cfg.c user/adrian/if_ath_tx/usr.sbin/cdcontrol/cdcontrol.c user/adrian/if_ath_tx/usr.sbin/chown/chown.c user/adrian/if_ath_tx/usr.sbin/chroot/chroot.c user/adrian/if_ath_tx/usr.sbin/devinfo/devinfo.c user/adrian/if_ath_tx/usr.sbin/fdread/fdread.c user/adrian/if_ath_tx/usr.sbin/memcontrol/memcontrol.c user/adrian/if_ath_tx/usr.sbin/mergemaster/mergemaster.8 user/adrian/if_ath_tx/usr.sbin/mergemaster/mergemaster.sh user/adrian/if_ath_tx/usr.sbin/mixer/mixer.c user/adrian/if_ath_tx/usr.sbin/moused/moused.c user/adrian/if_ath_tx/usr.sbin/mptable/mptable.c user/adrian/if_ath_tx/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh user/adrian/if_ath_tx/usr.sbin/pc-sysinstall/backend/functions-disk.sh user/adrian/if_ath_tx/usr.sbin/pc-sysinstall/backend/functions-networking.sh user/adrian/if_ath_tx/usr.sbin/pc-sysinstall/backend/functions-unmount.sh user/adrian/if_ath_tx/usr.sbin/pmcstat/pmcstat.c user/adrian/if_ath_tx/usr.sbin/pwd_mkdb/pwd_mkdb.c user/adrian/if_ath_tx/usr.sbin/rip6query/rip6query.c user/adrian/if_ath_tx/usr.sbin/rmt/rmt.c user/adrian/if_ath_tx/usr.sbin/snapinfo/snapinfo.c user/adrian/if_ath_tx/usr.sbin/spray/spray.c user/adrian/if_ath_tx/usr.sbin/timed/timed/readmsg.c user/adrian/if_ath_tx/usr.sbin/timed/timed/timed.c user/adrian/if_ath_tx/usr.sbin/tzsetup/tzsetup.c Directory Properties: user/adrian/if_ath_tx/ (props changed) user/adrian/if_ath_tx/cddl/contrib/opensolaris/ (props changed) user/adrian/if_ath_tx/contrib/com_err/ (props changed) user/adrian/if_ath_tx/contrib/compiler-rt/ (props changed) user/adrian/if_ath_tx/contrib/ee/ (props changed) user/adrian/if_ath_tx/contrib/expat/ (props changed) user/adrian/if_ath_tx/contrib/file/ (props changed) user/adrian/if_ath_tx/contrib/gdb/ (props changed) user/adrian/if_ath_tx/contrib/gnu-sort/ (props changed) user/adrian/if_ath_tx/contrib/groff/ (props changed) user/adrian/if_ath_tx/contrib/less/ (props changed) user/adrian/if_ath_tx/contrib/libpcap/ (props changed) user/adrian/if_ath_tx/contrib/ncurses/ (props changed) user/adrian/if_ath_tx/contrib/one-true-awk/ (props changed) user/adrian/if_ath_tx/contrib/openbsm/ (props changed) user/adrian/if_ath_tx/contrib/openpam/ (props changed) user/adrian/if_ath_tx/contrib/openresolv/ (props changed) user/adrian/if_ath_tx/contrib/pf/ (props changed) user/adrian/if_ath_tx/contrib/tcpdump/ (props changed) user/adrian/if_ath_tx/contrib/tcsh/ (props changed) user/adrian/if_ath_tx/contrib/tnftp/ (props changed) user/adrian/if_ath_tx/contrib/tzcode/stdtime/ (props changed) user/adrian/if_ath_tx/contrib/tzcode/zic/ (props changed) user/adrian/if_ath_tx/contrib/tzdata/ (props changed) user/adrian/if_ath_tx/contrib/wpa/ (props changed) user/adrian/if_ath_tx/crypto/heimdal/ (props changed) user/adrian/if_ath_tx/lib/libutil/ (props changed) user/adrian/if_ath_tx/lib/libz/ (props changed) user/adrian/if_ath_tx/sbin/ (props changed) user/adrian/if_ath_tx/sbin/ipfw/ (props changed) user/adrian/if_ath_tx/share/mk/bsd.arch.inc.mk (props changed) user/adrian/if_ath_tx/sys/contrib/dev/acpica/ (props changed) user/adrian/if_ath_tx/usr.bin/csup/ (props changed) user/adrian/if_ath_tx/usr.bin/procstat/ (props changed) user/adrian/if_ath_tx/usr.sbin/rtadvctl/ (props changed) user/adrian/if_ath_tx/usr.sbin/rtadvd/ (props changed) user/adrian/if_ath_tx/usr.sbin/rtsold/ (props changed) Modified: user/adrian/if_ath_tx/Makefile.inc1 ============================================================================== --- user/adrian/if_ath_tx/Makefile.inc1 Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/Makefile.inc1 Tue Nov 8 02:53:11 2011 (r227329) @@ -313,7 +313,8 @@ LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTR LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \ - -DWITHOUT_HTML -DNO_CTF -DNO_LINT DESTDIR=${LIB32TMP} + -DWITHOUT_HTML -DNO_CTF -DNO_LINT -ECC -ECXX -EAS -ELD \ + DESTDIR=${LIB32TMP} LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS .endif Modified: user/adrian/if_ath_tx/ObsoleteFiles.inc ============================================================================== --- user/adrian/if_ath_tx/ObsoleteFiles.inc Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/ObsoleteFiles.inc Tue Nov 8 02:53:11 2011 (r227329) @@ -44,10 +44,12 @@ OLD_FILES+=usr/share/man/man8/sysinstall OLD_FILES+=usr/lib/libftpio.a OLD_FILES+=usr/lib/libftpio.so OLD_LIBS+=usr/lib/libftpio.so.8 +OLD_FILES+=usr/lib/libftpio_p.a .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/libftpio.a OLD_FILES+=usr/lib32/libftpio.so OLD_LIBS+=usr/lib32/libftpio.so.8 +OLD_FILES+=usr/lib32/libftpio_p.a .endif OLD_FILES+=usr/include/ftpio.h OLD_FILES+=usr/share/man/man3/ftpio.3.gz @@ -77,11 +79,22 @@ OLD_LIBS+=usr/lib32/libopie.so.6 OLD_LIBS+=usr/lib32/librtld_db.so.1 OLD_LIBS+=usr/lib32/libtacplus.so.4 .endif +# 20110817: no more acd.4, ad.4, afd.4 and ast.4 +OLD_FILES+=usr/share/man/man4/acd.4.gz +OLD_FILES+=usr/share/man/man4/ad.4.gz +OLD_FILES+=usr/share/man/man4/afd.4.gz +OLD_FILES+=usr/share/man/man4/ast.4.gz # 20110718: no longer useful in the age of rc.d OLD_FILES+=usr/sbin/named.reconfig OLD_FILES+=usr/sbin/named.reload +OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz +OLD_FILES+=usr/share/man/man8/named.reload.8.gz # 20110716: bind 9.8.0 import OLD_LIBS+=usr/lib/liblwres.so.50 +OLD_FILES+=usr/share/doc/bind9/KNOWN-DEFECTS +OLD_FILES+=usr/share/doc/bind9/NSEC3-NOTES +OLD_FILES+=usr/share/doc/bind9/README.idnkit +OLD_FILES+=usr/share/doc/bind9/README.pkcs11 # 20110709: vm_map_clean.9 -> vm_map_sync.9 OLD_FILES+=usr/share/man/man9/vm_map_clean.9.gz # 20110709: Catch up with removal of these functions. Modified: user/adrian/if_ath_tx/UPDATING ============================================================================== --- user/adrian/if_ath_tx/UPDATING Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/UPDATING Tue Nov 8 02:53:11 2011 (r227329) @@ -22,6 +22,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20111101: + The broken amd(4) driver has been replaced with esp(4) in the amd64, + i386 and pc98 GENERIC kernel configuration files. + 20110930: sysinstall has been removed Modified: user/adrian/if_ath_tx/bin/cat/cat.c ============================================================================== --- user/adrian/if_ath_tx/bin/cat/cat.c Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/bin/cat/cat.c Tue Nov 8 02:53:11 2011 (r227329) @@ -64,9 +64,9 @@ __FBSDID("$FreeBSD$"); #include #include -int bflag, eflag, nflag, sflag, tflag, vflag; -int rval; -const char *filename; +static int bflag, eflag, nflag, sflag, tflag, vflag; +static int rval; +static const char *filename; static void usage(void); static void scanfiles(char *argv[], int cooked); Modified: user/adrian/if_ath_tx/bin/ln/ln.c ============================================================================== --- user/adrian/if_ath_tx/bin/ln/ln.c Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/bin/ln/ln.c Tue Nov 8 02:53:11 2011 (r227329) @@ -54,16 +54,16 @@ __FBSDID("$FreeBSD$"); #include #include -int fflag; /* Unlink existing files. */ -int Fflag; /* Remove empty directories also. */ -int hflag; /* Check new name for symlink first. */ -int iflag; /* Interactive mode. */ -int Pflag; /* Create hard links to symlinks. */ -int sflag; /* Symbolic, not hard, link. */ -int vflag; /* Verbose output. */ -int wflag; /* Warn if symlink target does not +static int fflag; /* Unlink existing files. */ +static int Fflag; /* Remove empty directories also. */ +static int hflag; /* Check new name for symlink first. */ +static int iflag; /* Interactive mode. */ +static int Pflag; /* Create hard links to symlinks. */ +static int sflag; /* Symbolic, not hard, link. */ +static int vflag; /* Verbose output. */ +static int wflag; /* Warn if symlink target does not * exist, and -f is not enabled. */ -char linkch; +static char linkch; int linkit(const char *, const char *, int); void usage(void); Modified: user/adrian/if_ath_tx/bin/mkdir/mkdir.c ============================================================================== --- user/adrian/if_ath_tx/bin/mkdir/mkdir.c Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/bin/mkdir/mkdir.c Tue Nov 8 02:53:11 2011 (r227329) @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); static int build(char *, mode_t); static void usage(void); -int vflag; +static int vflag; int main(int argc, char *argv[]) Modified: user/adrian/if_ath_tx/bin/mv/mv.c ============================================================================== --- user/adrian/if_ath_tx/bin/mv/mv.c Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/bin/mv/mv.c Tue Nov 8 02:53:11 2011 (r227329) @@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$"); /* Exit code for a failed exec. */ #define EXEC_FAILED 127 -int fflg, iflg, nflg, vflg; +static int fflg, iflg, nflg, vflg; static int copy(const char *, const char *); static int do_move(const char *, const char *); Modified: user/adrian/if_ath_tx/bin/ps/print.c ============================================================================== --- user/adrian/if_ath_tx/bin/ps/print.c Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/bin/ps/print.c Tue Nov 8 02:53:11 2011 (r227329) @@ -362,7 +362,7 @@ tdev(KINFO *k, VARENT *ve) v = ve->var; dev = k->ki_p->ki_tdev; if (dev == NODEV) - str = strdup("??"); + str = strdup("-"); else asprintf(&str, "%#jx", (uintmax_t)dev); @@ -379,7 +379,7 @@ tname(KINFO *k, VARENT *ve) v = ve->var; dev = k->ki_p->ki_tdev; if (dev == NODEV || (ttname = devname(dev, S_IFCHR)) == NULL) - str = strdup("?? "); + str = strdup("- "); else { if (strncmp(ttname, "tty", 3) == 0 || strncmp(ttname, "cua", 3) == 0) @@ -403,7 +403,7 @@ longtname(KINFO *k, VARENT *ve) v = ve->var; dev = k->ki_p->ki_tdev; if (dev == NODEV || (ttname = devname(dev, S_IFCHR)) == NULL) - ttname = "??"; + ttname = "-"; return (strdup(ttname)); } Modified: user/adrian/if_ath_tx/bin/ps/ps.1 ============================================================================== --- user/adrian/if_ath_tx/bin/ps/ps.1 Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/bin/ps/ps.1 Tue Nov 8 02:53:11 2011 (r227329) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd October 1, 2011 +.Dd October 30, 2011 .Dt PS 1 .Os .Sh NAME @@ -437,6 +437,10 @@ This is followed by a .Ql - if the process can no longer reach that controlling terminal (i.e., it has been revoked). +A +.Ql - +without a preceding two letter abbreviation or pseudo-terminal device number +indicates a process which never had a controlling terminal. The full pathname of the controlling terminal is available via the .Cm tty keyword. Modified: user/adrian/if_ath_tx/bin/rm/rm.c ============================================================================== --- user/adrian/if_ath_tx/bin/rm/rm.c Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/bin/rm/rm.c Tue Nov 8 02:53:11 2011 (r227329) @@ -57,10 +57,10 @@ __FBSDID("$FreeBSD$"); #include #include -int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok; -int rflag, Iflag; -uid_t uid; -volatile sig_atomic_t info; +static int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok; +static int rflag, Iflag; +static uid_t uid; +static volatile sig_atomic_t info; int check(char *, char *, struct stat *); int check2(char **); Modified: user/adrian/if_ath_tx/bin/sh/sh.1 ============================================================================== --- user/adrian/if_ath_tx/bin/sh/sh.1 Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/bin/sh/sh.1 Tue Nov 8 02:53:11 2011 (r227329) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd July 10, 2011 +.Dd November 5, 2011 .Dt SH 1 .Os .Sh NAME @@ -1160,6 +1160,11 @@ of alphabetics, numerics, and underscore The first letter of a variable name must not be numeric. A parameter can also be denoted by a number or a special character as explained below. +.Pp +Assignments are expanded differently from other words: +tilde expansion is also performed after the equals sign and after any colon +and usernames are also terminated by colons, +and field splitting and pathname expansion are not performed. .Ss Positional Parameters A positional parameter is a parameter denoted by a number greater than zero. The shell sets these initially to the values of its command line @@ -1273,11 +1278,15 @@ used in tilde expansion and as a default built-in. .It Va IFS Input Field Separators. -This is normally set to +The default value is .Aq space , .Aq tab , and -.Aq newline . +.Aq newline +in that order. +This default also applies if +.Va IFS +is unset, but not if it is set to the empty string. See the .Sx White Space Splitting section for more details. @@ -1423,12 +1432,12 @@ part of the name. If a parameter expansion occurs inside double-quotes: .Bl -enum .It -Pathname expansion is not performed on the results of the -expansion. -.It Field splitting is not performed on the results of the expansion, with the exception of the special parameter .Va @ . +.It +Pathname expansion is not performed on the results of the +expansion. .El .Pp In addition, a parameter expansion can be modified by using one of the @@ -1641,16 +1650,51 @@ and contain integer constants. .Pp The result of the expression is substituted in decimal. .Ss White Space Splitting (Field Splitting) -After parameter expansion, command substitution, and +In certain contexts, +after parameter expansion, command substitution, and arithmetic expansion the shell scans the results of expansions and substitutions that did not occur in double-quotes for field splitting and multiple fields can result. .Pp -The shell treats each character of the +Characters in +.Va IFS +that are whitespace +.Po +.Aq space , +.Aq tab , +and +.Aq newline +.Pc +are treated differently from other characters in +.Va IFS . +.Pp +Whitespace in +.Va IFS +at the beginning or end of a word is discarded. +.Pp +Subsequently, a field is delimited by either +.Bl -enum +.It +a non-whitespace character in +.Va IFS +with any whitespace in +.Va IFS +surrounding it, or +.It +one or more whitespace characters in +.Va IFS . +.El +.Pp +If a word ends with a non-whitespace character in +.Va IFS , +there is no empty field after this character. +.Pp +If no field is delimited, the word is discarded. +In particular, if a word consists solely of an unquoted substitution +and the result of the substitution is null, +it is removed by field splitting even if .Va IFS -variable as a delimiter and uses -the delimiters to split the results of parameter expansion and command -substitution into fields. +is null. .Ss Pathname Expansion (File Name Generation) Unless the .Fl f Modified: user/adrian/if_ath_tx/bin/test/test.c ============================================================================== --- user/adrian/if_ath_tx/bin/test/test.c Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/bin/test/test.c Tue Nov 8 02:53:11 2011 (r227329) @@ -118,7 +118,7 @@ enum token_types { PAREN }; -struct t_op { +static struct t_op { const char *op_text; short op_num, op_type; } const ops [] = { @@ -165,10 +165,10 @@ struct t_op { {0, 0, 0} }; -struct t_op const *t_wp_op; -int nargc; -char **t_wp; -int parenlevel; +static struct t_op const *t_wp_op; +static int nargc; +static char **t_wp; +static int parenlevel; static int aexpr(enum token); static int binop(void); Modified: user/adrian/if_ath_tx/cddl/lib/libzfs/Makefile ============================================================================== --- user/adrian/if_ath_tx/cddl/lib/libzfs/Makefile Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/cddl/lib/libzfs/Makefile Tue Nov 8 02:53:11 2011 (r227329) @@ -6,8 +6,8 @@ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common LIB= zfs -DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} -LDADD= -lmd -lpthread -lumem -lutil +DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} +LDADD= -lmd -lpthread -lumem -lutil -lm SRCS= deviceid.c \ fsshare.c \ Modified: user/adrian/if_ath_tx/cddl/sbin/zfs/Makefile ============================================================================== --- user/adrian/if_ath_tx/cddl/sbin/zfs/Makefile Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/cddl/sbin/zfs/Makefile Tue Nov 8 02:53:11 2011 (r227329) @@ -21,8 +21,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \ +DPADD= ${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} \ ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} -LDADD= -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs +LDADD= -lgeom -lnvpair -lumem -lutil -luutil -lzfs .include Modified: user/adrian/if_ath_tx/cddl/sbin/zpool/Makefile ============================================================================== --- user/adrian/if_ath_tx/cddl/sbin/zpool/Makefile Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/cddl/sbin/zpool/Makefile Tue Nov 8 02:53:11 2011 (r227329) @@ -26,8 +26,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common -DPADD= ${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \ +DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \ ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} -LDADD= -lavl -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs +LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs .include Modified: user/adrian/if_ath_tx/cddl/usr.bin/zinject/Makefile ============================================================================== --- user/adrian/if_ath_tx/cddl/usr.bin/zinject/Makefile Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/cddl/usr.bin/zinject/Makefile Tue Nov 8 02:53:11 2011 (r227329) @@ -19,8 +19,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ +DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ ${LIBZFS} ${LIBZPOOL} -LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool +LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool .include Modified: user/adrian/if_ath_tx/cddl/usr.bin/ztest/Makefile ============================================================================== --- user/adrian/if_ath_tx/cddl/usr.bin/ztest/Makefile Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/cddl/usr.bin/ztest/Makefile Tue Nov 8 02:53:11 2011 (r227329) @@ -18,8 +18,8 @@ CFLAGS+= -I${.CURDIR}/../../contrib/open CFLAGS+= -I${.CURDIR}/../../lib/libumem DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBZ} ${LIBAVL} -LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl + ${LIBPTHREAD} ${LIBAVL} +LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lavl CSTD= c99 Modified: user/adrian/if_ath_tx/cddl/usr.sbin/zdb/Makefile ============================================================================== --- user/adrian/if_ath_tx/cddl/usr.sbin/zdb/Makefile Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/cddl/usr.sbin/zdb/Makefile Tue Nov 8 02:53:11 2011 (r227329) @@ -23,9 +23,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ - ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} -LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool +DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ + ${LIBUUTIL} ${LIBZFS} ${LIBZPOOL} +LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool .include Modified: user/adrian/if_ath_tx/contrib/llvm/tools/clang/lib/Basic/Targets.cpp ============================================================================== --- user/adrian/if_ath_tx/contrib/llvm/tools/clang/lib/Basic/Targets.cpp Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/contrib/llvm/tools/clang/lib/Basic/Targets.cpp Tue Nov 8 02:53:11 2011 (r227329) @@ -1282,6 +1282,7 @@ class X86TargetInfo : public TargetInfo CK_K8SSE3, CK_Opteron, CK_OpteronSSE3, + CK_AMDFAM10, /// This specification is deprecated and will be removed in the future. /// Users should prefer \see CK_K8. @@ -1381,6 +1382,7 @@ public: .Case("k8-sse3", CK_K8SSE3) .Case("opteron", CK_Opteron) .Case("opteron-sse3", CK_OpteronSSE3) + .Case("amdfam10", CK_AMDFAM10) .Case("x86-64", CK_x86_64) .Case("geode", CK_Geode) .Default(CK_Generic); @@ -1441,6 +1443,7 @@ public: case CK_K8SSE3: case CK_Opteron: case CK_OpteronSSE3: + case CK_AMDFAM10: case CK_x86_64: return true; } @@ -1459,12 +1462,10 @@ void X86TargetInfo::getDefaultFeatures(l Features["ssse3"] = false; Features["sse41"] = false; Features["sse42"] = false; + Features["sse4a"] = false; Features["aes"] = false; Features["avx"] = false; - // LLVM does not currently recognize this. - // Features["sse4a"] = false; - // FIXME: This *really* should not be here. // X86_64 always has SSE2. @@ -1561,6 +1562,11 @@ void X86TargetInfo::getDefaultFeatures(l setFeatureEnabled(Features, "sse3", true); setFeatureEnabled(Features, "3dnowa", true); break; + case CK_AMDFAM10: + setFeatureEnabled(Features, "sse3", true); + setFeatureEnabled(Features, "sse4a", true); + setFeatureEnabled(Features, "3dnowa", true); + break; case CK_C3_2: setFeatureEnabled(Features, "mmx", true); setFeatureEnabled(Features, "sse", true); @@ -1604,6 +1610,8 @@ bool X86TargetInfo::setFeatureEnabled(ll else if (Name == "avx") Features["avx"] = Features["sse"] = Features["sse2"] = Features["sse3"] = Features["ssse3"] = Features["sse41"] = Features["sse42"] = true; + else if (Name == "sse4a") + Features["sse4a"] = true; } else { if (Name == "mmx") Features["mmx"] = Features["3dnow"] = Features["3dnowa"] = false; @@ -1630,6 +1638,8 @@ bool X86TargetInfo::setFeatureEnabled(ll Features["aes"] = false; else if (Name == "avx") Features["avx"] = false; + else if (Name == "sse4a") + Features["sse4a"] = false; } return true; @@ -1826,6 +1836,11 @@ void X86TargetInfo::getTargetDefines(con Builder.defineMacro("__k8__"); Builder.defineMacro("__tune_k8__"); break; + case CK_AMDFAM10: + Builder.defineMacro("__amdfam10"); + Builder.defineMacro("__amdfam10__"); + Builder.defineMacro("__tune_amdfam10__"); + break; case CK_Geode: Builder.defineMacro("__geode"); Builder.defineMacro("__geode__"); Modified: user/adrian/if_ath_tx/contrib/tzdata/australasia ============================================================================== --- user/adrian/if_ath_tx/contrib/tzdata/australasia Tue Nov 8 02:12:11 2011 (r227328) +++ user/adrian/if_ath_tx/contrib/tzdata/australasia Tue Nov 8 02:53:11 2011 (r227329) @@ -1,5 +1,5 @@ # 
-# @(#)australasia	8.28
+# @(#)australasia	8.29
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -308,6 +308,20 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # advance at 2am to 3am on October 23, 2011 and one hour back at 3am to 
 # 2am on February 26 next year.
 
+# From Ken Rylander (2011-10-24)
+# Another change to the Fiji DST end date. In the TZ database the end date for
+# Fiji DST 2012, is currently Feb 26. This has been changed to Jan 22.
+#
+# 
+# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:amendments-to-daylight-savings&catid=71:press-releases&Itemid=155
+# 
+# states:
+#
+# The end of daylight saving scheduled initially for the 26th of February 2012
+# has been brought forward to the 22nd of January 2012.
+# The commencement of daylight saving will remain unchanged and start
+# on the  23rd of October, 2011.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	S
 Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
@@ -316,7 +330,7 @@ Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0
 Rule	Fiji	2010	only	-	Oct	24	2:00	1:00	S
 Rule	Fiji	2011	only	-	Mar	Sun>=1	3:00	0	-
 Rule	Fiji	2011	only	-	Oct	23	2:00	1:00	S
-Rule	Fiji	2012	only	-	Feb	26	3:00	0	-
+Rule	Fiji	2012	only	-	Jan	22	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fiji	11:53:40 -	LMT	1915 Oct 26	# Suva
 			12:00	Fiji	FJ%sT	# Fiji Time

Modified: user/adrian/if_ath_tx/contrib/tzdata/backward
==============================================================================
--- user/adrian/if_ath_tx/contrib/tzdata/backward	Tue Nov  8 02:12:11 2011	(r227328)
+++ user/adrian/if_ath_tx/contrib/tzdata/backward	Tue Nov  8 02:53:11 2011	(r227329)
@@ -1,5 +1,5 @@
 # 
-# @(#)backward	8.10
+# @(#)backward	8.11
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -67,6 +67,7 @@ Link	America/Havana		Cuba
 Link	Africa/Cairo		Egypt
 Link	Europe/Dublin		Eire
 Link	Europe/London		Europe/Belfast
+Link	Europe/Chisinau		Europe/Tiraspol
 Link	Europe/London		GB
 Link	Europe/London		GB-Eire
 Link	Etc/GMT			GMT+0

Modified: user/adrian/if_ath_tx/contrib/tzdata/europe
==============================================================================
--- user/adrian/if_ath_tx/contrib/tzdata/europe	Tue Nov  8 02:12:11 2011	(r227328)
+++ user/adrian/if_ath_tx/contrib/tzdata/europe	Tue Nov  8 02:53:11 2011	(r227329)
@@ -1,5 +1,5 @@
 # 
-# @(#)europe	8.39
+# @(#)europe	8.40
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -1678,6 +1678,18 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov
 # a pre-1880 LMT offset of 1:58:32.
 #
 # (which agrees with the earlier entry that had been removed)
+#
+# From Alexander Krivenyshev (2011-10-26)
+# NO need to divide Moldova into two timezones at this point.
+# As of today, Transnistria (Pridnestrovie)- Tiraspol reversed its own
+# decision to abolish DST this winter. 
+# Following Moldova and neighboring Ukraine- Transnistria (Pridnestrovie)-
+# Tiraspol will go back to winter time on October 30, 2011.
+# News from Moldova (in russian):
+# 
+# http://ru.publika.md/link_317061.html
+# 
+
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Chisinau	1:55:20 -	LMT	1880
@@ -1694,21 +1706,6 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
 # See Romania commentary for the guessed 1997 transition to EU rules.
 			2:00	EU	EE%sT
 
-Zone	Europe/Tiraspol	1:58:32 -	LMT	1880
-			1:55	-	CMT	1918 Feb 15 # Chisinau MT
-			1:44:24	-	BMT	1931 Jul 24 # Bucharest MT
-			2:00	Romania	EE%sT	1940 Aug 15
-			2:00	1:00	EEST	1941 Jul 17
-			1:00	C-Eur	CE%sT	1944 Aug 24
-			3:00	Russia	MSK/MSD	1990
-			3:00	-	MSK	1990 May 6
-			2:00	-	EET	1991
-			2:00	Russia	EE%sT	1992
-			2:00	E-Eur	EE%sT	1997
-# See Romania commentary for the guessed 1997 transition to EU rules.
-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
-			3:00	-	FET # Further-eastern European Time
-
 # Monaco
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
 # more precise 0:09:21.

Modified: user/adrian/if_ath_tx/contrib/tzdata/northamerica
==============================================================================
--- user/adrian/if_ath_tx/contrib/tzdata/northamerica	Tue Nov  8 02:12:11 2011	(r227328)
+++ user/adrian/if_ath_tx/contrib/tzdata/northamerica	Tue Nov  8 02:53:11 2011	(r227329)
@@ -1,5 +1,5 @@
 # 
-# @(#)northamerica	8.50
+# @(#)northamerica	8.51
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -2690,6 +2690,20 @@ Zone America/Costa_Rica	-5:36:20 -	LMT	1
 # 
 # http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html
 # 
+#
+# From Steffen Thorsen (2011-10-30)
+# Cuba will end DST two weeks later this year. Instead of going back 
+# tonight, it has been delayed to 2011-11-13 at 01:00.
+#
+# One source (Spanish)
+# 
+# http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html
+# 
+#
+# Our page:
+# 
+# http://www.timeanddate.com/news/time/cuba-time-changes-2011.html
+# 
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Cuba	1928	only	-	Jun	10	0:00	1:00	D
@@ -2721,12 +2735,14 @@ Rule	Cuba	1997	only	-	Oct	12	0:00s	0	S
 Rule	Cuba	1998	1999	-	Mar	lastSun	0:00s	1:00	D
 Rule	Cuba	1998	2003	-	Oct	lastSun	0:00s	0	S
 Rule	Cuba	2000	2004	-	Apr	Sun>=1	0:00s	1:00	D
-Rule	Cuba	2006	max	-	Oct	lastSun	0:00s	0	S
+Rule	Cuba	2006	2010	-	Oct	lastSun	0:00s	0	S
 Rule	Cuba	2007	only	-	Mar	Sun>=8	0:00s	1:00	D
 Rule	Cuba	2008	only	-	Mar	Sun>=15	0:00s	1:00	D
 Rule	Cuba	2009	2010	-	Mar	Sun>=8	0:00s	1:00	D
 Rule	Cuba	2011	only	-	Mar	Sun>=15	0:00s	1:00	D
+Rule	Cuba	2011	only	-	Nov	13	0:00s	0	S
 Rule	Cuba	2012	max	-	Mar	Sun>=8	0:00s	1:00	D
+Rule	Cuba	2012	max	-	Oct	lastSun	0:00s	0	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Havana	-5:29:28 -	LMT	1890

Modified: user/adrian/if_ath_tx/contrib/tzdata/zone.tab
==============================================================================
--- user/adrian/if_ath_tx/contrib/tzdata/zone.tab	Tue Nov  8 02:12:11 2011	(r227328)
+++ user/adrian/if_ath_tx/contrib/tzdata/zone.tab	Tue Nov  8 02:53:11 2011	(r227329)
@@ -1,5 +1,5 @@
 # 
-# @(#)zone.tab	8.50
+# @(#)zone.tab	8.52
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
@@ -257,8 +257,7 @@ LV	+5657+02406	Europe/Riga
 LY	+3254+01311	Africa/Tripoli
 MA	+3339-00735	Africa/Casablanca
 MC	+4342+00723	Europe/Monaco
-MD	+4700+02850	Europe/Chisinau	most locations
-MD	+4651+02938	Europe/Tiraspol	Pridnestrovie
+MD	+4700+02850	Europe/Chisinau
 ME	+4226+01916	Europe/Podgorica
 MF	+1804-06305	America/Marigot
 MG	-1855+04731	Indian/Antananarivo

Modified: user/adrian/if_ath_tx/etc/rc.d/nfsd
==============================================================================
--- user/adrian/if_ath_tx/etc/rc.d/nfsd	Tue Nov  8 02:12:11 2011	(r227328)
+++ user/adrian/if_ath_tx/etc/rc.d/nfsd	Tue Nov  8 02:53:11 2011	(r227329)
@@ -29,6 +29,8 @@ nfsd_precmd()
 		if checkyesno nfs_reserved_port_only; then
 			echo 'NFS on reserved port only=YES'
 			sysctl vfs.nfsrv.nfs_privport=1 > /dev/null
+		else
+			sysctl vfs.nfsrv.nfs_privport=0 > /dev/null
 		fi
 	else
 		rc_flags="${nfs_server_flags}"
@@ -40,9 +42,12 @@ nfsd_precmd()
 		if checkyesno nfs_reserved_port_only; then
 			echo 'NFS on reserved port only=YES'
 			sysctl vfs.nfsd.nfs_privport=1 > /dev/null
+		else
+			sysctl vfs.nfsd.nfs_privport=0 > /dev/null
 		fi
 
 		if checkyesno nfsv4_server_enable; then
+			sysctl vfs.nfsd.server_max_nfsvers=4 > /dev/null
 			if ! checkyesno nfsuserd_enable  && \
 			    ! /etc/rc.d/nfsuserd forcestatus 1>/dev/null 2>&1
 			then

Modified: user/adrian/if_ath_tx/games/bcd/bcd.c
==============================================================================
--- user/adrian/if_ath_tx/games/bcd/bcd.c	Tue Nov  8 02:12:11 2011	(r227328)
+++ user/adrian/if_ath_tx/games/bcd/bcd.c	Tue Nov  8 02:53:11 2011	(r227329)
@@ -82,7 +82,7 @@ static const char rcsid[] =
 #include 
 #include 
 
-u_short holes[256] = {
+static u_short holes[256] = {
     0x0,	 0x0,	  0x0,	   0x0,	    0x0,     0x0,     0x0,     0x0,
     0x0,	 0x0,	  0x0,	   0x0,	    0x0,     0x0,     0x0,     0x0,
     0x0,	 0x0,	  0x0,	   0x0,	    0x0,     0x0,     0x0,     0x0,
@@ -117,7 +117,7 @@ u_short holes[256] = {
     0x202,	 0x201,	  0x082,   0x806,   0x822,   0x600,   0x282,   0x0
 };
 
-void printcard(char *);
+static void printcard(char *);
 
 /*
  * i'th bit of w.
@@ -148,7 +148,7 @@ main(int argc, char **argv)
 
 #define	COLUMNS	48
 
-void
+static void
 printcard(char *str)
 {
 	static char rowchars[] = "   123456789";

Modified: user/adrian/if_ath_tx/games/caesar/caesar.c
==============================================================================
--- user/adrian/if_ath_tx/games/caesar/caesar.c	Tue Nov  8 02:12:11 2011	(r227328)
+++ user/adrian/if_ath_tx/games/caesar/caesar.c	Tue Nov  8 02:53:11 2011	(r227329)
@@ -67,13 +67,13 @@ __FBSDID("$FreeBSD$");
  * letter frequencies (taken from some unix(tm) documentation)
  * (unix is a trademark of Bell Laboratories)
  */
-double stdf[26] = {
+static double stdf[26] = {
 	7.97, 1.35, 3.61, 4.78, 12.37, 2.01, 1.46, 4.49, 6.39, 0.04,
 	0.42, 3.81, 2.69, 5.92,  6.96, 2.91, 0.08, 6.63, 8.77, 9.68,
 	2.62, 0.81, 1.88, 0.23,  2.07, 0.06,
 };
 
-void printit(char *);
+static void printit(char *);
 
 int
 main(int argc, char **argv)
@@ -147,7 +147,7 @@ main(int argc, char **argv)
 	exit(0);
 }
 
-void
+static void
 printit(char *arg)
 {
 	int ch, rot;

Modified: user/adrian/if_ath_tx/games/fortune/fortune/fortune.c
==============================================================================
--- user/adrian/if_ath_tx/games/fortune/fortune/fortune.c	Tue Nov  8 02:12:11 2011	(r227328)
+++ user/adrian/if_ath_tx/games/fortune/fortune/fortune.c	Tue Nov  8 02:53:11 2011	(r227329)
@@ -97,73 +97,71 @@ typedef struct fd {
 	struct fd	*next, *prev;
 } FILEDESC;
 
-bool	Found_one;			/* did we find a match? */
-bool	Find_files	= FALSE;	/* just find a list of proper fortune files */
-bool	Fortunes_only   = FALSE;	/* check only "fortunes" files */
-bool	Wait		= FALSE;	/* wait desired after fortune */
-bool	Short_only	= FALSE;	/* short fortune desired */
-bool	Long_only	= FALSE;	/* long fortune desired */
-bool	Offend		= FALSE;	/* offensive fortunes only */
-bool	All_forts	= FALSE;	/* any fortune allowed */
-bool	Equal_probs	= FALSE;	/* scatter un-allocted prob equally */
-bool	Match		= FALSE;	/* dump fortunes matching a pattern */
+static bool	Found_one;		/* did we find a match? */
+static bool	Find_files = FALSE;	/* just find a list of proper fortune files */
+static bool	Fortunes_only = FALSE;	/* check only "fortunes" files */
+static bool	Wait = FALSE;		/* wait desired after fortune */
+static bool	Short_only = FALSE;	/* short fortune desired */
+static bool	Long_only = FALSE;	/* long fortune desired */
+static bool	Offend = FALSE;		/* offensive fortunes only */
+static bool	All_forts = FALSE;	/* any fortune allowed */
+static bool	Equal_probs = FALSE;	/* scatter un-allocted prob equally */
+static bool	Match = FALSE;		/* dump fortunes matching a pattern */
 #ifdef DEBUG
-bool	Debug = FALSE;			/* print debug messages */
+static bool	Debug = FALSE;		/* print debug messages */
 #endif
 
-char	*Fortbuf = NULL;			/* fortune buffer for -m */
+static char	*Fortbuf = NULL;	/* fortune buffer for -m */
 
-int	Fort_len = 0;
+static int	Fort_len = 0;
 
-off_t	Seekpts[2];                     /* seek pointers to fortunes */
+static off_t	Seekpts[2];		/* seek pointers to fortunes */
 
-FILEDESC	*File_list = NULL,	/* Head of file list */
+static FILEDESC	*File_list = NULL,	/* Head of file list */
 		*File_tail = NULL;	/* Tail of file list */
-FILEDESC	*Fortfile;		/* Fortune file to use */
+static FILEDESC	*Fortfile;		/* Fortune file to use */
 
-STRFILE		Noprob_tbl;		/* sum of data for all no prob files */
+static STRFILE	Noprob_tbl;		/* sum of data for all no prob files */
 
-const char	*Fortune_path;
-char	**Fortune_path_arr;
+static const char *Fortune_path;
+static char	**Fortune_path_arr;
 
-int	 add_dir(FILEDESC *);
-int	 add_file(int, const char *, const char *, FILEDESC **, FILEDESC **,
-	    FILEDESC *);
-void	 all_forts(FILEDESC *, char *);
-char	*copy(const char *, u_int);
-void	 display(FILEDESC *);
-void	 do_free(void *);
-void	*do_malloc(u_int);
-int	 form_file_list(char **, int);
-int	 fortlen(void);
-void	 get_fort(void);
-void	 get_pos(FILEDESC *);
-void	 get_tbl(FILEDESC *);
-void	 getargs(int, char *[]);
-void	 getpath(void);
-void	 init_prob(void);
-int	 is_dir(const char *);
-int	 is_fortfile(const char *, char **, char **, int);
-int	 is_off_name(const char *);
-int	 max(int, int);
-FILEDESC *
-	 new_fp(void);
-char	*off_name(const char *);
-void	 open_dat(FILEDESC *);
-void	 open_fp(FILEDESC *);
-FILEDESC *
-	 pick_child(FILEDESC *);
-void	 print_file_list(void);
-void	 print_list(FILEDESC *, int);
-void	 sum_noprobs(FILEDESC *);
-void	 sum_tbl(STRFILE *, STRFILE *);
-void	 usage(void);
-void	 zero_tbl(STRFILE *);
-
-char	*conv_pat(char *);
-int	 find_matches(void);
-void	 matches_in_list(FILEDESC *);
-int	 maxlen_in_list(FILEDESC *);
+static int	 add_dir(FILEDESC *);
+static int	 add_file(int, const char *, const char *, FILEDESC **,
+		     FILEDESC **, FILEDESC *);
+static void	 all_forts(FILEDESC *, char *);
+static char	*copy(const char *, u_int);
+static void	 display(FILEDESC *);
+static void	 do_free(void *);
+static void	*do_malloc(u_int);
+static int	 form_file_list(char **, int);
+static int	 fortlen(void);
+static void	 get_fort(void);
+static void	 get_pos(FILEDESC *);
+static void	 get_tbl(FILEDESC *);
+static void	 getargs(int, char *[]);
+static void	 getpath(void);
+static void	 init_prob(void);
+static int	 is_dir(const char *);
+static int	 is_fortfile(const char *, char **, char **, int);
+static int	 is_off_name(const char *);
+static int	 max(int, int);
+static FILEDESC *new_fp(void);
+static char	*off_name(const char *);
+static void	 open_dat(FILEDESC *);
+static void	 open_fp(FILEDESC *);
+static FILEDESC *pick_child(FILEDESC *);
+static void	 print_file_list(void);
+static void	 print_list(FILEDESC *, int);
+static void	 sum_noprobs(FILEDESC *);
+static void	 sum_tbl(STRFILE *, STRFILE *);
+static void	 usage(void);
+static void	 zero_tbl(STRFILE *);
+
+static char	*conv_pat(char *);
+static int	 find_matches(void);
+static void	 matches_in_list(FILEDESC *);
+static int	 maxlen_in_list(FILEDESC *);
 
 static regex_t Re_pat;
 
@@ -219,7 +217,7 @@ main(int argc, char *argv[])
 	exit(0);
 }
 
-void
+static void
 display(FILEDESC *fp)
 {
 	char   *p;
@@ -252,7 +250,7 @@ display(FILEDESC *fp)
  * fortlen:
  *	Return the length of the fortune.
  */
-int
+static int
 fortlen(void)
 {
 	int	nchar;
@@ -276,7 +274,7 @@ fortlen(void)
 /*
  *	This routine evaluates the arguments on the command line
  */
-void
+static void
 getargs(int argc, char *argv[])
 {
 	int	ignore_case;
@@ -362,7 +360,7 @@ getargs(int argc, char *argv[])
  * form_file_list:
  *	Form the file list from the file specifications.
  */
-int
+static int
 form_file_list(char **files, int file_cnt)
 {
 	int	i, percent;
@@ -456,7 +454,7 @@ form_file_list(char **files, int file_cn
  * add_file:
  *	Add a file to the file list.
  */
-int
+static int
 add_file(int percent, const char *file, const char *dir, FILEDESC **head,
     FILEDESC **tail, FILEDESC *parent)
 {
@@ -598,7 +596,7 @@ over:
  * new_fp:
  *	Return a pointer to an initialized new FILEDESC.
  */
-FILEDESC *
+static FILEDESC *
 new_fp(void)
 {
 	FILEDESC	*fp;
@@ -624,7 +622,7 @@ new_fp(void)
  * off_name:
  *	Return a pointer to the offensive version of a file of this name.
  */
-char *
+static char *
 off_name(const char *file)
 {
 	char	*new;
@@ -638,7 +636,7 @@ off_name(const char *file)
  * is_off_name:
  *	Is the file an offensive-style name?
  */
-int
+static int
 is_off_name(const char *file)
 {
 	int	len;
@@ -653,7 +651,7 @@ is_off_name(const char *file)
  *	Modify a FILEDESC element to be the parent of two children if
  *	there are two children to be a parent of.
  */
-void
+static void
 all_forts(FILEDESC *fp, char *offensive)
 {
 	char		*sp;
@@ -701,7 +699,7 @@ all_forts(FILEDESC *fp, char *offensive)
  * add_dir:
  *	Add the contents of an entire directory.
  */
-int
+static int
 add_dir(FILEDESC *fp)
 {
 	DIR		*dir;
@@ -740,7 +738,7 @@ add_dir(FILEDESC *fp)
  * is_dir:
  *	Return TRUE if the file is a directory, FALSE otherwise.
  */
-int
+static int
 is_dir(const char *file)
 {
 	struct stat	sbuf;
@@ -759,7 +757,7 @@ is_dir(const char *file)
  *	suffixes, as contained in suflist[], are ruled out.
  */
 /* ARGSUSED */
-int
+static int
 is_fortfile(const char *file, char **datp, char **posp, int check_for_offend)
 {
 	int	i;
@@ -840,7 +838,7 @@ is_fortfile(const char *file, char **dat
  * copy:
  *	Return a malloc()'ed copy of the string
  */
-char *
+static char *
 copy(const char *str, unsigned int len)
 {
 	char *new, *sp;
@@ -858,7 +856,7 @@ copy(const char *str, unsigned int len)
  * do_malloc:
  *	Do a malloc, checking for NULL return.

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-user@FreeBSD.ORG  Tue Nov  8 02:54:08 2011
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D12621065675;
	Tue,  8 Nov 2011 02:54:08 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C1B6F8FC16;
	Tue,  8 Nov 2011 02:54:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA82s8GB009362;
	Tue, 8 Nov 2011 02:54:08 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA82s8i2009360;
	Tue, 8 Nov 2011 02:54:08 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201111080254.pA82s8i2009360@svn.freebsd.org>
From: Adrian Chadd 
Date: Tue, 8 Nov 2011 02:54:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227330 - user/adrian/if_ath_tx/sys/dev/ath
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 08 Nov 2011 02:54:08 -0000

Author: adrian
Date: Tue Nov  8 02:54:08 2011
New Revision: 227330
URL: http://svn.freebsd.org/changeset/base/227330

Log:
  Fix this mis-merge.

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/if_ath.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Tue Nov  8 02:53:11 2011	(r227329)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Tue Nov  8 02:54:08 2011	(r227330)
@@ -268,7 +268,7 @@ static	int ath_bstuck_threshold = 4;		/*
 SYSCTL_INT(_hw_ath, OID_AUTO, bstuck, CTLFLAG_RW, &ath_bstuck_threshold,
 	    0, "max missed beacon xmits before chip reset");
 
-static MALLOC_DEFINE(M_ATHDEV, "athdev", "ath driver dma buffers");
+MALLOC_DEFINE(M_ATHDEV, "athdev", "ath driver dma buffers");
 
 #define	HAL_MODE_HT20 (HAL_MODE_11NG_HT20 | HAL_MODE_11NA_HT20)
 #define	HAL_MODE_HT40 \

From owner-svn-src-user@FreeBSD.ORG  Tue Nov  8 11:08:41 2011
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D4E8F106564A;
	Tue,  8 Nov 2011 11:08:41 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C145B8FC0A;
	Tue,  8 Nov 2011 11:08:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA8B8f9g028730;
	Tue, 8 Nov 2011 11:08:41 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA8B8fQR028713;
	Tue, 8 Nov 2011 11:08:41 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201111081108.pA8B8fQR028713@svn.freebsd.org>
From: Attilio Rao 
Date: Tue, 8 Nov 2011 11:08:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227334 - in user/attilio/vmcontention: . bin/sh
	contrib/top etc/rc.d games/bcd games/caesar
	games/fortune/fortune games/fortune/unstr games/grdc
	games/morse games/number gnu/lib/libstd...
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 08 Nov 2011 11:08:41 -0000

Author: attilio
Date: Tue Nov  8 11:08:40 2011
New Revision: 227334
URL: http://svn.freebsd.org/changeset/base/227334

Log:
  MFC

Modified:
  user/attilio/vmcontention/Makefile.inc1
  user/attilio/vmcontention/ObsoleteFiles.inc
  user/attilio/vmcontention/UPDATING
  user/attilio/vmcontention/bin/sh/sh.1
  user/attilio/vmcontention/etc/rc.d/nfsd
  user/attilio/vmcontention/games/bcd/bcd.c
  user/attilio/vmcontention/games/caesar/caesar.c
  user/attilio/vmcontention/games/fortune/fortune/fortune.c
  user/attilio/vmcontention/games/fortune/unstr/unstr.c
  user/attilio/vmcontention/games/grdc/grdc.c
  user/attilio/vmcontention/games/morse/morse.c
  user/attilio/vmcontention/games/number/number.c
  user/attilio/vmcontention/gnu/lib/libstdc++/config.h
  user/attilio/vmcontention/lib/clang/include/llvm/Config/config.h
  user/attilio/vmcontention/lib/clang/include/llvm/Config/llvm-config.h
  user/attilio/vmcontention/lib/libc/stdlib/realpath.c
  user/attilio/vmcontention/lib/libpam/modules/pam_lastlog/pam_lastlog.c
  user/attilio/vmcontention/lib/libpam/modules/pam_unix/pam_unix.c
  user/attilio/vmcontention/release/doc/en_US.ISO8859-1/hardware/article.sgml
  user/attilio/vmcontention/release/doc/share/misc/dev.archlist.txt
  user/attilio/vmcontention/release/ia64/mkisoimages.sh
  user/attilio/vmcontention/sbin/atm/atmconfig/atmconfig_device.c
  user/attilio/vmcontention/sbin/atm/atmconfig/diag.c
  user/attilio/vmcontention/sbin/atm/atmconfig/main.c
  user/attilio/vmcontention/sbin/badsect/badsect.c
  user/attilio/vmcontention/sbin/bsdlabel/bsdlabel.c
  user/attilio/vmcontention/sbin/camcontrol/camcontrol.c
  user/attilio/vmcontention/sbin/ccdconfig/ccdconfig.c
  user/attilio/vmcontention/sbin/devfs/rule.c
  user/attilio/vmcontention/sbin/dmesg/dmesg.c
  user/attilio/vmcontention/sbin/dumpfs/dumpfs.c
  user/attilio/vmcontention/sbin/fdisk/fdisk.8
  user/attilio/vmcontention/sbin/fdisk/fdisk.c
  user/attilio/vmcontention/sbin/fdisk_pc98/fdisk.8
  user/attilio/vmcontention/sbin/ffsinfo/ffsinfo.c
  user/attilio/vmcontention/sbin/fsck/fsck.c
  user/attilio/vmcontention/sbin/fsck/preen.c
  user/attilio/vmcontention/sbin/fsck_msdosfs/dir.c
  user/attilio/vmcontention/sbin/fsirand/fsirand.c
  user/attilio/vmcontention/sbin/growfs/growfs.c
  user/attilio/vmcontention/sbin/init/init.c
  user/attilio/vmcontention/sbin/mount/mount.c
  user/attilio/vmcontention/sbin/mount/mount_fs.c
  user/attilio/vmcontention/sbin/mount_cd9660/mount_cd9660.c
  user/attilio/vmcontention/sbin/mount_nullfs/mount_nullfs.c
  user/attilio/vmcontention/sbin/mount_udf/mount_udf.c
  user/attilio/vmcontention/sbin/natd/natd.c
  user/attilio/vmcontention/sbin/newfs/mkfs.c
  user/attilio/vmcontention/sbin/newfs/newfs.h
  user/attilio/vmcontention/sbin/rcorder/rcorder.c
  user/attilio/vmcontention/sbin/recoverdisk/recoverdisk.c
  user/attilio/vmcontention/sbin/shutdown/shutdown.c
  user/attilio/vmcontention/sbin/swapon/swapon.c
  user/attilio/vmcontention/sbin/tunefs/tunefs.c
  user/attilio/vmcontention/sbin/umount/umount.c
  user/attilio/vmcontention/share/man/man4/altq.4
  user/attilio/vmcontention/share/man/man4/esp.4
  user/attilio/vmcontention/share/man/man4/qlxgb.4
  user/attilio/vmcontention/share/man/man9/kqueue.9
  user/attilio/vmcontention/sys/amd64/amd64/mp_machdep.c
  user/attilio/vmcontention/sys/amd64/amd64/pmap.c
  user/attilio/vmcontention/sys/amd64/amd64/trap.c
  user/attilio/vmcontention/sys/amd64/conf/DEFAULTS
  user/attilio/vmcontention/sys/amd64/conf/GENERIC
  user/attilio/vmcontention/sys/amd64/include/segments.h
  user/attilio/vmcontention/sys/amd64/include/trap.h
  user/attilio/vmcontention/sys/amd64/linux32/linux32_sysvec.c
  user/attilio/vmcontention/sys/arm/arm/busdma_machdep.c
  user/attilio/vmcontention/sys/arm/arm/vm_machdep.c
  user/attilio/vmcontention/sys/arm/conf/DEFAULTS
  user/attilio/vmcontention/sys/arm/xscale/i80321/iq31244_7seg.c
  user/attilio/vmcontention/sys/arm/xscale/i8134x/iq81342_7seg.c
  user/attilio/vmcontention/sys/arm/xscale/ixp425/if_npe.c
  user/attilio/vmcontention/sys/arm/xscale/pxa/pxa_smi.c
  user/attilio/vmcontention/sys/arm/xscale/pxa/pxa_space.c
  user/attilio/vmcontention/sys/cam/ata/ata_da.c
  user/attilio/vmcontention/sys/cam/ata/ata_pmp.c
  user/attilio/vmcontention/sys/cam/cam_periph.c
  user/attilio/vmcontention/sys/cam/cam_queue.c
  user/attilio/vmcontention/sys/cam/cam_sim.c
  user/attilio/vmcontention/sys/cam/scsi/scsi_cd.c
  user/attilio/vmcontention/sys/cam/scsi/scsi_ch.c
  user/attilio/vmcontention/sys/cam/scsi/scsi_da.c
  user/attilio/vmcontention/sys/cam/scsi/scsi_low.c
  user/attilio/vmcontention/sys/cam/scsi/scsi_sa.c
  user/attilio/vmcontention/sys/cam/scsi/scsi_ses.c
  user/attilio/vmcontention/sys/cam/scsi/scsi_targ_bh.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
  user/attilio/vmcontention/sys/cddl/dev/cyclic/cyclic.c
  user/attilio/vmcontention/sys/cddl/dev/fbt/fbt.c
  user/attilio/vmcontention/sys/compat/ia32/ia32_sysvec.c
  user/attilio/vmcontention/sys/compat/linux/linux_futex.c
  user/attilio/vmcontention/sys/compat/linux/linux_mib.c
  user/attilio/vmcontention/sys/compat/x86bios/x86bios.c
  user/attilio/vmcontention/sys/conf/NOTES
  user/attilio/vmcontention/sys/conf/options
  user/attilio/vmcontention/sys/dev/aac/aac.c
  user/attilio/vmcontention/sys/dev/aac/aac_cam.c
  user/attilio/vmcontention/sys/dev/acpi_support/acpi_wmi.c
  user/attilio/vmcontention/sys/dev/acpica/Osd/OsdInterrupt.c
  user/attilio/vmcontention/sys/dev/acpica/Osd/OsdMemory.c
  user/attilio/vmcontention/sys/dev/acpica/Osd/OsdSchedule.c
  user/attilio/vmcontention/sys/dev/acpica/Osd/OsdSynch.c
  user/attilio/vmcontention/sys/dev/acpica/acpi.c
  user/attilio/vmcontention/sys/dev/acpica/acpi_cmbat.c
  user/attilio/vmcontention/sys/dev/acpica/acpi_ec.c
  user/attilio/vmcontention/sys/dev/acpica/acpi_pci_link.c
  user/attilio/vmcontention/sys/dev/acpica/acpi_perf.c
  user/attilio/vmcontention/sys/dev/acpica/acpi_powerres.c
  user/attilio/vmcontention/sys/dev/acpica/acpi_smbat.c
  user/attilio/vmcontention/sys/dev/acpica/acpi_video.c
  user/attilio/vmcontention/sys/dev/ahci/ahci.c
  user/attilio/vmcontention/sys/dev/amr/amr.c
  user/attilio/vmcontention/sys/dev/amr/amr_cam.c
  user/attilio/vmcontention/sys/dev/an/if_an.c
  user/attilio/vmcontention/sys/dev/ata/ata-all.c
  user/attilio/vmcontention/sys/dev/ath/ah_osdep.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
  user/attilio/vmcontention/sys/dev/ath/if_ath.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_ahb.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_pci.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_sysctl.c
  user/attilio/vmcontention/sys/dev/ath/if_athioctl.h
  user/attilio/vmcontention/sys/dev/ath/if_athrate.h
  user/attilio/vmcontention/sys/dev/ath/if_athvar.h
  user/attilio/vmcontention/sys/dev/atkbdc/psm.c
  user/attilio/vmcontention/sys/dev/bce/if_bce.c
  user/attilio/vmcontention/sys/dev/bge/if_bge.c
  user/attilio/vmcontention/sys/dev/bktr/bktr_os.c
  user/attilio/vmcontention/sys/dev/bwn/if_bwn.c
  user/attilio/vmcontention/sys/dev/bxe/if_bxe.c
  user/attilio/vmcontention/sys/dev/cardbus/cardbus.c
  user/attilio/vmcontention/sys/dev/ciss/ciss.c
  user/attilio/vmcontention/sys/dev/cs/if_cs.c
  user/attilio/vmcontention/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c
  user/attilio/vmcontention/sys/dev/cxgbe/t4_main.c
  user/attilio/vmcontention/sys/dev/dcons/dcons_os.c
  user/attilio/vmcontention/sys/dev/e1000/if_em.c
  user/attilio/vmcontention/sys/dev/e1000/if_igb.c
  user/attilio/vmcontention/sys/dev/esp/ncr53c9x.c
  user/attilio/vmcontention/sys/dev/fb/vesa.c
  user/attilio/vmcontention/sys/dev/fdc/fdc.c
  user/attilio/vmcontention/sys/dev/firewire/fwmem.c
  user/attilio/vmcontention/sys/dev/firewire/if_fwe.c
  user/attilio/vmcontention/sys/dev/firewire/if_fwip.c
  user/attilio/vmcontention/sys/dev/firewire/sbp.c
  user/attilio/vmcontention/sys/dev/firewire/sbp_targ.c
  user/attilio/vmcontention/sys/dev/hifn/hifn7751.c
  user/attilio/vmcontention/sys/dev/iicbus/ad7417.c
  user/attilio/vmcontention/sys/dev/iicbus/max6690.c
  user/attilio/vmcontention/sys/dev/iir/iir.c
  user/attilio/vmcontention/sys/dev/ipmi/ipmi.c
  user/attilio/vmcontention/sys/dev/iscsi/initiator/isc_subr.c
  user/attilio/vmcontention/sys/dev/iscsi/initiator/iscsi.c
  user/attilio/vmcontention/sys/dev/iscsi/initiator/iscsivar.h
  user/attilio/vmcontention/sys/dev/isp/isp_freebsd.c
  user/attilio/vmcontention/sys/dev/isp/isp_freebsd.h
  user/attilio/vmcontention/sys/dev/kbd/kbd.c
  user/attilio/vmcontention/sys/dev/malo/if_malo.c
  user/attilio/vmcontention/sys/dev/malo/if_malo_pci.c
  user/attilio/vmcontention/sys/dev/mfi/mfi.c
  user/attilio/vmcontention/sys/dev/mmc/mmc.c
  user/attilio/vmcontention/sys/dev/mps/mps_sas.c
  user/attilio/vmcontention/sys/dev/mvs/mvs.c
  user/attilio/vmcontention/sys/dev/mwl/if_mwl.c
  user/attilio/vmcontention/sys/dev/mwl/mwlhal.c
  user/attilio/vmcontention/sys/dev/nmdm/nmdm.c
  user/attilio/vmcontention/sys/dev/pccard/pccard.c
  user/attilio/vmcontention/sys/dev/pccbb/pccbb.c
  user/attilio/vmcontention/sys/dev/pccbb/pccbb_isa.c
  user/attilio/vmcontention/sys/dev/puc/puc.c
  user/attilio/vmcontention/sys/dev/quicc/quicc_core.c
  user/attilio/vmcontention/sys/dev/rndtest/rndtest.c
  user/attilio/vmcontention/sys/dev/rt/if_rt.c
  user/attilio/vmcontention/sys/dev/safe/safe.c
  user/attilio/vmcontention/sys/dev/scc/scc_core.c
  user/attilio/vmcontention/sys/dev/sdhci/sdhci.c
  user/attilio/vmcontention/sys/dev/siis/siis.c
  user/attilio/vmcontention/sys/dev/sound/midi/midi.c
  user/attilio/vmcontention/sys/dev/sound/pci/envy24.c
  user/attilio/vmcontention/sys/dev/sound/pci/envy24ht.c
  user/attilio/vmcontention/sys/dev/sound/pci/maestro.c
  user/attilio/vmcontention/sys/dev/sound/pci/spicds.c
  user/attilio/vmcontention/sys/dev/sound/pcm/ac97.c
  user/attilio/vmcontention/sys/dev/sound/pcm/feeder.c
  user/attilio/vmcontention/sys/dev/sound/pcm/mixer.c
  user/attilio/vmcontention/sys/dev/sound/usb/uaudio.c
  user/attilio/vmcontention/sys/dev/syscons/syscons.c
  user/attilio/vmcontention/sys/dev/tdfx/tdfx_pci.c
  user/attilio/vmcontention/sys/dev/ti/if_ti.c
  user/attilio/vmcontention/sys/dev/ti/if_tireg.h
  user/attilio/vmcontention/sys/dev/twa/tw_osl_freebsd.c
  user/attilio/vmcontention/sys/dev/twe/twe_freebsd.c
  user/attilio/vmcontention/sys/dev/uart/uart_core.c
  user/attilio/vmcontention/sys/dev/ubsec/ubsec.c
  user/attilio/vmcontention/sys/dev/usb/controller/at91dci.c
  user/attilio/vmcontention/sys/dev/usb/controller/atmegadci.c
  user/attilio/vmcontention/sys/dev/usb/controller/avr32dci.c
  user/attilio/vmcontention/sys/dev/usb/controller/ehci.c
  user/attilio/vmcontention/sys/dev/usb/controller/musb_otg.c
  user/attilio/vmcontention/sys/dev/usb/controller/ohci.c
  user/attilio/vmcontention/sys/dev/usb/controller/uhci.c
  user/attilio/vmcontention/sys/dev/usb/controller/usb_controller.c
  user/attilio/vmcontention/sys/dev/usb/controller/uss820dci.c
  user/attilio/vmcontention/sys/dev/usb/controller/xhci.c
  user/attilio/vmcontention/sys/dev/usb/input/atp.c
  user/attilio/vmcontention/sys/dev/usb/input/uep.c
  user/attilio/vmcontention/sys/dev/usb/input/uhid.c
  user/attilio/vmcontention/sys/dev/usb/input/ukbd.c
  user/attilio/vmcontention/sys/dev/usb/input/ums.c
  user/attilio/vmcontention/sys/dev/usb/misc/udbp.c
  user/attilio/vmcontention/sys/dev/usb/net/if_aue.c
  user/attilio/vmcontention/sys/dev/usb/net/if_axe.c
  user/attilio/vmcontention/sys/dev/usb/net/if_cdce.c
  user/attilio/vmcontention/sys/dev/usb/net/if_cue.c
  user/attilio/vmcontention/sys/dev/usb/net/if_ipheth.c
  user/attilio/vmcontention/sys/dev/usb/net/if_kue.c
  user/attilio/vmcontention/sys/dev/usb/net/if_mos.c
  user/attilio/vmcontention/sys/dev/usb/net/if_rue.c
  user/attilio/vmcontention/sys/dev/usb/net/if_udav.c
  user/attilio/vmcontention/sys/dev/usb/net/if_usie.c
  user/attilio/vmcontention/sys/dev/usb/net/uhso.c
  user/attilio/vmcontention/sys/dev/usb/net/usb_ethernet.c
  user/attilio/vmcontention/sys/dev/usb/serial/u3g.c
  user/attilio/vmcontention/sys/dev/usb/serial/ubsa.c
  user/attilio/vmcontention/sys/dev/usb/serial/ubser.c
  user/attilio/vmcontention/sys/dev/usb/serial/uchcom.c
  user/attilio/vmcontention/sys/dev/usb/serial/uftdi.c
  user/attilio/vmcontention/sys/dev/usb/serial/ulpt.c
  user/attilio/vmcontention/sys/dev/usb/serial/umcs.c
  user/attilio/vmcontention/sys/dev/usb/serial/umodem.c
  user/attilio/vmcontention/sys/dev/usb/serial/umoscom.c
  user/attilio/vmcontention/sys/dev/usb/serial/uplcom.c
  user/attilio/vmcontention/sys/dev/usb/serial/usb_serial.c
  user/attilio/vmcontention/sys/dev/usb/serial/uslcom.c
  user/attilio/vmcontention/sys/dev/usb/serial/uvisor.c
  user/attilio/vmcontention/sys/dev/usb/serial/uvscom.c
  user/attilio/vmcontention/sys/dev/usb/storage/umass.c
  user/attilio/vmcontention/sys/dev/usb/storage/urio.c
  user/attilio/vmcontention/sys/dev/usb/usb_dev.c
  user/attilio/vmcontention/sys/dev/usb/usb_generic.c
  user/attilio/vmcontention/sys/dev/usb/usb_hub.c
  user/attilio/vmcontention/sys/dev/usb/usb_process.c
  user/attilio/vmcontention/sys/dev/usb/wlan/if_rum.c
  user/attilio/vmcontention/sys/dev/usb/wlan/if_run.c
  user/attilio/vmcontention/sys/dev/usb/wlan/if_uath.c
  user/attilio/vmcontention/sys/dev/usb/wlan/if_upgt.c
  user/attilio/vmcontention/sys/dev/usb/wlan/if_ural.c
  user/attilio/vmcontention/sys/dev/usb/wlan/if_urtw.c
  user/attilio/vmcontention/sys/dev/usb/wlan/if_zyd.c
  user/attilio/vmcontention/sys/dev/wi/if_wi.c
  user/attilio/vmcontention/sys/dev/xe/if_xe.c
  user/attilio/vmcontention/sys/dev/xen/balloon/balloon.c
  user/attilio/vmcontention/sys/dev/xen/blkback/blkback.c
  user/attilio/vmcontention/sys/dev/xen/blkfront/blkfront.c
  user/attilio/vmcontention/sys/fs/ext2fs/ext2_alloc.c
  user/attilio/vmcontention/sys/fs/ntfs/ntfs_subr.c
  user/attilio/vmcontention/sys/fs/nwfs/nwfs_mount.h
  user/attilio/vmcontention/sys/fs/procfs/procfs_status.c
  user/attilio/vmcontention/sys/fs/pseudofs/pseudofs_vncache.c
  user/attilio/vmcontention/sys/fs/smbfs/smbfs.h
  user/attilio/vmcontention/sys/fs/smbfs/smbfs_node.c
  user/attilio/vmcontention/sys/fs/tmpfs/tmpfs_vfsops.c
  user/attilio/vmcontention/sys/fs/udf/udf_vnops.c
  user/attilio/vmcontention/sys/geom/cache/g_cache.c
  user/attilio/vmcontention/sys/geom/concat/g_concat.c
  user/attilio/vmcontention/sys/geom/gate/g_gate.c
  user/attilio/vmcontention/sys/geom/geom_disk.c
  user/attilio/vmcontention/sys/geom/journal/g_journal.c
  user/attilio/vmcontention/sys/geom/mirror/g_mirror.c
  user/attilio/vmcontention/sys/geom/mountver/g_mountver.c
  user/attilio/vmcontention/sys/geom/multipath/g_multipath.c
  user/attilio/vmcontention/sys/geom/nop/g_nop.c
  user/attilio/vmcontention/sys/geom/part/g_part.c
  user/attilio/vmcontention/sys/geom/raid/tr_raid1.c
  user/attilio/vmcontention/sys/geom/raid/tr_raid1e.c
  user/attilio/vmcontention/sys/geom/raid3/g_raid3.c
  user/attilio/vmcontention/sys/geom/sched/gs_rr.c
  user/attilio/vmcontention/sys/geom/shsec/g_shsec.c
  user/attilio/vmcontention/sys/geom/stripe/g_stripe.c
  user/attilio/vmcontention/sys/geom/uzip/g_uzip.c
  user/attilio/vmcontention/sys/geom/vinum/geom_vinum.c
  user/attilio/vmcontention/sys/geom/virstor/g_virstor.c
  user/attilio/vmcontention/sys/geom/zero/g_zero.c
  user/attilio/vmcontention/sys/gnu/fs/xfs/FreeBSD/support/debug.c
  user/attilio/vmcontention/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c
  user/attilio/vmcontention/sys/i386/conf/DEFAULTS
  user/attilio/vmcontention/sys/i386/conf/GENERIC
  user/attilio/vmcontention/sys/i386/i386/mp_machdep.c
  user/attilio/vmcontention/sys/i386/i386/pmap.c
  user/attilio/vmcontention/sys/i386/i386/trap.c
  user/attilio/vmcontention/sys/i386/include/segments.h
  user/attilio/vmcontention/sys/i386/include/trap.h
  user/attilio/vmcontention/sys/i386/xen/pmap.c
  user/attilio/vmcontention/sys/ia64/conf/DEFAULTS
  user/attilio/vmcontention/sys/ia64/ia64/busdma_machdep.c
  user/attilio/vmcontention/sys/ia64/ia64/machdep.c
  user/attilio/vmcontention/sys/ia64/ia64/mca.c
  user/attilio/vmcontention/sys/ia64/ia64/pmap.c
  user/attilio/vmcontention/sys/ia64/ia64/sapic.c
  user/attilio/vmcontention/sys/ia64/ia64/sscdisk.c
  user/attilio/vmcontention/sys/ia64/ia64/unwind.c
  user/attilio/vmcontention/sys/kern/kern_clock.c
  user/attilio/vmcontention/sys/kern/kern_cpu.c
  user/attilio/vmcontention/sys/kern/kern_dtrace.c
  user/attilio/vmcontention/sys/kern/kern_et.c
  user/attilio/vmcontention/sys/kern/kern_fail.c
  user/attilio/vmcontention/sys/kern/kern_jail.c
  user/attilio/vmcontention/sys/kern/kern_ktr.c
  user/attilio/vmcontention/sys/kern/kern_linker.c
  user/attilio/vmcontention/sys/kern/kern_lock.c
  user/attilio/vmcontention/sys/kern/kern_lockf.c
  user/attilio/vmcontention/sys/kern/kern_malloc.c
  user/attilio/vmcontention/sys/kern/kern_poll.c
  user/attilio/vmcontention/sys/kern/kern_proc.c
  user/attilio/vmcontention/sys/kern/kern_rctl.c
  user/attilio/vmcontention/sys/kern/kern_resource.c
  user/attilio/vmcontention/sys/kern/kern_rwlock.c
  user/attilio/vmcontention/sys/kern/kern_shutdown.c
  user/attilio/vmcontention/sys/kern/kern_sig.c
  user/attilio/vmcontention/sys/kern/kern_sx.c
  user/attilio/vmcontention/sys/kern/kern_tc.c
  user/attilio/vmcontention/sys/kern/kern_thr.c
  user/attilio/vmcontention/sys/kern/kern_timeout.c
  user/attilio/vmcontention/sys/kern/kern_umtx.c
  user/attilio/vmcontention/sys/kern/sched_4bsd.c
  user/attilio/vmcontention/sys/kern/subr_devstat.c
  user/attilio/vmcontention/sys/kern/subr_kdb.c
  user/attilio/vmcontention/sys/kern/subr_lock.c
  user/attilio/vmcontention/sys/kern/subr_pcpu.c
  user/attilio/vmcontention/sys/kern/subr_prof.c
  user/attilio/vmcontention/sys/kern/subr_rman.c
  user/attilio/vmcontention/sys/kern/subr_sleepqueue.c
  user/attilio/vmcontention/sys/kern/subr_smp.c
  user/attilio/vmcontention/sys/kern/subr_turnstile.c
  user/attilio/vmcontention/sys/kern/subr_witness.c
  user/attilio/vmcontention/sys/kern/uipc_mqueue.c
  user/attilio/vmcontention/sys/kern/uipc_usrreq.c
  user/attilio/vmcontention/sys/kern/vfs_cache.c
  user/attilio/vmcontention/sys/kern/vfs_mount.c
  user/attilio/vmcontention/sys/libkern/iconv.c
  user/attilio/vmcontention/sys/mips/cavium/usb/octusb.c
  user/attilio/vmcontention/sys/mips/conf/DEFAULTS
  user/attilio/vmcontention/sys/mips/mips/busdma_machdep.c
  user/attilio/vmcontention/sys/modules/Makefile
  user/attilio/vmcontention/sys/modules/ipfw/Makefile
  user/attilio/vmcontention/sys/net/bpf.c
  user/attilio/vmcontention/sys/net/flowtable.c
  user/attilio/vmcontention/sys/net/if.c
  user/attilio/vmcontention/sys/net/if_arcsubr.c
  user/attilio/vmcontention/sys/net/if_atmsubr.c
  user/attilio/vmcontention/sys/net/if_bridge.c
  user/attilio/vmcontention/sys/net/if_enc.c
  user/attilio/vmcontention/sys/net/if_epair.c
  user/attilio/vmcontention/sys/net/if_ethersubr.c
  user/attilio/vmcontention/sys/net/if_fwsubr.c
  user/attilio/vmcontention/sys/net/if_gif.c
  user/attilio/vmcontention/sys/net/if_gre.c
  user/attilio/vmcontention/sys/net/if_iso88025subr.c
  user/attilio/vmcontention/sys/net/if_lagg.c
  user/attilio/vmcontention/sys/net/if_mib.c
  user/attilio/vmcontention/sys/net/if_spppsubr.c
  user/attilio/vmcontention/sys/net/if_stf.c
  user/attilio/vmcontention/sys/net/if_tap.c
  user/attilio/vmcontention/sys/net/if_tun.c
  user/attilio/vmcontention/sys/net/if_vlan.c
  user/attilio/vmcontention/sys/net/netisr.c
  user/attilio/vmcontention/sys/net/raw_cb.c
  user/attilio/vmcontention/sys/net/rtsock.c
  user/attilio/vmcontention/sys/net/vnet.c
  user/attilio/vmcontention/sys/net80211/ieee80211.h
  user/attilio/vmcontention/sys/net80211/ieee80211_acl.c
  user/attilio/vmcontention/sys/net80211/ieee80211_dfs.c
  user/attilio/vmcontention/sys/net80211/ieee80211_freebsd.c
  user/attilio/vmcontention/sys/net80211/ieee80211_hwmp.c
  user/attilio/vmcontention/sys/net80211/ieee80211_input.c
  user/attilio/vmcontention/sys/net80211/ieee80211_ioctl.c
  user/attilio/vmcontention/sys/net80211/ieee80211_ioctl.h
  user/attilio/vmcontention/sys/net80211/ieee80211_mesh.c
  user/attilio/vmcontention/sys/net80211/ieee80211_output.c
  user/attilio/vmcontention/sys/net80211/ieee80211_power.c
  user/attilio/vmcontention/sys/net80211/ieee80211_proto.h
  user/attilio/vmcontention/sys/net80211/ieee80211_scan.h
  user/attilio/vmcontention/sys/net80211/ieee80211_sta.c
  user/attilio/vmcontention/sys/net80211/ieee80211_var.h
  user/attilio/vmcontention/sys/netgraph/atm/ng_atm.c
  user/attilio/vmcontention/sys/netgraph/atm/ngatmbase.c
  user/attilio/vmcontention/sys/netgraph/atm/uni/ng_uni.c
  user/attilio/vmcontention/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
  user/attilio/vmcontention/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
  user/attilio/vmcontention/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
  user/attilio/vmcontention/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
  user/attilio/vmcontention/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
  user/attilio/vmcontention/sys/netgraph/netgraph.h
  user/attilio/vmcontention/sys/netgraph/ng_async.c
  user/attilio/vmcontention/sys/netgraph/ng_atmllc.c
  user/attilio/vmcontention/sys/netgraph/ng_base.c
  user/attilio/vmcontention/sys/netgraph/ng_bpf.c
  user/attilio/vmcontention/sys/netgraph/ng_bridge.c
  user/attilio/vmcontention/sys/netgraph/ng_cisco.c
  user/attilio/vmcontention/sys/netgraph/ng_deflate.c
  user/attilio/vmcontention/sys/netgraph/ng_gif_demux.c
  user/attilio/vmcontention/sys/netgraph/ng_hub.c
  user/attilio/vmcontention/sys/netgraph/ng_iface.c
  user/attilio/vmcontention/sys/netgraph/ng_ksocket.c
  user/attilio/vmcontention/sys/netgraph/ng_l2tp.c
  user/attilio/vmcontention/sys/netgraph/ng_mppc.c
  user/attilio/vmcontention/sys/netgraph/ng_parse.c
  user/attilio/vmcontention/sys/netgraph/ng_ppp.c
  user/attilio/vmcontention/sys/netgraph/ng_pppoe.c
  user/attilio/vmcontention/sys/netgraph/ng_pred1.c
  user/attilio/vmcontention/sys/netgraph/ng_sample.c
  user/attilio/vmcontention/sys/netgraph/ng_socket.c
  user/attilio/vmcontention/sys/netgraph/ng_sppp.c
  user/attilio/vmcontention/sys/netgraph/ng_tag.c
  user/attilio/vmcontention/sys/netinet/accf_http.c
  user/attilio/vmcontention/sys/netinet/if_ether.c
  user/attilio/vmcontention/sys/netinet/igmp.c
  user/attilio/vmcontention/sys/netinet/in_mcast.c
  user/attilio/vmcontention/sys/netinet/in_pcb.c
  user/attilio/vmcontention/sys/netinet/in_pcb.h
  user/attilio/vmcontention/sys/netinet/ip_divert.c
  user/attilio/vmcontention/sys/netinet/ip_mroute.c
  user/attilio/vmcontention/sys/netinet/ip_output.c
  user/attilio/vmcontention/sys/netinet/ipfw/dn_heap.c
  user/attilio/vmcontention/sys/netinet/ipfw/ip_dn_io.c
  user/attilio/vmcontention/sys/netinet/ipfw/ip_fw2.c
  user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_dynamic.c
  user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_log.c
  user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_pfil.c
  user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_sockopt.c
  user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_table.c
  user/attilio/vmcontention/sys/netinet/libalias/alias_sctp.c
  user/attilio/vmcontention/sys/netinet/sctp_output.c
  user/attilio/vmcontention/sys/netinet/sctp_pcb.c
  user/attilio/vmcontention/sys/netinet/tcp_hostcache.c
  user/attilio/vmcontention/sys/netinet/tcp_input.c
  user/attilio/vmcontention/sys/netinet/tcp_reass.c
  user/attilio/vmcontention/sys/netinet/tcp_syncache.c
  user/attilio/vmcontention/sys/netinet6/icmp6.c
  user/attilio/vmcontention/sys/netinet6/in6_mcast.c
  user/attilio/vmcontention/sys/netinet6/in6_pcb.c
  user/attilio/vmcontention/sys/netinet6/in6_src.c
  user/attilio/vmcontention/sys/netinet6/ip6_mroute.c
  user/attilio/vmcontention/sys/netinet6/ip6_output.c
  user/attilio/vmcontention/sys/netinet6/mld6.c
  user/attilio/vmcontention/sys/netinet6/send.c
  user/attilio/vmcontention/sys/netipx/ipx_proto.c
  user/attilio/vmcontention/sys/netipx/spx_reass.c
  user/attilio/vmcontention/sys/netsmb/smb_conn.c
  user/attilio/vmcontention/sys/netsmb/smb_rq.c
  user/attilio/vmcontention/sys/netsmb/smb_subr.c
  user/attilio/vmcontention/sys/nfs/nfs_lock.c
  user/attilio/vmcontention/sys/nlm/nlm_prot_impl.c
  user/attilio/vmcontention/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
  user/attilio/vmcontention/sys/ofed/include/linux/linux_idr.c
  user/attilio/vmcontention/sys/ofed/include/linux/linux_radix.c
  user/attilio/vmcontention/sys/pc98/conf/DEFAULTS
  user/attilio/vmcontention/sys/powerpc/conf/DEFAULTS
  user/attilio/vmcontention/sys/powerpc/fpu/fpu_emu.c
  user/attilio/vmcontention/sys/powerpc/ofw/ofw_real.c
  user/attilio/vmcontention/sys/powerpc/ofw/ofw_syscons.c
  user/attilio/vmcontention/sys/powerpc/ofw/rtas.c
  user/attilio/vmcontention/sys/powerpc/powermac/dbdma.c
  user/attilio/vmcontention/sys/powerpc/powermac/fcu.c
  user/attilio/vmcontention/sys/powerpc/powermac/powermac_thermal.c
  user/attilio/vmcontention/sys/powerpc/powermac/smu.c
  user/attilio/vmcontention/sys/powerpc/powermac/smusat.c
  user/attilio/vmcontention/sys/powerpc/powerpc/busdma_machdep.c
  user/attilio/vmcontention/sys/powerpc/powerpc/intr_machdep.c
  user/attilio/vmcontention/sys/powerpc/ps3/ps3disk.c
  user/attilio/vmcontention/sys/security/audit/audit.c
  user/attilio/vmcontention/sys/security/mac_biba/mac_biba.c
  user/attilio/vmcontention/sys/security/mac_bsdextended/mac_bsdextended.c
  user/attilio/vmcontention/sys/security/mac_ifoff/mac_ifoff.c
  user/attilio/vmcontention/sys/security/mac_lomac/mac_lomac.c
  user/attilio/vmcontention/sys/security/mac_mls/mac_mls.c
  user/attilio/vmcontention/sys/security/mac_partition/mac_partition.c
  user/attilio/vmcontention/sys/security/mac_portacl/mac_portacl.c
  user/attilio/vmcontention/sys/security/mac_seeotheruids/mac_seeotheruids.c
  user/attilio/vmcontention/sys/security/mac_stub/mac_stub.c
  user/attilio/vmcontention/sys/security/mac_test/mac_test.c
  user/attilio/vmcontention/sys/sparc64/conf/DEFAULTS
  user/attilio/vmcontention/sys/sparc64/sparc64/identcpu.c
  user/attilio/vmcontention/sys/sparc64/sparc64/iommu.c
  user/attilio/vmcontention/sys/sparc64/sparc64/tick.c
  user/attilio/vmcontention/sys/sys/cdefs.h
  user/attilio/vmcontention/sys/sys/event.h
  user/attilio/vmcontention/sys/sys/file.h
  user/attilio/vmcontention/sys/sys/sdt.h
  user/attilio/vmcontention/sys/sys/user.h
  user/attilio/vmcontention/sys/ufs/ffs/ffs_softdep.c
  user/attilio/vmcontention/sys/ufs/ufs/extattr.h
  user/attilio/vmcontention/sys/vm/memguard.c
  user/attilio/vmcontention/sys/vm/redzone.c
  user/attilio/vmcontention/sys/vm/vm_object.c
  user/attilio/vmcontention/sys/vm/vm_page.c
  user/attilio/vmcontention/sys/vm/vm_page.h
  user/attilio/vmcontention/sys/vm/vnode_pager.c
  user/attilio/vmcontention/sys/x86/acpica/acpi_apm.c
  user/attilio/vmcontention/sys/x86/acpica/madt.c
  user/attilio/vmcontention/sys/x86/bios/vpd.c
  user/attilio/vmcontention/sys/x86/x86/busdma_machdep.c
  user/attilio/vmcontention/sys/x86/x86/io_apic.c
  user/attilio/vmcontention/sys/x86/x86/mca.c
  user/attilio/vmcontention/tools/regression/fifo/fifo_misc/fifo_misc.c
  user/attilio/vmcontention/usr.bin/at/at.c
  user/attilio/vmcontention/usr.bin/at/parsetime.c
  user/attilio/vmcontention/usr.bin/banner/banner.c
  user/attilio/vmcontention/usr.bin/c99/c99.c
  user/attilio/vmcontention/usr.bin/cap_mkdb/cap_mkdb.c
  user/attilio/vmcontention/usr.bin/catman/catman.c
  user/attilio/vmcontention/usr.bin/checknr/checknr.c
  user/attilio/vmcontention/usr.bin/chpass/chpass.h
  user/attilio/vmcontention/usr.bin/chpass/table.c
  user/attilio/vmcontention/usr.bin/cmp/extern.h
  user/attilio/vmcontention/usr.bin/col/col.c
  user/attilio/vmcontention/usr.bin/colcrt/colcrt.c
  user/attilio/vmcontention/usr.bin/column/column.c
  user/attilio/vmcontention/usr.bin/comm/comm.c
  user/attilio/vmcontention/usr.bin/compress/compress.c
  user/attilio/vmcontention/usr.bin/cpuset/cpuset.c
  user/attilio/vmcontention/usr.bin/csplit/csplit.c
  user/attilio/vmcontention/usr.bin/cut/cut.c
  user/attilio/vmcontention/usr.bin/dc/Makefile
  user/attilio/vmcontention/usr.bin/dc/dc.c
  user/attilio/vmcontention/usr.bin/du/du.c
  user/attilio/vmcontention/usr.bin/enigma/enigma.c
  user/attilio/vmcontention/usr.bin/expand/expand.c
  user/attilio/vmcontention/usr.bin/fold/fold.c
  user/attilio/vmcontention/usr.bin/fstat/fstat.c
  user/attilio/vmcontention/usr.bin/fstat/fuser.c
  user/attilio/vmcontention/usr.bin/id/id.c
  user/attilio/vmcontention/usr.bin/join/join.c
  user/attilio/vmcontention/usr.bin/lam/lam.c
  user/attilio/vmcontention/usr.bin/last/last.c
  user/attilio/vmcontention/usr.bin/lock/lock.c
  user/attilio/vmcontention/usr.bin/logger/logger.c
  user/attilio/vmcontention/usr.bin/look/look.c
  user/attilio/vmcontention/usr.bin/m4/gnum4.c
  user/attilio/vmcontention/usr.bin/m4/main.c
  user/attilio/vmcontention/usr.bin/make/globals.h
  user/attilio/vmcontention/usr.bin/make/make.1
  user/attilio/vmcontention/usr.bin/ministat/ministat.c
  user/attilio/vmcontention/usr.bin/mt/mt.c
  user/attilio/vmcontention/usr.bin/paste/paste.c
  user/attilio/vmcontention/usr.bin/pr/extern.h
  user/attilio/vmcontention/usr.bin/pr/pr.c
  user/attilio/vmcontention/usr.bin/procstat/procstat.1
  user/attilio/vmcontention/usr.bin/procstat/procstat_vm.c
  user/attilio/vmcontention/usr.bin/quota/quota.c
  user/attilio/vmcontention/usr.bin/rs/rs.c
  user/attilio/vmcontention/usr.bin/ruptime/ruptime.c
  user/attilio/vmcontention/usr.bin/rusers/rusers.c
  user/attilio/vmcontention/usr.bin/rwall/rwall.c
  user/attilio/vmcontention/usr.bin/rwho/rwho.c
  user/attilio/vmcontention/usr.bin/seq/seq.c
  user/attilio/vmcontention/usr.bin/split/split.c
  user/attilio/vmcontention/usr.bin/tail/forward.c
  user/attilio/vmcontention/usr.bin/tail/tail.c
  user/attilio/vmcontention/usr.bin/talk/ctl.c
  user/attilio/vmcontention/usr.bin/talk/init_disp.c
  user/attilio/vmcontention/usr.bin/talk/invite.c
  user/attilio/vmcontention/usr.bin/talk/talk.h
  user/attilio/vmcontention/usr.bin/tcopy/tcopy.c
  user/attilio/vmcontention/usr.bin/tee/tee.c
  user/attilio/vmcontention/usr.bin/tr/tr.c
  user/attilio/vmcontention/usr.bin/tsort/tsort.c
  user/attilio/vmcontention/usr.bin/ul/ul.c
  user/attilio/vmcontention/usr.bin/uname/uname.c
  user/attilio/vmcontention/usr.bin/unexpand/unexpand.c
  user/attilio/vmcontention/usr.bin/unifdef/unifdef.c
  user/attilio/vmcontention/usr.bin/uniq/uniq.c
  user/attilio/vmcontention/usr.bin/units/units.c
  user/attilio/vmcontention/usr.bin/usbhidaction/usbhidaction.c
  user/attilio/vmcontention/usr.bin/usbhidctl/usbhid.c
  user/attilio/vmcontention/usr.bin/uuencode/uuencode.c
  user/attilio/vmcontention/usr.bin/vis/vis.c
  user/attilio/vmcontention/usr.bin/w/w.c
  user/attilio/vmcontention/usr.bin/wall/wall.c
  user/attilio/vmcontention/usr.bin/wc/wc.c
  user/attilio/vmcontention/usr.bin/whereis/whereis.c
  user/attilio/vmcontention/usr.bin/which/which.c
  user/attilio/vmcontention/usr.bin/whois/whois.c
  user/attilio/vmcontention/usr.bin/xinstall/xinstall.c
  user/attilio/vmcontention/usr.bin/xlint/xlint/xlint.c
  user/attilio/vmcontention/usr.bin/xstr/xstr.c
  user/attilio/vmcontention/usr.sbin/apm/apm.c
  user/attilio/vmcontention/usr.sbin/boot0cfg/boot0cfg.8
  user/attilio/vmcontention/usr.sbin/boot0cfg/boot0cfg.c
  user/attilio/vmcontention/usr.sbin/cdcontrol/cdcontrol.c
  user/attilio/vmcontention/usr.sbin/chown/chown.c
  user/attilio/vmcontention/usr.sbin/chroot/chroot.c
  user/attilio/vmcontention/usr.sbin/devinfo/devinfo.c
  user/attilio/vmcontention/usr.sbin/fdread/fdread.c
  user/attilio/vmcontention/usr.sbin/memcontrol/memcontrol.c
  user/attilio/vmcontention/usr.sbin/mixer/mixer.c
  user/attilio/vmcontention/usr.sbin/moused/moused.c
  user/attilio/vmcontention/usr.sbin/mptable/mptable.c
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-disk.sh
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-networking.sh
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-unmount.sh
  user/attilio/vmcontention/usr.sbin/pwd_mkdb/pwd_mkdb.c
  user/attilio/vmcontention/usr.sbin/rip6query/rip6query.c
  user/attilio/vmcontention/usr.sbin/rmt/rmt.c
  user/attilio/vmcontention/usr.sbin/snapinfo/snapinfo.c
  user/attilio/vmcontention/usr.sbin/spray/spray.c
  user/attilio/vmcontention/usr.sbin/timed/timed/readmsg.c
  user/attilio/vmcontention/usr.sbin/timed/timed/timed.c
Directory Properties:
  user/attilio/vmcontention/   (props changed)
  user/attilio/vmcontention/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmcontention/contrib/bind9/   (props changed)
  user/attilio/vmcontention/contrib/binutils/   (props changed)
  user/attilio/vmcontention/contrib/bzip2/   (props changed)
  user/attilio/vmcontention/contrib/com_err/   (props changed)
  user/attilio/vmcontention/contrib/compiler-rt/   (props changed)
  user/attilio/vmcontention/contrib/dialog/   (props changed)
  user/attilio/vmcontention/contrib/ee/   (props changed)
  user/attilio/vmcontention/contrib/expat/   (props changed)
  user/attilio/vmcontention/contrib/file/   (props changed)
  user/attilio/vmcontention/contrib/gcc/   (props changed)
  user/attilio/vmcontention/contrib/gdb/   (props changed)
  user/attilio/vmcontention/contrib/gdtoa/   (props changed)
  user/attilio/vmcontention/contrib/gnu-sort/   (props changed)
  user/attilio/vmcontention/contrib/groff/   (props changed)
  user/attilio/vmcontention/contrib/less/   (props changed)
  user/attilio/vmcontention/contrib/libpcap/   (props changed)
  user/attilio/vmcontention/contrib/libstdc++/   (props changed)
  user/attilio/vmcontention/contrib/llvm/   (props changed)
  user/attilio/vmcontention/contrib/llvm/tools/clang/   (props changed)
  user/attilio/vmcontention/contrib/ncurses/   (props changed)
  user/attilio/vmcontention/contrib/netcat/   (props changed)
  user/attilio/vmcontention/contrib/ntp/   (props changed)
  user/attilio/vmcontention/contrib/one-true-awk/   (props changed)
  user/attilio/vmcontention/contrib/openbsm/   (props changed)
  user/attilio/vmcontention/contrib/openpam/   (props changed)
  user/attilio/vmcontention/contrib/openresolv/   (props changed)
  user/attilio/vmcontention/contrib/pf/   (props changed)
  user/attilio/vmcontention/contrib/sendmail/   (props changed)
  user/attilio/vmcontention/contrib/tcpdump/   (props changed)
  user/attilio/vmcontention/contrib/tcsh/   (props changed)
  user/attilio/vmcontention/contrib/tnftp/   (props changed)
  user/attilio/vmcontention/contrib/top/   (props changed)
  user/attilio/vmcontention/contrib/top/install-sh   (props changed)
  user/attilio/vmcontention/contrib/tzcode/stdtime/   (props changed)
  user/attilio/vmcontention/contrib/tzcode/zic/   (props changed)
  user/attilio/vmcontention/contrib/tzdata/   (props changed)
  user/attilio/vmcontention/contrib/wpa/   (props changed)
  user/attilio/vmcontention/contrib/xz/   (props changed)
  user/attilio/vmcontention/crypto/heimdal/   (props changed)
  user/attilio/vmcontention/crypto/openssh/   (props changed)
  user/attilio/vmcontention/crypto/openssl/   (props changed)
  user/attilio/vmcontention/gnu/lib/   (props changed)
  user/attilio/vmcontention/gnu/usr.bin/binutils/   (props changed)
  user/attilio/vmcontention/gnu/usr.bin/cc/cc_tools/   (props changed)
  user/attilio/vmcontention/gnu/usr.bin/gdb/   (props changed)
  user/attilio/vmcontention/lib/libc/   (props changed)
  user/attilio/vmcontention/lib/libc/stdtime/   (props changed)
  user/attilio/vmcontention/lib/libutil/   (props changed)
  user/attilio/vmcontention/lib/libz/   (props changed)
  user/attilio/vmcontention/sbin/   (props changed)
  user/attilio/vmcontention/sbin/ipfw/   (props changed)
  user/attilio/vmcontention/share/mk/bsd.arch.inc.mk   (props changed)
  user/attilio/vmcontention/share/zoneinfo/   (props changed)
  user/attilio/vmcontention/sys/   (props changed)
  user/attilio/vmcontention/sys/amd64/include/xen/   (props changed)
  user/attilio/vmcontention/sys/boot/   (props changed)
  user/attilio/vmcontention/sys/boot/i386/efi/   (props changed)
  user/attilio/vmcontention/sys/boot/ia64/efi/   (props changed)
  user/attilio/vmcontention/sys/boot/ia64/ski/   (props changed)
  user/attilio/vmcontention/sys/boot/powerpc/boot1.chrp/   (props changed)
  user/attilio/vmcontention/sys/boot/powerpc/ofw/   (props changed)
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmcontention/sys/conf/   (props changed)
  user/attilio/vmcontention/sys/contrib/dev/acpica/   (props changed)
  user/attilio/vmcontention/sys/contrib/octeon-sdk/   (props changed)
  user/attilio/vmcontention/sys/contrib/pf/   (props changed)
  user/attilio/vmcontention/sys/contrib/x86emu/   (props changed)
  user/attilio/vmcontention/usr.bin/calendar/   (props changed)
  user/attilio/vmcontention/usr.bin/csup/   (props changed)
  user/attilio/vmcontention/usr.bin/procstat/   (props changed)
  user/attilio/vmcontention/usr.sbin/ndiscvt/   (props changed)
  user/attilio/vmcontention/usr.sbin/rtadvctl/   (props changed)
  user/attilio/vmcontention/usr.sbin/rtadvd/   (props changed)
  user/attilio/vmcontention/usr.sbin/rtsold/   (props changed)
  user/attilio/vmcontention/usr.sbin/zic/   (props changed)

Modified: user/attilio/vmcontention/Makefile.inc1
==============================================================================
--- user/attilio/vmcontention/Makefile.inc1	Tue Nov  8 10:18:07 2011	(r227333)
+++ user/attilio/vmcontention/Makefile.inc1	Tue Nov  8 11:08:40 2011	(r227334)
@@ -313,7 +313,8 @@ LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTR
 
 LIB32WMAKE=	${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
 		-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \
-		-DWITHOUT_HTML -DNO_CTF -DNO_LINT DESTDIR=${LIB32TMP}
+		-DWITHOUT_HTML -DNO_CTF -DNO_LINT -ECC -ECXX -EAS -ELD \
+		DESTDIR=${LIB32TMP}
 LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS
 .endif
 

Modified: user/attilio/vmcontention/ObsoleteFiles.inc
==============================================================================
--- user/attilio/vmcontention/ObsoleteFiles.inc	Tue Nov  8 10:18:07 2011	(r227333)
+++ user/attilio/vmcontention/ObsoleteFiles.inc	Tue Nov  8 11:08:40 2011	(r227334)
@@ -44,10 +44,12 @@ OLD_FILES+=usr/share/man/man8/sysinstall
 OLD_FILES+=usr/lib/libftpio.a
 OLD_FILES+=usr/lib/libftpio.so
 OLD_LIBS+=usr/lib/libftpio.so.8
+OLD_FILES+=usr/lib/libftpio_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libftpio.a
 OLD_FILES+=usr/lib32/libftpio.so
 OLD_LIBS+=usr/lib32/libftpio.so.8
+OLD_FILES+=usr/lib32/libftpio_p.a
 .endif
 OLD_FILES+=usr/include/ftpio.h
 OLD_FILES+=usr/share/man/man3/ftpio.3.gz
@@ -77,11 +79,22 @@ OLD_LIBS+=usr/lib32/libopie.so.6
 OLD_LIBS+=usr/lib32/librtld_db.so.1
 OLD_LIBS+=usr/lib32/libtacplus.so.4
 .endif
+# 20110817: no more acd.4, ad.4, afd.4 and ast.4
+OLD_FILES+=usr/share/man/man4/acd.4.gz
+OLD_FILES+=usr/share/man/man4/ad.4.gz
+OLD_FILES+=usr/share/man/man4/afd.4.gz
+OLD_FILES+=usr/share/man/man4/ast.4.gz
 # 20110718: no longer useful in the age of rc.d
 OLD_FILES+=usr/sbin/named.reconfig
 OLD_FILES+=usr/sbin/named.reload
+OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz
+OLD_FILES+=usr/share/man/man8/named.reload.8.gz
 # 20110716: bind 9.8.0 import
 OLD_LIBS+=usr/lib/liblwres.so.50
+OLD_FILES+=usr/share/doc/bind9/KNOWN-DEFECTS
+OLD_FILES+=usr/share/doc/bind9/NSEC3-NOTES
+OLD_FILES+=usr/share/doc/bind9/README.idnkit
+OLD_FILES+=usr/share/doc/bind9/README.pkcs11
 # 20110709: vm_map_clean.9 -> vm_map_sync.9
 OLD_FILES+=usr/share/man/man9/vm_map_clean.9.gz
 # 20110709: Catch up with removal of these functions.

Modified: user/attilio/vmcontention/UPDATING
==============================================================================
--- user/attilio/vmcontention/UPDATING	Tue Nov  8 10:18:07 2011	(r227333)
+++ user/attilio/vmcontention/UPDATING	Tue Nov  8 11:08:40 2011	(r227334)
@@ -22,6 +22,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20111108:
+	The option VFS_ALLOW_NONMPSAFE option has been added in order to
+	explicitely support non-MPSAFE filesystems.
+	It is on by default for all supported platform at this present
+	time.
+
 20111101:
 	The broken amd(4) driver has been replaced with esp(4) in the amd64,
 	i386 and pc98 GENERIC kernel configuration files.

Modified: user/attilio/vmcontention/bin/sh/sh.1
==============================================================================
--- user/attilio/vmcontention/bin/sh/sh.1	Tue Nov  8 10:18:07 2011	(r227333)
+++ user/attilio/vmcontention/bin/sh/sh.1	Tue Nov  8 11:08:40 2011	(r227334)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd July 10, 2011
+.Dd November 5, 2011
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1160,6 +1160,11 @@ of alphabetics, numerics, and underscore
 The first letter of a variable name must not be numeric.
 A parameter can also be denoted by a number
 or a special character as explained below.
+.Pp
+Assignments are expanded differently from other words:
+tilde expansion is also performed after the equals sign and after any colon
+and usernames are also terminated by colons,
+and field splitting and pathname expansion are not performed.
 .Ss Positional Parameters
 A positional parameter is a parameter denoted by a number greater than zero.
 The shell sets these initially to the values of its command line
@@ -1273,11 +1278,15 @@ used in tilde expansion and as a default
 built-in.
 .It Va IFS
 Input Field Separators.
-This is normally set to
+The default value is
 .Aq space ,
 .Aq tab ,
 and
-.Aq newline .
+.Aq newline
+in that order.
+This default also applies if
+.Va IFS
+is unset, but not if it is set to the empty string.
 See the
 .Sx White Space Splitting
 section for more details.
@@ -1423,12 +1432,12 @@ part of the name.
 If a parameter expansion occurs inside double-quotes:
 .Bl -enum
 .It
-Pathname expansion is not performed on the results of the
-expansion.
-.It
 Field splitting is not performed on the results of the
 expansion, with the exception of the special parameter
 .Va @ .
+.It
+Pathname expansion is not performed on the results of the
+expansion.
 .El
 .Pp
 In addition, a parameter expansion can be modified by using one of the
@@ -1641,16 +1650,51 @@ and contain integer constants.
 .Pp
 The result of the expression is substituted in decimal.
 .Ss White Space Splitting (Field Splitting)
-After parameter expansion, command substitution, and
+In certain contexts,
+after parameter expansion, command substitution, and
 arithmetic expansion the shell scans the results of
 expansions and substitutions that did not occur in double-quotes for
 field splitting and multiple fields can result.
 .Pp
-The shell treats each character of the
+Characters in
+.Va IFS
+that are whitespace
+.Po
+.Aq space ,
+.Aq tab ,
+and
+.Aq newline
+.Pc
+are treated differently from other characters in
+.Va IFS .
+.Pp
+Whitespace in
+.Va IFS
+at the beginning or end of a word is discarded.
+.Pp
+Subsequently, a field is delimited by either
+.Bl -enum
+.It
+a non-whitespace character in
+.Va IFS
+with any whitespace in
+.Va IFS
+surrounding it, or
+.It
+one or more whitespace characters in
+.Va IFS .
+.El
+.Pp
+If a word ends with a non-whitespace character in
+.Va IFS ,
+there is no empty field after this character.
+.Pp
+If no field is delimited, the word is discarded.
+In particular, if a word consists solely of an unquoted substitution
+and the result of the substitution is null,
+it is removed by field splitting even if
 .Va IFS
-variable as a delimiter and uses
-the delimiters to split the results of parameter expansion and command
-substitution into fields.
+is null.
 .Ss Pathname Expansion (File Name Generation)
 Unless the
 .Fl f

Modified: user/attilio/vmcontention/etc/rc.d/nfsd
==============================================================================
--- user/attilio/vmcontention/etc/rc.d/nfsd	Tue Nov  8 10:18:07 2011	(r227333)
+++ user/attilio/vmcontention/etc/rc.d/nfsd	Tue Nov  8 11:08:40 2011	(r227334)
@@ -29,6 +29,8 @@ nfsd_precmd()
 		if checkyesno nfs_reserved_port_only; then
 			echo 'NFS on reserved port only=YES'
 			sysctl vfs.nfsrv.nfs_privport=1 > /dev/null
+		else
+			sysctl vfs.nfsrv.nfs_privport=0 > /dev/null
 		fi
 	else
 		rc_flags="${nfs_server_flags}"
@@ -40,9 +42,12 @@ nfsd_precmd()
 		if checkyesno nfs_reserved_port_only; then
 			echo 'NFS on reserved port only=YES'
 			sysctl vfs.nfsd.nfs_privport=1 > /dev/null
+		else
+			sysctl vfs.nfsd.nfs_privport=0 > /dev/null
 		fi
 
 		if checkyesno nfsv4_server_enable; then
+			sysctl vfs.nfsd.server_max_nfsvers=4 > /dev/null
 			if ! checkyesno nfsuserd_enable  && \
 			    ! /etc/rc.d/nfsuserd forcestatus 1>/dev/null 2>&1
 			then

Modified: user/attilio/vmcontention/games/bcd/bcd.c
==============================================================================
--- user/attilio/vmcontention/games/bcd/bcd.c	Tue Nov  8 10:18:07 2011	(r227333)
+++ user/attilio/vmcontention/games/bcd/bcd.c	Tue Nov  8 11:08:40 2011	(r227334)
@@ -82,7 +82,7 @@ static const char rcsid[] =
 #include 
 #include 
 
-u_short holes[256] = {
+static u_short holes[256] = {
     0x0,	 0x0,	  0x0,	   0x0,	    0x0,     0x0,     0x0,     0x0,
     0x0,	 0x0,	  0x0,	   0x0,	    0x0,     0x0,     0x0,     0x0,
     0x0,	 0x0,	  0x0,	   0x0,	    0x0,     0x0,     0x0,     0x0,
@@ -117,7 +117,7 @@ u_short holes[256] = {
     0x202,	 0x201,	  0x082,   0x806,   0x822,   0x600,   0x282,   0x0
 };
 
-void printcard(char *);
+static void printcard(char *);
 
 /*
  * i'th bit of w.
@@ -148,7 +148,7 @@ main(int argc, char **argv)
 
 #define	COLUMNS	48
 
-void
+static void
 printcard(char *str)
 {
 	static char rowchars[] = "   123456789";

Modified: user/attilio/vmcontention/games/caesar/caesar.c
==============================================================================
--- user/attilio/vmcontention/games/caesar/caesar.c	Tue Nov  8 10:18:07 2011	(r227333)
+++ user/attilio/vmcontention/games/caesar/caesar.c	Tue Nov  8 11:08:40 2011	(r227334)
@@ -67,13 +67,13 @@ __FBSDID("$FreeBSD$");
  * letter frequencies (taken from some unix(tm) documentation)
  * (unix is a trademark of Bell Laboratories)
  */
-double stdf[26] = {
+static double stdf[26] = {
 	7.97, 1.35, 3.61, 4.78, 12.37, 2.01, 1.46, 4.49, 6.39, 0.04,
 	0.42, 3.81, 2.69, 5.92,  6.96, 2.91, 0.08, 6.63, 8.77, 9.68,
 	2.62, 0.81, 1.88, 0.23,  2.07, 0.06,
 };
 
-void printit(char *);
+static void printit(char *);
 
 int
 main(int argc, char **argv)
@@ -147,7 +147,7 @@ main(int argc, char **argv)
 	exit(0);
 }
 
-void
+static void
 printit(char *arg)
 {
 	int ch, rot;

Modified: user/attilio/vmcontention/games/fortune/fortune/fortune.c
==============================================================================
--- user/attilio/vmcontention/games/fortune/fortune/fortune.c	Tue Nov  8 10:18:07 2011	(r227333)
+++ user/attilio/vmcontention/games/fortune/fortune/fortune.c	Tue Nov  8 11:08:40 2011	(r227334)
@@ -97,73 +97,71 @@ typedef struct fd {
 	struct fd	*next, *prev;
 } FILEDESC;
 
-bool	Found_one;			/* did we find a match? */
-bool	Find_files	= FALSE;	/* just find a list of proper fortune files */
-bool	Fortunes_only   = FALSE;	/* check only "fortunes" files */
-bool	Wait		= FALSE;	/* wait desired after fortune */
-bool	Short_only	= FALSE;	/* short fortune desired */
-bool	Long_only	= FALSE;	/* long fortune desired */
-bool	Offend		= FALSE;	/* offensive fortunes only */
-bool	All_forts	= FALSE;	/* any fortune allowed */
-bool	Equal_probs	= FALSE;	/* scatter un-allocted prob equally */
-bool	Match		= FALSE;	/* dump fortunes matching a pattern */
+static bool	Found_one;		/* did we find a match? */
+static bool	Find_files = FALSE;	/* just find a list of proper fortune files */
+static bool	Fortunes_only = FALSE;	/* check only "fortunes" files */
+static bool	Wait = FALSE;		/* wait desired after fortune */
+static bool	Short_only = FALSE;	/* short fortune desired */
+static bool	Long_only = FALSE;	/* long fortune desired */
+static bool	Offend = FALSE;		/* offensive fortunes only */
+static bool	All_forts = FALSE;	/* any fortune allowed */
+static bool	Equal_probs = FALSE;	/* scatter un-allocted prob equally */
+static bool	Match = FALSE;		/* dump fortunes matching a pattern */
 #ifdef DEBUG
-bool	Debug = FALSE;			/* print debug messages */
+static bool	Debug = FALSE;		/* print debug messages */
 #endif
 
-char	*Fortbuf = NULL;			/* fortune buffer for -m */
+static char	*Fortbuf = NULL;	/* fortune buffer for -m */
 
-int	Fort_len = 0;
+static int	Fort_len = 0;
 
-off_t	Seekpts[2];                     /* seek pointers to fortunes */
+static off_t	Seekpts[2];		/* seek pointers to fortunes */
 
-FILEDESC	*File_list = NULL,	/* Head of file list */
+static FILEDESC	*File_list = NULL,	/* Head of file list */
 		*File_tail = NULL;	/* Tail of file list */
-FILEDESC	*Fortfile;		/* Fortune file to use */
+static FILEDESC	*Fortfile;		/* Fortune file to use */
 
-STRFILE		Noprob_tbl;		/* sum of data for all no prob files */
+static STRFILE	Noprob_tbl;		/* sum of data for all no prob files */
 
-const char	*Fortune_path;
-char	**Fortune_path_arr;
+static const char *Fortune_path;
+static char	**Fortune_path_arr;
 
-int	 add_dir(FILEDESC *);
-int	 add_file(int, const char *, const char *, FILEDESC **, FILEDESC **,
-	    FILEDESC *);
-void	 all_forts(FILEDESC *, char *);
-char	*copy(const char *, u_int);
-void	 display(FILEDESC *);
-void	 do_free(void *);
-void	*do_malloc(u_int);
-int	 form_file_list(char **, int);
-int	 fortlen(void);
-void	 get_fort(void);
-void	 get_pos(FILEDESC *);
-void	 get_tbl(FILEDESC *);
-void	 getargs(int, char *[]);
-void	 getpath(void);
-void	 init_prob(void);
-int	 is_dir(const char *);
-int	 is_fortfile(const char *, char **, char **, int);
-int	 is_off_name(const char *);
-int	 max(int, int);
-FILEDESC *
-	 new_fp(void);
-char	*off_name(const char *);
-void	 open_dat(FILEDESC *);
-void	 open_fp(FILEDESC *);
-FILEDESC *
-	 pick_child(FILEDESC *);
-void	 print_file_list(void);
-void	 print_list(FILEDESC *, int);
-void	 sum_noprobs(FILEDESC *);
-void	 sum_tbl(STRFILE *, STRFILE *);
-void	 usage(void);
-void	 zero_tbl(STRFILE *);
-
-char	*conv_pat(char *);
-int	 find_matches(void);
-void	 matches_in_list(FILEDESC *);
-int	 maxlen_in_list(FILEDESC *);
+static int	 add_dir(FILEDESC *);
+static int	 add_file(int, const char *, const char *, FILEDESC **,
+		     FILEDESC **, FILEDESC *);
+static void	 all_forts(FILEDESC *, char *);
+static char	*copy(const char *, u_int);
+static void	 display(FILEDESC *);
+static void	 do_free(void *);
+static void	*do_malloc(u_int);
+static int	 form_file_list(char **, int);
+static int	 fortlen(void);
+static void	 get_fort(void);
+static void	 get_pos(FILEDESC *);
+static void	 get_tbl(FILEDESC *);
+static void	 getargs(int, char *[]);
+static void	 getpath(void);
+static void	 init_prob(void);
+static int	 is_dir(const char *);
+static int	 is_fortfile(const char *, char **, char **, int);
+static int	 is_off_name(const char *);
+static int	 max(int, int);
+static FILEDESC *new_fp(void);
+static char	*off_name(const char *);
+static void	 open_dat(FILEDESC *);
+static void	 open_fp(FILEDESC *);
+static FILEDESC *pick_child(FILEDESC *);
+static void	 print_file_list(void);
+static void	 print_list(FILEDESC *, int);
+static void	 sum_noprobs(FILEDESC *);
+static void	 sum_tbl(STRFILE *, STRFILE *);
+static void	 usage(void);
+static void	 zero_tbl(STRFILE *);
+
+static char	*conv_pat(char *);
+static int	 find_matches(void);
+static void	 matches_in_list(FILEDESC *);
+static int	 maxlen_in_list(FILEDESC *);
 
 static regex_t Re_pat;
 
@@ -219,7 +217,7 @@ main(int argc, char *argv[])
 	exit(0);
 }
 
-void
+static void
 display(FILEDESC *fp)
 {
 	char   *p;
@@ -252,7 +250,7 @@ display(FILEDESC *fp)
  * fortlen:
  *	Return the length of the fortune.
  */
-int
+static int
 fortlen(void)
 {
 	int	nchar;
@@ -276,7 +274,7 @@ fortlen(void)
 /*
  *	This routine evaluates the arguments on the command line
  */
-void
+static void
 getargs(int argc, char *argv[])
 {
 	int	ignore_case;
@@ -362,7 +360,7 @@ getargs(int argc, char *argv[])
  * form_file_list:
  *	Form the file list from the file specifications.
  */
-int
+static int
 form_file_list(char **files, int file_cnt)
 {
 	int	i, percent;
@@ -456,7 +454,7 @@ form_file_list(char **files, int file_cn
  * add_file:
  *	Add a file to the file list.
  */
-int
+static int
 add_file(int percent, const char *file, const char *dir, FILEDESC **head,
     FILEDESC **tail, FILEDESC *parent)
 {
@@ -598,7 +596,7 @@ over:
  * new_fp:
  *	Return a pointer to an initialized new FILEDESC.
  */
-FILEDESC *
+static FILEDESC *
 new_fp(void)
 {
 	FILEDESC	*fp;
@@ -624,7 +622,7 @@ new_fp(void)
  * off_name:
  *	Return a pointer to the offensive version of a file of this name.
  */
-char *
+static char *
 off_name(const char *file)
 {
 	char	*new;
@@ -638,7 +636,7 @@ off_name(const char *file)
  * is_off_name:
  *	Is the file an offensive-style name?
  */
-int
+static int
 is_off_name(const char *file)
 {
 	int	len;
@@ -653,7 +651,7 @@ is_off_name(const char *file)
  *	Modify a FILEDESC element to be the parent of two children if
  *	there are two children to be a parent of.
  */
-void
+static void
 all_forts(FILEDESC *fp, char *offensive)
 {
 	char		*sp;
@@ -701,7 +699,7 @@ all_forts(FILEDESC *fp, char *offensive)
  * add_dir:
  *	Add the contents of an entire directory.
  */
-int
+static int
 add_dir(FILEDESC *fp)
 {
 	DIR		*dir;
@@ -740,7 +738,7 @@ add_dir(FILEDESC *fp)
  * is_dir:
  *	Return TRUE if the file is a directory, FALSE otherwise.
  */
-int
+static int
 is_dir(const char *file)
 {
 	struct stat	sbuf;
@@ -759,7 +757,7 @@ is_dir(const char *file)
  *	suffixes, as contained in suflist[], are ruled out.
  */
 /* ARGSUSED */
-int
+static int
 is_fortfile(const char *file, char **datp, char **posp, int check_for_offend)
 {
 	int	i;
@@ -840,7 +838,7 @@ is_fortfile(const char *file, char **dat
  * copy:
  *	Return a malloc()'ed copy of the string
  */
-char *
+static char *
 copy(const char *str, unsigned int len)
 {
 	char *new, *sp;
@@ -858,7 +856,7 @@ copy(const char *str, unsigned int len)
  * do_malloc:
  *	Do a malloc, checking for NULL return.
  */
-void *
+static void *
 do_malloc(unsigned int size)
 {
 	void *new;
@@ -875,7 +873,7 @@ do_malloc(unsigned int size)
  * do_free:
  *	Free malloc'ed space, if any.
  */
-void
+static void
 do_free(void *ptr)
 {
 	if (ptr != NULL)
@@ -886,7 +884,7 @@ do_free(void *ptr)
  * init_prob:
  *	Initialize the fortune probabilities.
  */
-void
+static void
 init_prob(void)
 {
 	FILEDESC       *fp, *last = NULL;
@@ -955,7 +953,7 @@ init_prob(void)
  * get_fort:
  *	Get the fortune data file's seek pointer for the next fortune.
  */
-void
+static void
 get_fort(void)
 {
 	FILEDESC	*fp;
@@ -1018,7 +1016,7 @@ get_fort(void)
  * pick_child
  *	Pick a child from a chosen parent.
  */
-FILEDESC *
+static FILEDESC *
 pick_child(FILEDESC *parent)
 {
 	FILEDESC	*fp;
@@ -1054,7 +1052,7 @@ pick_child(FILEDESC *parent)
  * sum_noprobs:
  *	Sum up all the noprob probabilities, starting with fp.
  */
-void
+static void
 sum_noprobs(FILEDESC *fp)
 {
 	static bool	did_noprobs = FALSE;
@@ -1070,7 +1068,7 @@ sum_noprobs(FILEDESC *fp)
 	did_noprobs = TRUE;
 }
 
-int
+static int
 max(int i, int j)
 {
 	return (i >= j ? i : j);
@@ -1080,7 +1078,7 @@ max(int i, int j)
  * open_fp:
  *	Assocatiate a FILE * with the given FILEDESC.
  */
-void
+static void
 open_fp(FILEDESC *fp)
 {
 	if (fp->inf == NULL && (fp->inf = fdopen(fp->fd, "r")) == NULL) {
@@ -1093,7 +1091,7 @@ open_fp(FILEDESC *fp)
  * open_dat:
  *	Open up the dat file if we need to.
  */
-void
+static void
 open_dat(FILEDESC *fp)
 {
 	if (fp->datfd < 0 && (fp->datfd = open(fp->datfile, O_RDONLY)) < 0) {
@@ -1107,7 +1105,7 @@ open_dat(FILEDESC *fp)
  *	Get the position from the pos file, if there is one.  If not,
  *	return a random number.
  */
-void
+static void
 get_pos(FILEDESC *fp)
 {
 #ifdef OK_TO_WRITE_DISK
@@ -1137,7 +1135,7 @@ get_pos(FILEDESC *fp)
  * get_tbl:
  *	Get the tbl data file the datfile.
  */
-void
+static void
 get_tbl(FILEDESC *fp)
 {
 	int		fd;
@@ -1176,7 +1174,7 @@ get_tbl(FILEDESC *fp)
  * zero_tbl:
  *	Zero out the fields we care about in a tbl structure.
  */
-void
+static void
 zero_tbl(STRFILE *tp)
 {
 	tp->str_numstr = 0;
@@ -1188,7 +1186,7 @@ zero_tbl(STRFILE *tp)
  * sum_tbl:
  *	Merge the tbl data of t2 into t1.
  */
-void
+static void
 sum_tbl(STRFILE *t1, STRFILE *t2)
 {
 	t1->str_numstr += t2->str_numstr;
@@ -1204,7 +1202,7 @@ sum_tbl(STRFILE *t1, STRFILE *t2)
  * print_file_list:
  *	Print out the file list
  */
-void
+static void
 print_file_list(void)
 {
 	print_list(File_list, 0);
@@ -1214,7 +1212,7 @@ print_file_list(void)
  * print_list:
  *	Print out the actual list, recursively.
  */
-void
+static void
 print_list(FILEDESC *list, int lev)
 {
 	while (list != NULL) {
@@ -1237,7 +1235,7 @@ print_list(FILEDESC *list, int lev)
  * conv_pat:
  *	Convert the pattern to an ignore-case equivalent.
  */
-char *
+static char *
 conv_pat(char *orig)
 {
 	char		*sp;
@@ -1280,7 +1278,7 @@ conv_pat(char *orig)
  * find_matches:
  *	Find all the fortunes which match the pattern we've been given.
  */
-int
+static int
 find_matches(void)
 {
 	Fort_len = maxlen_in_list(File_list);
@@ -1298,7 +1296,7 @@ find_matches(void)
  * maxlen_in_list
  *	Return the maximum fortune len in the file list.
  */
-int
+static int
 maxlen_in_list(FILEDESC *list)
 {
 	FILEDESC	*fp;
@@ -1324,7 +1322,7 @@ maxlen_in_list(FILEDESC *list)
  * matches_in_list
  *	Print out the matches from the files in the list.
  */
-void
+static void
 matches_in_list(FILEDESC *list)
 {
 	char           *sp, *p;
@@ -1375,7 +1373,7 @@ matches_in_list(FILEDESC *list)
 	}
 }
 
-void
+static void
 usage(void)
 {
 	(void) fprintf(stderr, "fortune [-a");
@@ -1394,7 +1392,7 @@ usage(void)
  *	if not set, use the compiled in FORTDIR.
  */
 
-void
+static void
 getpath(void)
 {
 	int	nstr, foundenv;

Modified: user/attilio/vmcontention/games/fortune/unstr/unstr.c
==============================================================================
--- user/attilio/vmcontention/games/fortune/unstr/unstr.c	Tue Nov  8 10:18:07 2011	(r227333)
+++ user/attilio/vmcontention/games/fortune/unstr/unstr.c	Tue Nov  8 11:08:40 2011	(r227334)
@@ -67,13 +67,13 @@ __FBSDID("$FreeBSD$");
 
 #include "strfile.h"
 
-char	*Infile,			/* name of input file */
-	Datafile[MAXPATHLEN],		/* name of data file */
-	Delimch;			/* delimiter character */
+static char	*Infile,		/* name of input file */
+		Datafile[MAXPATHLEN],	/* name of data file */
+		Delimch;		/* delimiter character */
 
-FILE	*Inf, *Dataf;
+static FILE	*Inf, *Dataf;
 
-void order_unstr(STRFILE *);
+static void order_unstr(STRFILE *);
 
 /* ARGSUSED */
 int
@@ -107,7 +107,7 @@ main(int argc, char *argv[])
 	exit(0);
 }
 
-void
+static void
 order_unstr(STRFILE *tbl)
 {
 	uint32_t i;

Modified: user/attilio/vmcontention/games/grdc/grdc.c
==============================================================================
--- user/attilio/vmcontention/games/grdc/grdc.c	Tue Nov  8 10:18:07 2011	(r227333)
+++ user/attilio/vmcontention/games/grdc/grdc.c	Tue Nov  8 11:08:40 2011	(r227334)
@@ -26,29 +26,30 @@
 #define XLENGTH 58
 #define YDEPTH  7
 
-struct timespec now;
-struct tm *tm;
+static struct timespec now;
+static struct tm *tm;
 
-short disp[11] = {
+static short disp[11] = {
 	075557, 011111, 071747, 071717, 055711,
 	074717, 074757, 071111, 075757, 075717, 002020
 };
-long old[6], next[6], new[6], mask;
+static long old[6], next[6], new[6], mask;
 
-volatile sig_atomic_t sigtermed;
+static volatile sig_atomic_t sigtermed;
 
-int hascolor = 0;
+static int hascolor = 0;
 
-void set(int, int);
-void standt(int);
-void movto(int, int);
-void sighndl(int);
-void usage(void);
+static void set(int, int);
+static void standt(int);
+static void movto(int, int);
+static void sighndl(int);
+static void usage(void);
 
-void
+static void
 sighndl(int signo)
 {
-	sigtermed=signo;
+
+	sigtermed = signo;
 }
 
 int
@@ -225,7 +226,7 @@ main(int argc, char *argv[])
 	return(0);
 }
 
-void
+static void
 set(int t, int n)
 {
 	int i, m;
@@ -239,7 +240,7 @@ set(int t, int n)
 		mask |= m;
 }
 
-void
+static void
 standt(int on)
 {
 	if (on) {
@@ -257,13 +258,13 @@ standt(int on)
 	}
 }
 
-void
+static void
 movto(int line, int col)
 {
 	move(line, col);
 }
 
-void
+static void
 usage(void)
 {
 

Modified: user/attilio/vmcontention/games/morse/morse.c
==============================================================================
--- user/attilio/vmcontention/games/morse/morse.c	Tue Nov  8 10:18:07 2011	(r227333)
+++ user/attilio/vmcontention/games/morse/morse.c	Tue Nov  8 11:08:40 2011	(r227334)
@@ -261,33 +261,33 @@ static const struct morsetab koi8rtab[] 
 	{'\0', ""}
 };
 
-void            show(const char *), play(const char *), morse(char);
-void		ttyout(const char *);
-void		sighandler(int);
+static void	show(const char *), play(const char *), morse(char);
+static void	ttyout(const char *);
+static void	sighandler(int);
 
 #define GETOPTOPTS "c:d:ef:lsw:"
 #define USAGE \
 "usage: morse [-els] [-d device] [-w speed] [-c speed] [-f frequency] [string ...]\n"
 
-static int      pflag, lflag, sflag, eflag;
-static int      wpm = 20;	/* effective words per minute */
-static int      cpm;		/* effective words per minute between
+static int	pflag, lflag, sflag, eflag;
+static int	wpm = 20;	/* effective words per minute */
+static int	cpm;		/* effective words per minute between
 				 * characters */
 #define FREQUENCY 600
-static int      freq = FREQUENCY;
+static int	freq = FREQUENCY;
 static char	*device;	/* for tty-controlled generator */
 
 #define DASH_LEN 3
 #define CHAR_SPACE 3
 #define WORD_SPACE (7 - CHAR_SPACE - 1)
-static float    dot_clock;
-static float    cdot_clock;
-int             spkr, line;
-struct termios	otty, ntty;
-int		olflags;
+static float	dot_clock;
+static float	cdot_clock;
+static int	spkr, line;
+static struct termios otty, ntty;
+static int	olflags;
 
 #ifdef SPEAKER
-tone_t          sound;
+static tone_t	sound;
 #undef GETOPTOPTS
 #define GETOPTOPTS "c:d:ef:lpsw:"
 #undef USAGE
@@ -439,7 +439,7 @@ main(int argc, char **argv)
 	exit(0);
 }
 
-void
+static void
 morse(char c)
 {
 	const struct morsetab *m;
@@ -473,7 +473,7 @@ morse(char c)
 	}
 }
 
-void
+static void
 show(const char *s)
 {
 	if (lflag) {
@@ -488,7 +488,7 @@ show(const char *s)
 	}
 }
 
-void
+static void
 play(const char *s)
 {
 #ifdef SPEAKER
@@ -530,7 +530,7 @@ play(const char *s)
 #endif
 }
 
-void
+static void
 ttyout(const char *s)
 {
 	const char *c;
@@ -572,7 +572,7 @@ ttyout(const char *s)
 	usleep(duration);
 }
 
-void
+static void
 sighandler(int signo)
 {
 

Modified: user/attilio/vmcontention/games/number/number.c
==============================================================================
--- user/attilio/vmcontention/games/number/number.c	Tue Nov  8 10:18:07 2011	(r227333)
+++ user/attilio/vmcontention/games/number/number.c	Tue Nov  8 11:08:40 2011	(r227334)
@@ -74,14 +74,13 @@ static const char	*name1[] = {
 	"novemdecillion",		"vigintillion",
 };
 
-void	convert(char *);
-int	number(char *, int);
-void	pfract(int);
-void	toobig(void);
-int	unit(int, char *);
-void	usage(void);
+static void	convert(char *);
+static int	number(char *, int);
+static void	pfract(int);
+static int	unit(int, char *);
+static void	usage(void);
 
-int lflag;
+static int lflag;
 
 int
 main(int argc, char *argv[])
@@ -120,7 +119,7 @@ main(int argc, char *argv[])
 	exit(0);
 }
 
-void
+static void
 convert(char *line)
 {
 	int flen, len, rval;
@@ -188,7 +187,7 @@ badnum:			errx(1, "illegal number: %s", 
 		(void)printf("\n");
 }
 
-int
+static int
 unit(int len, char *p)
 {
 	int off, rval;
@@ -222,7 +221,7 @@ unit(int len, char *p)
 	return (rval);
 }
 
-int
+static int
 number(char *p, int len)
 {
 	int val, rval;
@@ -260,7 +259,7 @@ number(char *p, int len)
 	return (rval);
 }
 
-void
+static void
 pfract(int len)
 {
 	static char const * const pref[] = { "", "ten-", "hundred-" };
@@ -278,7 +277,7 @@ pfract(int len)
 	}
 }
 
-void
+static void
 usage(void)
 {
 	(void)fprintf(stderr, "usage: number [-l] [# ...]\n");

Modified: user/attilio/vmcontention/gnu/lib/libstdc++/config.h
==============================================================================
--- user/attilio/vmcontention/gnu/lib/libstdc++/config.h	Tue Nov  8 10:18:07 2011	(r227333)
+++ user/attilio/vmcontention/gnu/lib/libstdc++/config.h	Tue Nov  8 11:08:40 2011	(r227334)
@@ -671,7 +671,7 @@
 /* #undef VERSION */
 
 /* Define if builtin atomic operations are supported on this host. */
-#if defined(__amd64__) || defined(__i386__)
+#if defined(__amd64__) || (defined(__i386__) && !defined(__tune_i386__))
 #define _GLIBCXX_ATOMIC_BUILTINS 1
 #endif
 

Modified: user/attilio/vmcontention/lib/clang/include/llvm/Config/config.h
==============================================================================
--- user/attilio/vmcontention/lib/clang/include/llvm/Config/config.h	Tue Nov  8 10:18:07 2011	(r227333)
+++ user/attilio/vmcontention/lib/clang/include/llvm/Config/config.h	Tue Nov  8 11:08:40 2011	(r227334)
@@ -552,7 +552,9 @@
 /* #undef LLVM_ETCDIR */
 
 /* Has gcc/MSVC atomic intrinsics */
+#ifndef __tune_i386__
 #define LLVM_HAS_ATOMICS 1
+#endif
 
 /* Host triple we were built on */
 /* #undef LLVM_HOSTTRIPLE */

Modified: user/attilio/vmcontention/lib/clang/include/llvm/Config/llvm-config.h
==============================================================================
--- user/attilio/vmcontention/lib/clang/include/llvm/Config/llvm-config.h	Tue Nov  8 10:18:07 2011	(r227333)
+++ user/attilio/vmcontention/lib/clang/include/llvm/Config/llvm-config.h	Tue Nov  8 11:08:40 2011	(r227334)
@@ -34,7 +34,9 @@
 /* #undef LLVM_ETCDIR */
 
 /* Has gcc/MSVC atomic intrinsics */
+#ifndef __tune_i386__
 #define LLVM_HAS_ATOMICS 1
+#endif

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-user@FreeBSD.ORG  Sat Nov 12 17:12:34 2011
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 16040106566B;
	Sat, 12 Nov 2011 17:12:34 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 024598FC0A;
	Sat, 12 Nov 2011 17:12:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pACHCXUR053945;
	Sat, 12 Nov 2011 17:12:33 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pACHCXAv053926;
	Sat, 12 Nov 2011 17:12:33 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201111121712.pACHCXAv053926@svn.freebsd.org>
From: Attilio Rao 
Date: Sat, 12 Nov 2011 17:12:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227469 - in user/attilio/vmcontention: bin/sh
	contrib/gcc/config/arm contrib/top etc etc/rc.d
	lib/libc/regex lib/libc/sys lib/libusb
	release/doc/en_US.ISO8859-1/hardware sbin/ffsinfo s...
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
	src tree" 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 12 Nov 2011 17:12:34 -0000

Author: attilio
Date: Sat Nov 12 17:12:33 2011
New Revision: 227469
URL: http://svn.freebsd.org/changeset/base/227469

Log:
  MFC

Modified:
  user/attilio/vmcontention/bin/sh/arith_yacc.c
  user/attilio/vmcontention/contrib/gcc/config/arm/arm.c
  user/attilio/vmcontention/etc/rc.d/routing
  user/attilio/vmcontention/etc/rc.d/syscons
  user/attilio/vmcontention/etc/rc.subr
  user/attilio/vmcontention/lib/libc/regex/regcomp.c
  user/attilio/vmcontention/lib/libc/sys/flock.2
  user/attilio/vmcontention/lib/libusb/Makefile
  user/attilio/vmcontention/lib/libusb/libusb.3
  user/attilio/vmcontention/lib/libusb/libusb.h
  user/attilio/vmcontention/lib/libusb/libusb10_desc.c
  user/attilio/vmcontention/lib/libusb/libusb20_desc.c
  user/attilio/vmcontention/lib/libusb/libusb20_desc.h
  user/attilio/vmcontention/release/doc/en_US.ISO8859-1/hardware/article.sgml
  user/attilio/vmcontention/sbin/ffsinfo/Makefile
  user/attilio/vmcontention/sbin/geom/class/multipath/geom_multipath.c
  user/attilio/vmcontention/sbin/geom/class/multipath/gmultipath.8
  user/attilio/vmcontention/sbin/ifconfig/ifieee80211.c
  user/attilio/vmcontention/sbin/ipfw/ipfw.8
  user/attilio/vmcontention/sbin/newfs_msdos/newfs_msdos.c
  user/attilio/vmcontention/secure/usr.bin/openssl/man/ca.1
  user/attilio/vmcontention/share/man/man4/altq.4
  user/attilio/vmcontention/share/man/man4/mps.4
  user/attilio/vmcontention/share/man/man4/mtio.4
  user/attilio/vmcontention/share/man/man4/mvs.4
  user/attilio/vmcontention/share/man/man4/ti.4
  user/attilio/vmcontention/share/misc/committers-ports.dot
  user/attilio/vmcontention/share/misc/committers-src.dot
  user/attilio/vmcontention/share/monetdef/zh_CN.UTF-8.src
  user/attilio/vmcontention/sys/amd64/amd64/machdep.c
  user/attilio/vmcontention/sys/amd64/amd64/trap.c
  user/attilio/vmcontention/sys/amd64/include/signal.h
  user/attilio/vmcontention/sys/amd64/include/ucontext.h
  user/attilio/vmcontention/sys/amd64/linux32/linux32_systrace_args.c
  user/attilio/vmcontention/sys/boot/i386/libi386/bioscd.c
  user/attilio/vmcontention/sys/cddl/dev/dtrace/i386/dtrace_asm.S
  user/attilio/vmcontention/sys/cddl/dev/systrace/systrace.c
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32.h
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_systrace_args.c
  user/attilio/vmcontention/sys/conf/NOTES
  user/attilio/vmcontention/sys/conf/options
  user/attilio/vmcontention/sys/dev/ae/if_ae.c
  user/attilio/vmcontention/sys/dev/ath/ah_osdep.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ah.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ah.h
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ah_devid.h
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ah_internal.h
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416.h
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416phy.h
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c
  user/attilio/vmcontention/sys/dev/ath/ath_rate/amrr/amrr.c
  user/attilio/vmcontention/sys/dev/ath/ath_rate/onoe/onoe.c
  user/attilio/vmcontention/sys/dev/ath/ath_rate/sample/sample.c
  user/attilio/vmcontention/sys/dev/ath/ath_rate/sample/sample.h
  user/attilio/vmcontention/sys/dev/ath/if_ath.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_debug.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_keycache.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_keycache.h
  user/attilio/vmcontention/sys/dev/ath/if_ath_misc.h
  user/attilio/vmcontention/sys/dev/ath/if_ath_pci.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_sysctl.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_tx.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_tx.h
  user/attilio/vmcontention/sys/dev/ath/if_ath_tx_ht.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_tx_ht.h
  user/attilio/vmcontention/sys/dev/ath/if_athrate.h
  user/attilio/vmcontention/sys/dev/ath/if_athvar.h
  user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_mips24k.c
  user/attilio/vmcontention/sys/dev/isp/DriverManual.txt
  user/attilio/vmcontention/sys/dev/lmc/if_lmc.c
  user/attilio/vmcontention/sys/dev/mfi/mfi.c
  user/attilio/vmcontention/sys/dev/puc/pucdata.c
  user/attilio/vmcontention/sys/dev/ti/if_ti.c
  user/attilio/vmcontention/sys/dev/ti/if_tireg.h
  user/attilio/vmcontention/sys/dev/usb/controller/at91dci.c
  user/attilio/vmcontention/sys/dev/usb/controller/avr32dci.c
  user/attilio/vmcontention/sys/dev/usb/controller/ehci.c
  user/attilio/vmcontention/sys/dev/usb/controller/ohci.c
  user/attilio/vmcontention/sys/dev/usb/controller/uhci.c
  user/attilio/vmcontention/sys/dev/usb/controller/xhci.c
  user/attilio/vmcontention/sys/dev/usb/net/if_kue.c
  user/attilio/vmcontention/sys/dev/usb/net/uhso.c
  user/attilio/vmcontention/sys/dev/usb/serial/ufoma.c
  user/attilio/vmcontention/sys/dev/usb/serial/uftdi.c
  user/attilio/vmcontention/sys/dev/usb/serial/umodem.c
  user/attilio/vmcontention/sys/dev/usb/serial/uplcom.c
  user/attilio/vmcontention/sys/dev/usb/serial/uslcom.c
  user/attilio/vmcontention/sys/dev/usb/serial/uvisor.c
  user/attilio/vmcontention/sys/dev/usb/storage/umass.c
  user/attilio/vmcontention/sys/dev/usb/storage/urio.c
  user/attilio/vmcontention/sys/dev/usb/storage/ustorage_fs.c
  user/attilio/vmcontention/sys/dev/usb/template/usb_template.c
  user/attilio/vmcontention/sys/dev/usb/usb.h
  user/attilio/vmcontention/sys/dev/usb/usb_busdma.c
  user/attilio/vmcontention/sys/dev/usb/usb_compat_linux.c
  user/attilio/vmcontention/sys/dev/usb/usb_dev.c
  user/attilio/vmcontention/sys/dev/usb/usb_generic.c
  user/attilio/vmcontention/sys/dev/usb/usb_ioctl.h
  user/attilio/vmcontention/sys/dev/usb/usb_msctest.c
  user/attilio/vmcontention/sys/dev/usb/usb_request.c
  user/attilio/vmcontention/sys/dev/usb/usb_transfer.c
  user/attilio/vmcontention/sys/dev/usb/wlan/if_uath.c
  user/attilio/vmcontention/sys/dev/usb/wlan/if_upgt.c
  user/attilio/vmcontention/sys/dev/usb/wlan/if_urtw.c
  user/attilio/vmcontention/sys/dev/usb/wlan/if_zyd.c
  user/attilio/vmcontention/sys/fs/procfs/procfs_status.c
  user/attilio/vmcontention/sys/geom/multipath/g_multipath.c
  user/attilio/vmcontention/sys/geom/multipath/g_multipath.h
  user/attilio/vmcontention/sys/i386/i386/machdep.c
  user/attilio/vmcontention/sys/i386/i386/trap.c
  user/attilio/vmcontention/sys/i386/include/signal.h
  user/attilio/vmcontention/sys/i386/include/ucontext.h
  user/attilio/vmcontention/sys/i386/linux/linux_systrace_args.c
  user/attilio/vmcontention/sys/kern/kern_conf.c
  user/attilio/vmcontention/sys/kern/kern_ctf.c
  user/attilio/vmcontention/sys/kern/makesyscalls.sh
  user/attilio/vmcontention/sys/kern/subr_kobj.c
  user/attilio/vmcontention/sys/kern/systrace_args.c
  user/attilio/vmcontention/sys/modules/ath/Makefile
  user/attilio/vmcontention/sys/modules/ath_ahb/Makefile
  user/attilio/vmcontention/sys/modules/ath_pci/Makefile
  user/attilio/vmcontention/sys/net/if_bridge.c
  user/attilio/vmcontention/sys/net/if_lagg.c
  user/attilio/vmcontention/sys/net/if_tap.c
  user/attilio/vmcontention/sys/net/if_vlan.c
  user/attilio/vmcontention/sys/net80211/ieee80211_sta.c
  user/attilio/vmcontention/sys/netgraph/ng_fec.c
  user/attilio/vmcontention/sys/netinet/ip_carp.c
  user/attilio/vmcontention/sys/netinet/ipfw/dummynet.txt
  user/attilio/vmcontention/sys/netinet6/in6.c
  user/attilio/vmcontention/sys/netinet6/in6_pcb.c
  user/attilio/vmcontention/sys/netinet6/nd6.c
  user/attilio/vmcontention/sys/netinet6/nd6.h
  user/attilio/vmcontention/sys/netinet6/nd6_rtr.c
  user/attilio/vmcontention/sys/powerpc/aim/trap_subr32.S
  user/attilio/vmcontention/sys/powerpc/aim/trap_subr64.S
  user/attilio/vmcontention/sys/sys/kobj.h
  user/attilio/vmcontention/sys/sys/proc.h
  user/attilio/vmcontention/sys/sys/unistd.h
  user/attilio/vmcontention/sys/tools/makeobjops.awk
  user/attilio/vmcontention/sys/ufs/ffs/fs.h
  user/attilio/vmcontention/sys/ufs/ufs/dinode.h
  user/attilio/vmcontention/tools/tools/netrate/netblast/netblast.c
  user/attilio/vmcontention/tools/tools/netrate/netreceive/netreceive.c
  user/attilio/vmcontention/tools/tools/netrate/netsend/netsend.c
  user/attilio/vmcontention/usr.bin/calendar/calendar.1
  user/attilio/vmcontention/usr.bin/calendar/calendar.c
  user/attilio/vmcontention/usr.bin/calendar/io.c
  user/attilio/vmcontention/usr.bin/calendar/parsedata.c
  user/attilio/vmcontention/usr.bin/compress/doc/NOTES
  user/attilio/vmcontention/usr.bin/du/du.c
  user/attilio/vmcontention/usr.bin/procstat/procstat.1
  user/attilio/vmcontention/usr.sbin/config/mkmakefile.c
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-disk.sh
  user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/parseconfig.sh
  user/attilio/vmcontention/usr.sbin/pkg_install/lib/version.c
Directory Properties:
  user/attilio/vmcontention/   (props changed)
  user/attilio/vmcontention/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmcontention/contrib/bind9/   (props changed)
  user/attilio/vmcontention/contrib/binutils/   (props changed)
  user/attilio/vmcontention/contrib/bzip2/   (props changed)
  user/attilio/vmcontention/contrib/com_err/   (props changed)
  user/attilio/vmcontention/contrib/compiler-rt/   (props changed)
  user/attilio/vmcontention/contrib/dialog/   (props changed)
  user/attilio/vmcontention/contrib/ee/   (props changed)
  user/attilio/vmcontention/contrib/expat/   (props changed)
  user/attilio/vmcontention/contrib/file/   (props changed)
  user/attilio/vmcontention/contrib/gcc/   (props changed)
  user/attilio/vmcontention/contrib/gdb/   (props changed)
  user/attilio/vmcontention/contrib/gdtoa/   (props changed)
  user/attilio/vmcontention/contrib/gnu-sort/   (props changed)
  user/attilio/vmcontention/contrib/groff/   (props changed)
  user/attilio/vmcontention/contrib/less/   (props changed)
  user/attilio/vmcontention/contrib/libpcap/   (props changed)
  user/attilio/vmcontention/contrib/libstdc++/   (props changed)
  user/attilio/vmcontention/contrib/llvm/   (props changed)
  user/attilio/vmcontention/contrib/llvm/tools/clang/   (props changed)
  user/attilio/vmcontention/contrib/ncurses/   (props changed)
  user/attilio/vmcontention/contrib/netcat/   (props changed)
  user/attilio/vmcontention/contrib/ntp/   (props changed)
  user/attilio/vmcontention/contrib/one-true-awk/   (props changed)
  user/attilio/vmcontention/contrib/openbsm/   (props changed)
  user/attilio/vmcontention/contrib/openpam/   (props changed)
  user/attilio/vmcontention/contrib/openresolv/   (props changed)
  user/attilio/vmcontention/contrib/pf/   (props changed)
  user/attilio/vmcontention/contrib/sendmail/   (props changed)
  user/attilio/vmcontention/contrib/tcpdump/   (props changed)
  user/attilio/vmcontention/contrib/tcsh/   (props changed)
  user/attilio/vmcontention/contrib/tnftp/   (props changed)
  user/attilio/vmcontention/contrib/top/   (props changed)
  user/attilio/vmcontention/contrib/top/install-sh   (props changed)
  user/attilio/vmcontention/contrib/tzcode/stdtime/   (props changed)
  user/attilio/vmcontention/contrib/tzcode/zic/   (props changed)
  user/attilio/vmcontention/contrib/tzdata/   (props changed)
  user/attilio/vmcontention/contrib/wpa/   (props changed)
  user/attilio/vmcontention/contrib/xz/   (props changed)
  user/attilio/vmcontention/crypto/heimdal/   (props changed)
  user/attilio/vmcontention/crypto/openssh/   (props changed)
  user/attilio/vmcontention/crypto/openssl/   (props changed)
  user/attilio/vmcontention/gnu/lib/   (props changed)
  user/attilio/vmcontention/gnu/usr.bin/binutils/   (props changed)
  user/attilio/vmcontention/gnu/usr.bin/cc/cc_tools/   (props changed)
  user/attilio/vmcontention/gnu/usr.bin/gdb/   (props changed)
  user/attilio/vmcontention/lib/libc/   (props changed)
  user/attilio/vmcontention/lib/libc/stdtime/   (props changed)
  user/attilio/vmcontention/lib/libutil/   (props changed)
  user/attilio/vmcontention/lib/libz/   (props changed)
  user/attilio/vmcontention/sbin/   (props changed)
  user/attilio/vmcontention/sbin/ipfw/   (props changed)
  user/attilio/vmcontention/share/mk/bsd.arch.inc.mk   (props changed)
  user/attilio/vmcontention/share/zoneinfo/   (props changed)
  user/attilio/vmcontention/sys/   (props changed)
  user/attilio/vmcontention/sys/amd64/include/xen/   (props changed)
  user/attilio/vmcontention/sys/boot/   (props changed)
  user/attilio/vmcontention/sys/boot/i386/efi/   (props changed)
  user/attilio/vmcontention/sys/boot/ia64/efi/   (props changed)
  user/attilio/vmcontention/sys/boot/ia64/ski/   (props changed)
  user/attilio/vmcontention/sys/boot/powerpc/boot1.chrp/   (props changed)
  user/attilio/vmcontention/sys/boot/powerpc/ofw/   (props changed)
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmcontention/sys/conf/   (props changed)
  user/attilio/vmcontention/sys/contrib/dev/acpica/   (props changed)
  user/attilio/vmcontention/sys/contrib/octeon-sdk/   (props changed)
  user/attilio/vmcontention/sys/contrib/pf/   (props changed)
  user/attilio/vmcontention/sys/contrib/x86emu/   (props changed)
  user/attilio/vmcontention/usr.bin/calendar/   (props changed)
  user/attilio/vmcontention/usr.bin/csup/   (props changed)
  user/attilio/vmcontention/usr.bin/procstat/   (props changed)
  user/attilio/vmcontention/usr.sbin/ndiscvt/   (props changed)
  user/attilio/vmcontention/usr.sbin/rtadvctl/   (props changed)
  user/attilio/vmcontention/usr.sbin/rtadvd/   (props changed)
  user/attilio/vmcontention/usr.sbin/rtsold/   (props changed)
  user/attilio/vmcontention/usr.sbin/zic/   (props changed)

Modified: user/attilio/vmcontention/bin/sh/arith_yacc.c
==============================================================================
--- user/attilio/vmcontention/bin/sh/arith_yacc.c	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/bin/sh/arith_yacc.c	Sat Nov 12 17:12:33 2011	(r227469)
@@ -131,11 +131,11 @@ static arith_t do_binop(int op, arith_t 
 			yyerror("divide error");
 		return op == ARITH_REM ? a % b : a / b;
 	case ARITH_MUL:
-		return a * b;
+		return (uintmax_t)a * (uintmax_t)b;
 	case ARITH_ADD:
-		return a + b;
+		return (uintmax_t)a + (uintmax_t)b;
 	case ARITH_SUB:
-		return a - b;
+		return (uintmax_t)a - (uintmax_t)b;
 	case ARITH_LSHIFT:
 		return a << b;
 	case ARITH_RSHIFT:

Modified: user/attilio/vmcontention/contrib/gcc/config/arm/arm.c
==============================================================================
--- user/attilio/vmcontention/contrib/gcc/config/arm/arm.c	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/contrib/gcc/config/arm/arm.c	Sat Nov 12 17:12:33 2011	(r227469)
@@ -3217,7 +3217,8 @@ legitimize_pic_address (rtx orig, enum m
 	  gcc_assert (!no_new_pseudos);
 	  if (arm_pic_register != INVALID_REGNUM)
 	    {
-	      cfun->machine->pic_reg = gen_rtx_REG (Pmode, arm_pic_register);
+	      if (!cfun->machine->pic_reg)
+		cfun->machine->pic_reg = gen_rtx_REG (Pmode, arm_pic_register);
 
 	      /* Play games to avoid marking the function as needing pic
 		 if we are being called as part of the cost-estimation
@@ -3229,7 +3230,8 @@ legitimize_pic_address (rtx orig, enum m
 	    {
 	      rtx seq;
 
-	      cfun->machine->pic_reg = gen_reg_rtx (Pmode);
+	      if (!cfun->machine->pic_reg)
+		  cfun->machine->pic_reg = gen_reg_rtx (Pmode);
 
 	      /* Play games to avoid marking the function as needing pic
 		 if we are being called as part of the cost-estimation

Modified: user/attilio/vmcontention/etc/rc.d/routing
==============================================================================
--- user/attilio/vmcontention/etc/rc.d/routing	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/etc/rc.d/routing	Sat Nov 12 17:12:33 2011	(r227469)
@@ -247,6 +247,7 @@ static_atm()
 
 static_ipx()
 {
+	:
 }
 
 ropts_init()

Modified: user/attilio/vmcontention/etc/rc.d/syscons
==============================================================================
--- user/attilio/vmcontention/etc/rc.d/syscons	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/etc/rc.d/syscons	Sat Nov 12 17:12:33 2011	(r227469)
@@ -99,7 +99,7 @@ syscons_configure_keyboard()
 	*)
 		sc_init
 		echo -n ' keychange'
-		set - ${keychange}
+		set -- ${keychange}
 		while [ $# -gt 0 ]; do
 			kbdcontrol <${kbddev} -f "$1" "$2"
 			shift; shift

Modified: user/attilio/vmcontention/etc/rc.subr
==============================================================================
--- user/attilio/vmcontention/etc/rc.subr	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/etc/rc.subr	Sat Nov 12 17:12:33 2011	(r227469)
@@ -1638,7 +1638,7 @@ find_local_scripts_old () {
 				    continue
 				zlist="$zlist $file"
 			done
-			for file in ${dir}/[^0-9]*.sh; do
+			for file in ${dir}/[!0-9]*.sh; do
 				grep '^# PROVIDE:' $file >/dev/null 2>&1 &&
 				    continue
 				slist="$slist $file"

Modified: user/attilio/vmcontention/lib/libc/regex/regcomp.c
==============================================================================
--- user/attilio/vmcontention/lib/libc/regex/regcomp.c	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/lib/libc/regex/regcomp.c	Sat Nov 12 17:12:33 2011	(r227469)
@@ -81,10 +81,10 @@ extern "C" {
 #endif
 
 /* === regcomp.c === */
-static void p_ere(struct parse *p, wint_t stop);
+static void p_ere(struct parse *p, int stop);
 static void p_ere_exp(struct parse *p);
 static void p_str(struct parse *p);
-static void p_bre(struct parse *p, wint_t end1, wint_t end2);
+static void p_bre(struct parse *p, int end1, int end2);
 static int p_simp_re(struct parse *p, int starordinary);
 static int p_count(struct parse *p);
 static void p_bracket(struct parse *p);
@@ -109,7 +109,7 @@ static sopno dupl(struct parse *p, sopno
 static void doemit(struct parse *p, sop op, size_t opnd);
 static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos);
 static void dofwd(struct parse *p, sopno pos, sop value);
-static void enlarge(struct parse *p, sopno size);
+static int enlarge(struct parse *p, sopno size);
 static void stripsnug(struct parse *p, struct re_guts *g);
 static void findmust(struct parse *p, struct re_guts *g);
 static int altoffset(sop *scan, int offset);
@@ -285,7 +285,7 @@ regcomp(regex_t * __restrict preg,
 
 /*
  - p_ere - ERE parser top level, concatenation and alternation
- == static void p_ere(struct parse *p, int stop);
+ == static void p_ere(struct parse *p, int_t stop);
  */
 static void
 p_ere(struct parse *p,
@@ -493,7 +493,7 @@ p_str(struct parse *p)
 
 /*
  - p_bre - BRE parser top level, anchoring and concatenation
- == static void p_bre(struct parse *p, int end1, \
+ == static void p_bre(struct parse *p,  int end1, \
  ==	int end2);
  * Giving end1 as OUT essentially eliminates the end1/end2 check.
  *
@@ -840,7 +840,7 @@ p_b_eclass(struct parse *p, cset *cs)
 
 /*
  - p_b_symbol - parse a character or [..]ed multicharacter collating symbol
- == static char p_b_symbol(struct parse *p);
+ == static wint_t p_b_symbol(struct parse *p);
  */
 static wint_t			/* value of symbol */
 p_b_symbol(struct parse *p)
@@ -859,7 +859,7 @@ p_b_symbol(struct parse *p)
 
 /*
  - p_b_coll_elem - parse a collating-element name and look it up
- == static char p_b_coll_elem(struct parse *p, int endc);
+ == static wint_t p_b_coll_elem(struct parse *p, wint_t endc);
  */
 static wint_t			/* value of collating element */
 p_b_coll_elem(struct parse *p,
@@ -894,7 +894,7 @@ p_b_coll_elem(struct parse *p,
 
 /*
  - othercase - return the case counterpart of an alphabetic
- == static char othercase(int ch);
+ == static wint_t othercase(wint_t ch);
  */
 static wint_t			/* if no counterpart, return ch */
 othercase(wint_t ch)
@@ -910,7 +910,7 @@ othercase(wint_t ch)
 
 /*
  - bothcases - emit a dualcase version of a two-case character
- == static void bothcases(struct parse *p, int ch);
+ == static void bothcases(struct parse *p, wint_t ch);
  *
  * Boy, is this implementation ever a kludge...
  */
@@ -939,7 +939,7 @@ bothcases(struct parse *p, wint_t ch)
 
 /*
  - ordinary - emit an ordinary character
- == static void ordinary(struct parse *p, int ch);
+ == static void ordinary(struct parse *p, wint_t ch);
  */
 static void
 ordinary(struct parse *p, wint_t ch)
@@ -1246,8 +1246,8 @@ dupl(struct parse *p,
 	assert(finish >= start);
 	if (len == 0)
 		return(ret);
-	enlarge(p, p->ssize + len);	/* this many unexpected additions */
-	assert(p->ssize >= p->slen + len);
+	if (!enlarge(p, p->ssize + len)) /* this many unexpected additions */
+		return(ret);
 	(void) memcpy((char *)(p->strip + p->slen),
 		(char *)(p->strip + start), (size_t)len*sizeof(sop));
 	p->slen += len;
@@ -1274,8 +1274,8 @@ doemit(struct parse *p, sop op, size_t o
 
 	/* deal with undersized strip */
 	if (p->slen >= p->ssize)
-		enlarge(p, (p->ssize+1) / 2 * 3);	/* +50% */
-	assert(p->slen < p->ssize);
+		if (!enlarge(p, (p->ssize+1) / 2 * 3))	/* +50% */
+			return;
 
 	/* finally, it's all reduced to the easy case */
 	p->strip[p->slen++] = SOP(op, opnd);
@@ -1334,23 +1334,24 @@ dofwd(struct parse *p, sopno pos, sop va
 
 /*
  - enlarge - enlarge the strip
- == static void enlarge(struct parse *p, sopno size);
+ == static int enlarge(struct parse *p, sopno size);
  */
-static void
+static int
 enlarge(struct parse *p, sopno size)
 {
 	sop *sp;
 
 	if (p->ssize >= size)
-		return;
+		return 1;
 
 	sp = (sop *)realloc(p->strip, size*sizeof(sop));
 	if (sp == NULL) {
 		SETERROR(REG_ESPACE);
-		return;
+		return 0;
 	}
 	p->strip = sp;
 	p->ssize = size;
+	return 1;
 }
 
 /*

Modified: user/attilio/vmcontention/lib/libc/sys/flock.2
==============================================================================
--- user/attilio/vmcontention/lib/libc/sys/flock.2	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/lib/libc/sys/flock.2	Sat Nov 12 17:12:33 2011	(r227469)
@@ -28,7 +28,7 @@
 .\"     @(#)flock.2	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD$
 .\"
-.Dd January 22, 2008
+.Dd November 9, 2011
 .Dt FLOCK 2
 .Os
 .Sh NAME
@@ -154,6 +154,8 @@ refers to an object other than a file.
 The argument
 .Fa fd
 refers to an object that does not support file locking.
+.It Bq Er ENOLCK
+A lock was requested, but no locks are available.
 .El
 .Sh SEE ALSO
 .Xr close 2 ,

Modified: user/attilio/vmcontention/lib/libusb/Makefile
==============================================================================
--- user/attilio/vmcontention/lib/libusb/Makefile	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/lib/libusb/Makefile	Sat Nov 12 17:12:33 2011	(r227469)
@@ -74,6 +74,10 @@ MLINKS += libusb.3 libusb_get_config_des
 MLINKS += libusb.3 libusb_get_config_descriptor_by_value.3
 MLINKS += libusb.3 libusb_free_config_descriptor.3
 MLINKS += libusb.3 libusb_get_string_descriptor_ascii.3
+MLINKS += libusb.3 libusb_parse_ss_endpoint_comp.3
+MLINKS += libusb.3 libusb_free_ss_endpoint_comp.3
+MLINKS += libusb.3 libusb_parse_bos_descriptor.3
+MLINKS += libusb.3 libusb_free_bos_descriptor.3
 MLINKS += libusb.3 libusb_alloc_transfer.3
 MLINKS += libusb.3 libusb_free_transfer.3
 MLINKS += libusb.3 libusb_submit_transfer.3

Modified: user/attilio/vmcontention/lib/libusb/libusb.3
==============================================================================
--- user/attilio/vmcontention/lib/libusb/libusb.3	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/lib/libusb/libusb.3	Sat Nov 12 17:12:33 2011	(r227469)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 16, 2011
+.Dd November 9, 2011
 .Dt LIBUSB 3
 .Os
 .Sh NAME
@@ -316,6 +316,40 @@ Retrieve a string descriptor in C style 
 Returns the positive number of bytes in the resulting ASCII string
 on success and a LIBUSB_ERROR code on failure.
 .Pp
+.Ft int
+.Fn libusb_parse_ss_endpoint_comp "const void *buf" "int len" "libusb_ss_endpoint_companion_descriptor **ep_comp"
+This function parses the USB 3.0 endpoint companion descriptor in host endian format pointed to by
+.Fa buf
+and having a length of
+.Fa len.
+Typically these arguments are the extra and extra_length fields of the
+endpoint descriptor.
+On success the pointer to resulting descriptor is stored at the location given by
+.Fa ep_comp.
+Returns zero on success and a LIBUSB_ERROR code on failure.
+On success the parsed USB 3.0 endpoint companion descriptor must be
+freed using the libusb_free_ss_endpoint_comp function.
+.Pp
+.Ft void
+.Fn libusb_free_ss_endpoint_comp "libusb_ss_endpoint_companion_descriptor *ep_comp"
+This function is NULL safe and frees a parsed USB 3.0 endpoint companion descriptor.
+.Pp
+.Ft int
+.Fn libusb_parse_bos_descriptor "const void *buf" "int len" "libusb_bos_descriptor **bos"
+This function parses a Binary Object Store, BOS, descriptor into host endian format pointed to by
+.Fa buf
+and having a length of
+.Fa len.
+On success the pointer to resulting descriptor is stored at the location given by
+.Fa bos.
+Returns zero on success and a LIBUSB_ERROR code on failure.
+On success the parsed BOS descriptor must be freed using the
+libusb_free_bos_descriptor function.
+.Pp
+.Ft void
+.Fn libusb_free_bos_descriptor "libusb_bos_descriptor *bos"
+This function is NULL safe and frees a parsed BOS descriptor.
+.Pp
 .Sh USB ASYNCHRONOUS I/O
 .Pp
 .Ft struct libusb_transfer *

Modified: user/attilio/vmcontention/lib/libusb/libusb.h
==============================================================================
--- user/attilio/vmcontention/lib/libusb/libusb.h	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/lib/libusb/libusb.h	Sat Nov 12 17:12:33 2011	(r227469)
@@ -63,6 +63,16 @@ enum libusb_descriptor_type {
 	LIBUSB_DT_REPORT = 0x22,
 	LIBUSB_DT_PHYSICAL = 0x23,
 	LIBUSB_DT_HUB = 0x29,
+	LIBUSB_DT_BOS = 0x0f,
+	LIBUSB_DT_DEVICE_CAPABILITY = 0x10,
+	LIBUSB_DT_SS_ENDPOINT_COMPANION = 0x30,
+};
+
+enum libusb_device_capability_type {
+	LIBUSB_WIRELESS_USB_DEVICE_CAPABILITY = 0x1,
+	LIBUSB_USB_2_0_EXTENSION_DEVICE_CAPABILITY = 0x2,
+	LIBUSB_SS_USB_DEVICE_CAPABILITY = 0x3,
+	LIBUSB_CONTAINER_ID_DEVICE_CAPABILITY = 0x4,
 };
 
 #define	LIBUSB_DT_DEVICE_SIZE		18
@@ -71,6 +81,10 @@ enum libusb_descriptor_type {
 #define	LIBUSB_DT_ENDPOINT_SIZE		7
 #define	LIBUSB_DT_ENDPOINT_AUDIO_SIZE	9
 #define	LIBUSB_DT_HUB_NONVAR_SIZE	7
+#define	LIBUSB_DT_SS_ENDPOINT_COMPANION_SIZE	6
+#define	LIBUSB_DT_BOS_SIZE		5
+#define	LIBUSB_USB_2_0_EXTENSION_DEVICE_CAPABILITY_SIZE	7
+#define	LIBUSB_SS_USB_DEVICE_CAPABILITY_SIZE	10
 
 #define	LIBUSB_ENDPOINT_ADDRESS_MASK	0x0f
 #define	LIBUSB_ENDPOINT_DIR_MASK	0x80
@@ -230,6 +244,14 @@ typedef struct libusb_endpoint_descripto
 	int	extra_length;
 }	libusb_endpoint_descriptor __aligned(sizeof(void *));
 
+typedef struct libusb_ss_endpoint_companion_descriptor {
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bMaxBurst;
+	uint8_t bmAttributes;
+	uint16_t wBytesPerInterval;
+}	libusb_ss_endpoint_companion_descriptor __aligned(sizeof(void *));
+
 typedef struct libusb_interface_descriptor {
 	uint8_t	bLength;
 	uint8_t	bDescriptorType;
@@ -264,6 +286,39 @@ typedef struct libusb_config_descriptor 
 	int	extra_length;
 }	libusb_config_descriptor __aligned(sizeof(void *));
 
+typedef struct libusb_usb_2_0_device_capability_descriptor {
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bDevCapabilityType;
+	uint32_t bmAttributes;
+#define LIBUSB_USB_2_0_CAPABILITY_LPM_SUPPORT  (1 << 1)
+}	libusb_usb_2_0_device_capability_descriptor __aligned(sizeof(void *));
+
+typedef struct libusb_ss_usb_device_capability_descriptor {
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint8_t bDevCapabilityType;
+	uint8_t bmAttributes;
+#define LIBUSB_SS_USB_CAPABILITY_LPM_SUPPORT   (1 << 1)
+	uint16_t wSpeedSupported;
+#define LIBUSB_CAPABILITY_LOW_SPEED_OPERATION  (1)
+#define LIBUSB_CAPABILITY_FULL_SPEED_OPERATION (1 << 1)
+#define LIBUSB_CAPABILITY_HIGH_SPEED_OPERATION (1 << 2)
+#define LIBUSB_CAPABILITY_5GBPS_OPERATION      (1 << 3)
+	uint8_t bFunctionalitySupport;
+	uint8_t bU1DevExitLat;
+	uint16_t wU2DevExitLat;
+}	libusb_ss_usb_device_capability_descriptor __aligned(sizeof(void *));
+
+typedef struct libusb_bos_descriptor {
+	uint8_t bLength;
+	uint8_t bDescriptorType;
+	uint16_t wTotalLength;
+	uint8_t bNumDeviceCapabilities;
+	struct libusb_usb_2_0_device_capability_descriptor *usb_2_0_ext_cap;
+	struct libusb_ss_usb_device_capability_descriptor *ss_usb_cap;
+}	libusb_bos_descriptor __aligned(sizeof(void *));
+
 typedef struct libusb_control_setup {
 	uint8_t	bmRequestType;
 	uint8_t	bRequest;
@@ -345,6 +400,10 @@ int	libusb_get_config_descriptor_by_valu
 void	libusb_free_config_descriptor(struct libusb_config_descriptor *config);
 int	libusb_get_string_descriptor_ascii(libusb_device_handle * devh, uint8_t desc_index, uint8_t *data, int length);
 int	libusb_get_descriptor(libusb_device_handle * devh, uint8_t desc_type, uint8_t desc_index, uint8_t *data, int length);
+int	libusb_parse_ss_endpoint_comp(const void *buf, int len, struct libusb_ss_endpoint_companion_descriptor **ep_comp);
+void	libusb_free_ss_endpoint_comp(struct libusb_ss_endpoint_companion_descriptor *ep_comp);
+int	libusb_parse_bos_descriptor(const void *buf, int len, struct libusb_bos_descriptor **bos);
+void	libusb_free_bos_descriptor(struct libusb_bos_descriptor *bos);
 
 /* Asynchronous device I/O */
 

Modified: user/attilio/vmcontention/lib/libusb/libusb10_desc.c
==============================================================================
--- user/attilio/vmcontention/lib/libusb/libusb10_desc.c	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/lib/libusb/libusb10_desc.c	Sat Nov 12 17:12:33 2011	(r227469)
@@ -298,7 +298,7 @@ libusb_get_string_descriptor_ascii(libus
     uint8_t desc_index, unsigned char *data, int length)
 {
 	if (pdev == NULL || data == NULL || length < 1)
-		return (LIBUSB20_ERROR_INVALID_PARAM);
+		return (LIBUSB_ERROR_INVALID_PARAM);
 
 	if (length > 65535)
 		length = 65535;
@@ -318,7 +318,7 @@ libusb_get_descriptor(libusb_device_hand
     uint8_t desc_index, uint8_t *data, int length)
 {
 	if (devh == NULL || data == NULL || length < 1)
-		return (LIBUSB20_ERROR_INVALID_PARAM);
+		return (LIBUSB_ERROR_INVALID_PARAM);
 
 	if (length > 65535)
 		length = 65535;
@@ -327,3 +327,172 @@ libusb_get_descriptor(libusb_device_hand
 	    LIBUSB_REQUEST_GET_DESCRIPTOR, (desc_type << 8) | desc_index, 0, data,
 	    length, 1000));
 }
+
+int
+libusb_parse_ss_endpoint_comp(const void *buf, int len,
+    struct libusb_ss_endpoint_companion_descriptor **ep_comp)
+{
+	if (buf == NULL || ep_comp == NULL || len < 1)
+		return (LIBUSB_ERROR_INVALID_PARAM);
+
+	if (len > 65535)
+		len = 65535;
+
+	*ep_comp = NULL;
+
+	while (len != 0) {
+		uint8_t dlen;
+		uint8_t dtype;
+
+		dlen = ((const uint8_t *)buf)[0];
+		dtype = ((const uint8_t *)buf)[1];
+
+		if (dlen < 2 || dlen > len)
+			break;
+
+		if (dlen >= LIBUSB_DT_SS_ENDPOINT_COMPANION_SIZE &&
+		    dtype == LIBUSB_DT_SS_ENDPOINT_COMPANION) {
+			struct libusb_ss_endpoint_companion_descriptor *ptr;
+
+			ptr = malloc(sizeof(*ptr));
+			if (ptr == NULL)
+				return (LIBUSB_ERROR_NO_MEM);
+
+			ptr->bLength = LIBUSB_DT_SS_ENDPOINT_COMPANION_SIZE;
+			ptr->bDescriptorType = dtype;
+			ptr->bMaxBurst = ((const uint8_t *)buf)[2];
+			ptr->bmAttributes = ((const uint8_t *)buf)[3];
+			ptr->wBytesPerInterval = ((const uint8_t *)buf)[4] |
+			    (((const uint8_t *)buf)[5] << 8);
+
+			*ep_comp = ptr;
+
+			return (0);	/* success */
+		}
+
+		buf = ((const uint8_t *)buf) + dlen;
+		len -= dlen;
+	}
+	return (LIBUSB_ERROR_IO);
+}
+
+void
+libusb_free_ss_endpoint_comp(struct libusb_ss_endpoint_companion_descriptor *ep_comp)
+{
+	if (ep_comp == NULL)
+		return;
+
+	free(ep_comp);
+}
+
+int
+libusb_parse_bos_descriptor(const void *buf, int len,
+    struct libusb_bos_descriptor **bos)
+{
+	struct libusb_bos_descriptor *ptr;
+	struct libusb_usb_2_0_device_capability_descriptor *dcap_20;
+	struct libusb_ss_usb_device_capability_descriptor *ss_cap;
+
+	if (buf == NULL || bos == NULL || len < 1)
+		return (LIBUSB_ERROR_INVALID_PARAM);
+
+	if (len > 65535)
+		len = 65535;
+
+	*bos = ptr = NULL;
+
+	while (len != 0) {
+		uint8_t dlen;
+		uint8_t dtype;
+
+		dlen = ((const uint8_t *)buf)[0];
+		dtype = ((const uint8_t *)buf)[1];
+
+		if (dlen < 2 || dlen > len)
+			break;
+
+		if (dlen >= LIBUSB_DT_BOS_SIZE &&
+		    dtype == LIBUSB_DT_BOS) {
+
+			ptr = malloc(sizeof(*ptr) + sizeof(*dcap_20) +
+			    sizeof(*ss_cap));
+
+			if (ptr == NULL)
+				return (LIBUSB_ERROR_NO_MEM);
+
+			*bos = ptr;
+
+			ptr->bLength = LIBUSB_DT_BOS_SIZE;
+			ptr->bDescriptorType = dtype;
+			ptr->wTotalLength = ((const uint8_t *)buf)[2] |
+			    (((const uint8_t *)buf)[3] << 8);
+			ptr->bNumDeviceCapabilities = ((const uint8_t *)buf)[4];
+			ptr->usb_2_0_ext_cap = NULL;
+			ptr->ss_usb_cap = NULL;
+
+			dcap_20 = (void *)(ptr + 1);
+			ss_cap = (void *)(dcap_20 + 1);
+		}
+		if (dlen >= 3 &&
+		    ptr != NULL &&
+		    dtype == LIBUSB_DT_DEVICE_CAPABILITY) {
+			switch (((const uint8_t *)buf)[2]) {
+			case LIBUSB_USB_2_0_EXTENSION_DEVICE_CAPABILITY:
+				if (ptr->usb_2_0_ext_cap != NULL)
+					break;
+				if (dlen < LIBUSB_USB_2_0_EXTENSION_DEVICE_CAPABILITY_SIZE)
+					break;
+
+				ptr->usb_2_0_ext_cap = dcap_20;
+
+				dcap_20->bLength = LIBUSB_USB_2_0_EXTENSION_DEVICE_CAPABILITY_SIZE;
+				dcap_20->bDescriptorType = dtype;
+				dcap_20->bDevCapabilityType = ((const uint8_t *)buf)[2];
+				dcap_20->bmAttributes = ((const uint8_t *)buf)[3] |
+				    (((const uint8_t *)buf)[4] << 8) |
+				    (((const uint8_t *)buf)[5] << 16) |
+				    (((const uint8_t *)buf)[6] << 24);
+				break;
+
+			case LIBUSB_SS_USB_DEVICE_CAPABILITY:
+				if (ptr->ss_usb_cap != NULL)
+					break;
+				if (dlen < LIBUSB_SS_USB_DEVICE_CAPABILITY_SIZE)
+					break;
+
+				ptr->ss_usb_cap = ss_cap;
+
+				ss_cap->bLength = LIBUSB_SS_USB_DEVICE_CAPABILITY_SIZE;
+				ss_cap->bDescriptorType = dtype;
+				ss_cap->bDevCapabilityType = ((const uint8_t *)buf)[2];
+				ss_cap->bmAttributes = ((const uint8_t *)buf)[3];
+				ss_cap->wSpeedSupported = ((const uint8_t *)buf)[4] |
+				    (((const uint8_t *)buf)[5] << 8);
+				ss_cap->bFunctionalitySupport = ((const uint8_t *)buf)[6];
+				ss_cap->bU1DevExitLat = ((const uint8_t *)buf)[7];
+				ss_cap->wU2DevExitLat = ((const uint8_t *)buf)[8] |
+				    (((const uint8_t *)buf)[9] << 8);
+				break;
+
+			default:
+				break;
+			}
+		}
+
+		buf = ((const uint8_t *)buf) + dlen;
+		len -= dlen;
+	}
+	if (ptr != NULL)
+		return (0);		/* success */
+
+	return (LIBUSB_ERROR_IO);
+}
+
+void
+libusb_free_bos_descriptor(struct libusb_bos_descriptor *bos)
+{
+	if (bos == NULL)
+		return;
+
+	free(bos);
+}

Modified: user/attilio/vmcontention/lib/libusb/libusb20_desc.c
==============================================================================
--- user/attilio/vmcontention/lib/libusb/libusb20_desc.c	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/lib/libusb/libusb20_desc.c	Sat Nov 12 17:12:33 2011	(r227469)
@@ -41,6 +41,10 @@ LIBUSB20_MAKE_STRUCT_FORMAT(LIBUSB20_END
 LIBUSB20_MAKE_STRUCT_FORMAT(LIBUSB20_INTERFACE_DESC);
 LIBUSB20_MAKE_STRUCT_FORMAT(LIBUSB20_CONFIG_DESC);
 LIBUSB20_MAKE_STRUCT_FORMAT(LIBUSB20_CONTROL_SETUP);
+LIBUSB20_MAKE_STRUCT_FORMAT(LIBUSB20_SS_ENDPT_COMP_DESC);
+LIBUSB20_MAKE_STRUCT_FORMAT(LIBUSB20_USB_20_DEVCAP_DESC);
+LIBUSB20_MAKE_STRUCT_FORMAT(LIBUSB20_SS_USB_DEVCAP_DESC);
+LIBUSB20_MAKE_STRUCT_FORMAT(LIBUSB20_BOS_DESCRIPTOR);
 
 /*------------------------------------------------------------------------*
  *	libusb20_parse_config_desc

Modified: user/attilio/vmcontention/lib/libusb/libusb20_desc.h
==============================================================================
--- user/attilio/vmcontention/lib/libusb/libusb20_desc.h	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/lib/libusb/libusb20_desc.h	Sat Nov 12 17:12:33 2011	(r227469)
@@ -264,6 +264,43 @@ LIBUSB20_MAKE_STRUCT(LIBUSB20_CONFIG_DES
 
 LIBUSB20_MAKE_STRUCT(LIBUSB20_CONTROL_SETUP);
 
+#define	LIBUSB20_SS_ENDPT_COMP_DESC(m,n) \
+  m(n, UINT8_T,  bLength, ) \
+  m(n, UINT8_T,  bDescriptorType, ) \
+  m(n, UINT8_T,  bMaxBurst, ) \
+  m(n, UINT8_T,  bmAttributes, ) \
+  m(n, UINT16_T, wBytesPerInterval, ) \
+
+LIBUSB20_MAKE_STRUCT(LIBUSB20_SS_ENDPT_COMP_DESC);
+
+#define	LIBUSB20_USB_20_DEVCAP_DESC(m,n) \
+  m(n, UINT8_T,  bLength, ) \
+  m(n, UINT8_T,  bDescriptorType, ) \
+  m(n, UINT8_T,  bDevCapabilityType, ) \
+  m(n, UINT32_T, bmAttributes, ) \
+
+LIBUSB20_MAKE_STRUCT(LIBUSB20_USB_20_DEVCAP_DESC);
+
+#define	LIBUSB20_SS_USB_DEVCAP_DESC(m,n) \
+  m(n, UINT8_T,  bLength, ) \
+  m(n, UINT8_T,  bDescriptorType, ) \
+  m(n, UINT8_T,  bDevCapabilityType, ) \
+  m(n, UINT8_T,  bmAttributes, ) \
+  m(n, UINT16_T, wSpeedSupported, ) \
+  m(n, UINT8_T,  bFunctionalitySupport, ) \
+  m(n, UINT8_T,  bU1DevExitLat, ) \
+  m(n, UINT16_T, wU2DevExitLat, ) \
+
+LIBUSB20_MAKE_STRUCT(LIBUSB20_SS_USB_DEVCAP_DESC);
+
+#define	LIBUSB20_BOS_DESCRIPTOR(m,n) \
+  m(n, UINT8_T,  bLength, ) \
+  m(n, UINT8_T,  bDescriptorType, ) \
+  m(n, UINT16_T, wTotalLength, ) \
+  m(n, UINT8_T,  bNumDeviceCapabilities, ) \
+
+LIBUSB20_MAKE_STRUCT(LIBUSB20_BOS_DESCRIPTOR);
+
 /* standard USB stuff */
 
 /** \ingroup desc
@@ -333,6 +370,24 @@ enum libusb20_descriptor_type {
 
 	/** Hub descriptor */
 	LIBUSB20_DT_HUB = 0x29,
+
+	/** Binary Object Store, BOS */
+	LIBUSB20_DT_BOS = 0x0f,
+
+	/** Device Capability */
+	LIBUSB20_DT_DEVICE_CAPABILITY = 0x10,
+
+	/** SuperSpeed endpoint companion */
+	LIBUSB20_DT_SS_ENDPOINT_COMPANION = 0x30,
+};
+
+/** \ingroup desc
+ * Device capability types as defined by the USB specification. */
+enum libusb20_device_capability_type {
+	LIBUSB20_WIRELESS_USB_DEVICE_CAPABILITY = 0x1,
+	LIBUSB20_USB_2_0_EXTENSION_DEVICE_CAPABILITY = 0x2,
+	LIBUSB20_SS_USB_DEVICE_CAPABILITY = 0x3,
+	LIBUSB20_CONTAINER_ID_DEVICE_CAPABILITY = 0x4,
 };
 
 /* Descriptor sizes per descriptor type */
@@ -342,6 +397,10 @@ enum libusb20_descriptor_type {
 #define	LIBUSB20_DT_ENDPOINT_SIZE		7
 #define	LIBUSB20_DT_ENDPOINT_AUDIO_SIZE		9	/* Audio extension */
 #define	LIBUSB20_DT_HUB_NONVAR_SIZE		7
+#define	LIBUSB20_DT_SS_ENDPOINT_COMPANION_SIZE	6
+#define	LIBUSB20_DT_BOS_SIZE		5
+#define	LIBUSB20_USB_2_0_EXTENSION_DEVICE_CAPABILITY_SIZE	7
+#define	LIBUSB20_SS_USB_DEVICE_CAPABILITY_SIZE	10
 
 #define	LIBUSB20_ENDPOINT_ADDRESS_MASK	0x0f	/* in bEndpointAddress */
 #define	LIBUSB20_ENDPOINT_DIR_MASK	0x80

Modified: user/attilio/vmcontention/release/doc/en_US.ISO8859-1/hardware/article.sgml
==============================================================================
--- user/attilio/vmcontention/release/doc/en_US.ISO8859-1/hardware/article.sgml	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/release/doc/en_US.ISO8859-1/hardware/article.sgml	Sat Nov 12 17:12:33 2011	(r227469)
@@ -798,8 +798,12 @@
 
       &hwlist.mly;
 
+      &hwlist.mps;
+
       &hwlist.mpt;
 
+      &hwlist.mvs;
+
       &hwlist.ncr;
 
       &hwlist.ncv;

Modified: user/attilio/vmcontention/sbin/ffsinfo/Makefile
==============================================================================
--- user/attilio/vmcontention/sbin/ffsinfo/Makefile	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/sbin/ffsinfo/Makefile	Sat Nov 12 17:12:33 2011	(r227469)
@@ -15,5 +15,5 @@ WARNS?=	1
 CFLAGS+=-DFS_DEBUG -I${GROWFS}
 DPADD=	${LIBUFS}
 LDADD=	-lufs
- 
-.include                
+
+.include 

Modified: user/attilio/vmcontention/sbin/geom/class/multipath/geom_multipath.c
==============================================================================
--- user/attilio/vmcontention/sbin/geom/class/multipath/geom_multipath.c	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/sbin/geom/class/multipath/geom_multipath.c	Sat Nov 12 17:12:33 2011	(r227469)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -48,31 +49,58 @@ uint32_t version = G_MULTIPATH_VERSION;
 static void mp_main(struct gctl_req *, unsigned int);
 static void mp_label(struct gctl_req *);
 static void mp_clear(struct gctl_req *);
-static void mp_add(struct gctl_req *);
 
 struct g_command class_commands[] = {
 	{
-		"label", G_FLAG_VERBOSE | G_FLAG_LOADKLD, mp_main, G_NULL_OPTS,
-		"[-v] name prov ..."
+		"create", G_FLAG_VERBOSE | G_FLAG_LOADKLD, NULL,
+		{
+			{ 'A', "active_active", NULL, G_TYPE_BOOL },
+			G_OPT_SENTINEL
+		},
+		"[-vA] name prov ..."
 	},
 	{
-		"add", G_FLAG_VERBOSE | G_FLAG_LOADKLD, mp_main, G_NULL_OPTS,
-		"[-v] name prov ..."
+		"label", G_FLAG_VERBOSE | G_FLAG_LOADKLD, mp_main,
+		{
+			{ 'A', "active_active", NULL, G_TYPE_BOOL },
+			G_OPT_SENTINEL
+		},
+		"[-vA] name prov ..."
 	},
 	{
-		"destroy", G_FLAG_VERBOSE, NULL, G_NULL_OPTS,
-		"[-v] prov ..."
+		"add", G_FLAG_VERBOSE, NULL, G_NULL_OPTS,
+		"[-v] name prov"
 	},
 	{
-		"clear", G_FLAG_VERBOSE, mp_main, G_NULL_OPTS,
-		"[-v] prov ..."
+		"remove", G_FLAG_VERBOSE, NULL, G_NULL_OPTS,
+		"[-v] name prov"
+	},
+	{
+		"fail", G_FLAG_VERBOSE, NULL, G_NULL_OPTS,
+		"[-v] name prov"
+	},
+	{
+		"restore", G_FLAG_VERBOSE, NULL, G_NULL_OPTS,
+		"[-v] name prov"
 	},
 	{
 		"rotate", G_FLAG_VERBOSE, NULL, G_NULL_OPTS,
-		"[-v] prov ..."
+		"[-v] name"
 	},
 	{
 		"getactive", G_FLAG_VERBOSE, NULL, G_NULL_OPTS,
+		"[-v] name"
+	},
+	{
+		"destroy", G_FLAG_VERBOSE, NULL, G_NULL_OPTS,
+		"[-v] name"
+	},
+	{
+		"stop", G_FLAG_VERBOSE, NULL, G_NULL_OPTS,
+		"[-v] name"
+	},
+	{
+		"clear", G_FLAG_VERBOSE, mp_main, G_NULL_OPTS,
 		"[-v] prov ..."
 	},
 	G_CMD_SENTINEL
@@ -90,8 +118,6 @@ mp_main(struct gctl_req *req, unsigned i
 	}
 	if (strcmp(name, "label") == 0) {
 		mp_label(req);
-	} else if (strcmp(name, "add") == 0) {
-		mp_add(req);
 	} else if (strcmp(name, "clear") == 0) {
 		mp_clear(req);
 	} else {
@@ -103,13 +129,13 @@ static void
 mp_label(struct gctl_req *req)
 {
 	struct g_multipath_metadata md;
-	off_t disksiz = 0, msize;
-	uint8_t *sector;
+	off_t disksize = 0, msize;
+	uint8_t *sector, *rsector;
 	char *ptr;
 	uuid_t uuid;
 	uint32_t secsize = 0, ssize, status;
-	const char *name, *mpname;
-	int error, i, nargs;
+	const char *name, *name2, *mpname;
+	int error, i, nargs, fd;
 
 	nargs = gctl_get_int(req, "nargs");
 	if (nargs < 2) {
@@ -132,14 +158,14 @@ mp_label(struct gctl_req *req)
 		}
 		if (i == 1) {
 			secsize = ssize;
-			disksiz	= msize;
+			disksize = msize;
 		} else {
 			if (secsize != ssize) {
 				gctl_error(req, "%s sector size %u different.",
 				    name, ssize);
 				return;
 			}
-			if (disksiz != msize) {
+			if (disksize != msize) {
 				gctl_error(req, "%s media size %ju different.",
 				    name, (intmax_t)msize);
 				return;
@@ -155,7 +181,7 @@ mp_label(struct gctl_req *req)
 	md.md_version = G_MULTIPATH_VERSION;
 	mpname = gctl_get_ascii(req, "arg0");
 	strlcpy(md.md_name, mpname, sizeof(md.md_name));
-	md.md_size = disksiz;
+	md.md_size = disksize;
 	md.md_sectorsize = secsize;
 	uuid_create(&uuid, &status);
 	if (status != uuid_s_ok) {
@@ -168,19 +194,10 @@ mp_label(struct gctl_req *req)
 		return;
 	}
 	strlcpy(md.md_uuid, ptr, sizeof (md.md_uuid));
+	md.md_active_active = gctl_get_int(req, "active_active");
 	free(ptr);
 
 	/*
-	 * Clear metadata on initial provider first.
-	 */
-	name = gctl_get_ascii(req, "arg1");
-	error = g_metadata_clear(name, NULL);
-	if (error != 0) {
-		gctl_error(req, "cannot clear metadata on %s: %s.", name, strerror(error));
-		return;
-	}
-
-	/*
 	 * Allocate a sector to write as metadata.
 	 */
 	sector = malloc(secsize);
@@ -189,6 +206,12 @@ mp_label(struct gctl_req *req)
 		return;
 	}
 	memset(sector, 0, secsize);
+	rsector = malloc(secsize);
+	if (rsector == NULL) {
+		free(sector);
+		gctl_error(req, "unable to allocate metadata buffer");
+		return;
+	}
 
 	/*
 	 * encode the metadata
@@ -198,6 +221,7 @@ mp_label(struct gctl_req *req)
 	/*
 	 * Store metadata on the initial provider.
 	 */
+	name = gctl_get_ascii(req, "arg1");
 	error = g_metadata_store(name, sector, secsize);
 	if (error != 0) {
 		gctl_error(req, "cannot store metadata on %s: %s.", name, strerror(error));
@@ -205,20 +229,29 @@ mp_label(struct gctl_req *req)
 	}
 
 	/*
-	 * Now add the rest of the providers.
+	 * Now touch the rest of the providers to hint retaste.
 	 */
-	error = gctl_change_param(req, "verb", -1, "add");
-	if (error) {
-		gctl_error(req, "unable to change verb to \"add\": %s.", strerror(error));
-		return;
-	}
 	for (i = 2; i < nargs; i++) {
-		error = gctl_change_param(req, "arg1", -1, gctl_get_ascii(req, "arg%d", i));
-		if (error) {
-			gctl_error(req, "unable to add %s to %s: %s.", gctl_get_ascii(req, "arg%d", i), mpname, strerror(error));
+		name2 = gctl_get_ascii(req, "arg%d", i);
+		fd = g_open(name2, 1);
+		if (fd < 0) {
+			fprintf(stderr, "Unable to open %s: %s.\n",
+			    name2, strerror(errno));
+			continue;
+		}
+		if (pread(fd, rsector, secsize, disksize - secsize) !=
+		    secsize) {
+			fprintf(stderr, "Unable to read metadata from %s: %s.\n",
+			    name2, strerror(errno));
+			g_close(fd);
 			continue;
 		}
-		mp_add(req);
+		g_close(fd);
+		if (memcmp(sector, rsector, secsize)) {
+			fprintf(stderr, "No metadata found on %s."
+			    " It is not a path of %s.\n",
+			    name2, name);
+		}
 	}
 }
 
@@ -247,13 +280,3 @@ mp_clear(struct gctl_req *req)
 	}
 }
 
-static void
-mp_add(struct gctl_req *req)
-{
-	const char *errstr;
-
-	errstr = gctl_issue(req);
-	if (errstr != NULL && errstr[0] != '\0') {
-		gctl_error(req, "%s", errstr);
-	}
-}

Modified: user/attilio/vmcontention/sbin/geom/class/multipath/gmultipath.8
==============================================================================
--- user/attilio/vmcontention/sbin/geom/class/multipath/gmultipath.8	Sat Nov 12 16:47:23 2011	(r227468)
+++ user/attilio/vmcontention/sbin/geom/class/multipath/gmultipath.8	Sat Nov 12 17:12:33 2011	(r227469)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 26, 2007
+.Dd October 31, 2011
 .Dt GMULTIPATH 8
 .Os
 .Sh NAME
@@ -32,11 +32,48 @@
 .Nd "disk multipath control utility"
 .Sh SYNOPSIS
 .Nm
+.Cm create
+.Op Fl Av
+.Ar name
+.Ar prov ...
+.Nm
 .Cm label
-.Op Fl hv
+.Op Fl Av
 .Ar name
 .Ar prov ...
 .Nm
+.Cm add
+.Op Fl v
+.Ar name prov
+.Nm
+.Cm remove
+.Op Fl v
+.Ar name prov
+.Nm
+.Cm fail
+.Op Fl v
+.Ar name prov
+.Nm
+.Cm restore
+.Op Fl v
+.Ar name prov
+.Nm
+.Cm rotate
+.Op Fl v
+.Ar name
+.Nm
+.Cm getactive
+.Op Fl v
+.Ar name
+.Nm
+.Cm destroy
+.Op Fl v
+.Ar name
+.Nm
+.Cm stop
+.Op Fl v
+.Ar name
+.Nm
 .Cm clear
 .Op Fl v
 .Ar prov ...
@@ -53,27 +90,79 @@ The
 .Nm
 utility is used for device multipath configuration.
 .Pp
-Only automatic configuration is supported at the present time via the
-.Cm label
-command.
-This operation writes a label on the last sector of the underlying

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***