svn commit: r250896 - in user/adrian/net80211_tx: . bin/df bin/kenv cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cg cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip cddl/contrib/openso...

Adrian Chadd adrian at FreeBSD.org
Wed May 22 00:55:01 UTC 2013


Author: adrian
Date: Wed May 22 00:54:57 2013
New Revision: 250896
URL: http://svnweb.freebsd.org/changeset/base/250896

Log:
  Merge from HEAD

Added:
  user/adrian/net80211_tx/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cg/
     - copied from r250895, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cg/
  user/adrian/net80211_tx/contrib/bmake/mk/stage-install.sh
     - copied unchanged from r250895, head/contrib/bmake/mk/stage-install.sh
  user/adrian/net80211_tx/contrib/flex/
     - copied from r250895, head/contrib/flex/
  user/adrian/net80211_tx/include/uchar.h
     - copied unchanged from r250895, head/include/uchar.h
  user/adrian/net80211_tx/include/xlocale/_uchar.h
     - copied unchanged from r250895, head/include/xlocale/_uchar.h
  user/adrian/net80211_tx/lib/csu/Makefile
     - copied unchanged from r250895, head/lib/csu/Makefile
  user/adrian/net80211_tx/lib/libc/locale/c16rtomb.c
     - copied unchanged from r250895, head/lib/libc/locale/c16rtomb.c
  user/adrian/net80211_tx/lib/libc/locale/c32rtomb.c
     - copied unchanged from r250895, head/lib/libc/locale/c32rtomb.c
  user/adrian/net80211_tx/lib/libc/locale/mbrtoc16.c
     - copied unchanged from r250895, head/lib/libc/locale/mbrtoc16.c
  user/adrian/net80211_tx/lib/libc/locale/mbrtoc32.c
     - copied unchanged from r250895, head/lib/libc/locale/mbrtoc32.c
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/share/xml/catalog.xml
     - copied unchanged from r250895, head/release/doc/ja_JP.eucJP/share/xml/catalog.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.ent
     - copied unchanged from r250895, head/release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.ent
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml
     - copied unchanged from r250895, head/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.ent
     - copied unchanged from r250895, head/release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.ent
  user/adrian/net80211_tx/release/doc/share/xml/catalog.xml
     - copied unchanged from r250895, head/release/doc/share/xml/catalog.xml
  user/adrian/net80211_tx/share/man/man4/qlxgbe.4
     - copied unchanged from r250895, head/share/man/man4/qlxgbe.4
  user/adrian/net80211_tx/sys/amd64/include/fdt.h
     - copied unchanged from r250895, head/sys/amd64/include/fdt.h
  user/adrian/net80211_tx/sys/amd64/include/ofw_machdep.h
     - copied unchanged from r250895, head/sys/amd64/include/ofw_machdep.h
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/asloptions.c
     - copied unchanged from r250895, head/sys/contrib/dev/acpica/compiler/asloptions.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/tables/tbprint.c
     - copied unchanged from r250895, head/sys/contrib/dev/acpica/components/tables/tbprint.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/utilities/utbuffer.c
     - copied unchanged from r250895, head/sys/contrib/dev/acpica/components/utilities/utbuffer.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/utilities/uterror.c
     - copied unchanged from r250895, head/sys/contrib/dev/acpica/components/utilities/uterror.c
  user/adrian/net80211_tx/sys/dev/fdt/fdt_x86.c
     - copied unchanged from r250895, head/sys/dev/fdt/fdt_x86.c
  user/adrian/net80211_tx/sys/dev/qlxgbe/
     - copied from r250895, head/sys/dev/qlxgbe/
  user/adrian/net80211_tx/sys/dev/uart/uart_cpu_fdt.c
     - copied unchanged from r250895, head/sys/dev/uart/uart_cpu_fdt.c
  user/adrian/net80211_tx/sys/i386/include/fdt.h
     - copied unchanged from r250895, head/sys/i386/include/fdt.h
  user/adrian/net80211_tx/sys/i386/include/ofw_machdep.h
     - copied unchanged from r250895, head/sys/i386/include/ofw_machdep.h
  user/adrian/net80211_tx/sys/modules/qlxgbe/
     - copied from r250895, head/sys/modules/qlxgbe/
  user/adrian/net80211_tx/sys/x86/include/fdt.h
     - copied unchanged from r250895, head/sys/x86/include/fdt.h
  user/adrian/net80211_tx/sys/x86/include/ofw_machdep.h
     - copied unchanged from r250895, head/sys/x86/include/ofw_machdep.h
  user/adrian/net80211_tx/sys/x86/x86/fdt_machdep.c
     - copied unchanged from r250895, head/sys/x86/x86/fdt_machdep.c
  user/adrian/net80211_tx/tools/build/options/WITHOUT_BMAKE
     - copied unchanged from r250895, head/tools/build/options/WITHOUT_BMAKE
  user/adrian/net80211_tx/tools/build/options/WITHOUT_CROSS_COMPILER
     - copied unchanged from r250895, head/tools/build/options/WITHOUT_CROSS_COMPILER
  user/adrian/net80211_tx/tools/build/options/WITHOUT_FORMAT_EXTENSIONS
     - copied unchanged from r250895, head/tools/build/options/WITHOUT_FORMAT_EXTENSIONS
  user/adrian/net80211_tx/tools/regression/lib/libc/gen/test-popen.c
     - copied unchanged from r250895, head/tools/regression/lib/libc/gen/test-popen.c
  user/adrian/net80211_tx/tools/regression/lib/libc/locale/test-c16rtomb.c
     - copied unchanged from r250895, head/tools/regression/lib/libc/locale/test-c16rtomb.c
  user/adrian/net80211_tx/tools/regression/lib/libc/locale/test-mbrtoc16.c
     - copied unchanged from r250895, head/tools/regression/lib/libc/locale/test-mbrtoc16.c
  user/adrian/net80211_tx/tools/tools/makeroot/
     - copied from r250895, head/tools/tools/makeroot/
  user/adrian/net80211_tx/usr.bin/lex/initparse.c
     - copied unchanged from r250895, head/usr.bin/lex/initparse.c
  user/adrian/net80211_tx/usr.bin/lex/initparse.h
     - copied unchanged from r250895, head/usr.bin/lex/initparse.h
  user/adrian/net80211_tx/usr.bin/lex/initskel.c
     - copied unchanged from r250895, head/usr.bin/lex/initskel.c
  user/adrian/net80211_tx/usr.bin/lex/version.awk
     - copied unchanged from r250895, head/usr.bin/lex/version.awk
Deleted:
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/share/xml/dev-auto-ja.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/share/xml/dev-auto-ru.xml
  user/adrian/net80211_tx/tools/build/options/WITH_BMAKE
  user/adrian/net80211_tx/usr.bin/lex/COPYING
  user/adrian/net80211_tx/usr.bin/lex/FlexLexer.h
  user/adrian/net80211_tx/usr.bin/lex/NEWS
  user/adrian/net80211_tx/usr.bin/lex/README
  user/adrian/net80211_tx/usr.bin/lex/ccl.c
  user/adrian/net80211_tx/usr.bin/lex/dfa.c
  user/adrian/net80211_tx/usr.bin/lex/ecs.c
  user/adrian/net80211_tx/usr.bin/lex/flex.skl
  user/adrian/net80211_tx/usr.bin/lex/flexdef.h
  user/adrian/net80211_tx/usr.bin/lex/gen.c
  user/adrian/net80211_tx/usr.bin/lex/lib/libmain.c
  user/adrian/net80211_tx/usr.bin/lex/lib/libyywrap.c
  user/adrian/net80211_tx/usr.bin/lex/main.c
  user/adrian/net80211_tx/usr.bin/lex/misc.c
  user/adrian/net80211_tx/usr.bin/lex/mkskel.sh
  user/adrian/net80211_tx/usr.bin/lex/nfa.c
  user/adrian/net80211_tx/usr.bin/lex/parse.y
  user/adrian/net80211_tx/usr.bin/lex/scan.l
  user/adrian/net80211_tx/usr.bin/lex/sym.c
  user/adrian/net80211_tx/usr.bin/lex/tblcmp.c
  user/adrian/net80211_tx/usr.bin/lex/version.h
  user/adrian/net80211_tx/usr.bin/lex/yylex.c
Modified:
  user/adrian/net80211_tx/MAINTAINERS   (contents, props changed)
  user/adrian/net80211_tx/Makefile
  user/adrian/net80211_tx/Makefile.inc1
  user/adrian/net80211_tx/ObsoleteFiles.inc
  user/adrian/net80211_tx/UPDATING
  user/adrian/net80211_tx/bin/df/df.1
  user/adrian/net80211_tx/bin/kenv/kenv.c
  user/adrian/net80211_tx/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl
  user/adrian/net80211_tx/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl
  user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c
  user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c
  user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
  user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h
  user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c
  user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.h
  user/adrian/net80211_tx/contrib/bmake/ChangeLog
  user/adrian/net80211_tx/contrib/bmake/FILES
  user/adrian/net80211_tx/contrib/bmake/Makefile
  user/adrian/net80211_tx/contrib/bmake/main.c
  user/adrian/net80211_tx/contrib/bmake/meta.c
  user/adrian/net80211_tx/contrib/bmake/mk/ChangeLog
  user/adrian/net80211_tx/contrib/bmake/mk/FILES
  user/adrian/net80211_tx/contrib/bmake/mk/gendirdeps.mk
  user/adrian/net80211_tx/contrib/bmake/mk/install-mk
  user/adrian/net80211_tx/contrib/bmake/mk/meta.stage.mk
  user/adrian/net80211_tx/contrib/bmake/mk/meta2deps.py
  user/adrian/net80211_tx/contrib/bmake/mk/meta2deps.sh
  user/adrian/net80211_tx/contrib/bmake/mk/options.mk
  user/adrian/net80211_tx/contrib/bmake/mk/progs.mk
  user/adrian/net80211_tx/contrib/bmake/suff.c
  user/adrian/net80211_tx/contrib/bmake/var.c
  user/adrian/net80211_tx/contrib/libpcap/pcap-filter.manmisc
  user/adrian/net80211_tx/contrib/libpcap/pcap-filter.manmisc.in
  user/adrian/net80211_tx/contrib/libpcap/scanner.l
  user/adrian/net80211_tx/contrib/nvi/common/exf.c
  user/adrian/net80211_tx/contrib/nvi/common/options.c
  user/adrian/net80211_tx/contrib/nvi/include/options_def.h
  user/adrian/net80211_tx/crypto/heimdal/lib/kadm5/ipropd_master.c
  user/adrian/net80211_tx/crypto/openssh/ChangeLog
  user/adrian/net80211_tx/crypto/openssh/README
  user/adrian/net80211_tx/crypto/openssh/krl.c
  user/adrian/net80211_tx/crypto/openssh/openbsd-compat/bsd-cygwin_util.c
  user/adrian/net80211_tx/crypto/openssh/openbsd-compat/bsd-cygwin_util.h
  user/adrian/net80211_tx/crypto/openssh/packet.c
  user/adrian/net80211_tx/crypto/openssh/ssh_config
  user/adrian/net80211_tx/crypto/openssh/ssh_config.5
  user/adrian/net80211_tx/crypto/openssh/sshconnect.c
  user/adrian/net80211_tx/crypto/openssh/sshd_config
  user/adrian/net80211_tx/crypto/openssh/sshd_config.5
  user/adrian/net80211_tx/crypto/openssh/version.h
  user/adrian/net80211_tx/etc/rc
  user/adrian/net80211_tx/etc/rc.d/ipfw
  user/adrian/net80211_tx/etc/rc.d/netif
  user/adrian/net80211_tx/etc/rc.d/routing
  user/adrian/net80211_tx/etc/rc.shutdown
  user/adrian/net80211_tx/gnu/usr.bin/diff/Makefile
  user/adrian/net80211_tx/gnu/usr.bin/grep/Makefile
  user/adrian/net80211_tx/gnu/usr.bin/grep/dfa.c
  user/adrian/net80211_tx/gnu/usr.bin/grep/grep.c
  user/adrian/net80211_tx/gnu/usr.bin/grep/search.c
  user/adrian/net80211_tx/include/Makefile
  user/adrian/net80211_tx/include/arpa/tftp.h
  user/adrian/net80211_tx/include/fts.h
  user/adrian/net80211_tx/include/ifaddrs.h
  user/adrian/net80211_tx/include/protocols/rwhod.h
  user/adrian/net80211_tx/include/stdatomic.h
  user/adrian/net80211_tx/include/xlocale/Makefile
  user/adrian/net80211_tx/lib/libc/gen/fts.3
  user/adrian/net80211_tx/lib/libc/gen/popen.3
  user/adrian/net80211_tx/lib/libc/gen/popen.c
  user/adrian/net80211_tx/lib/libc/locale/Makefile.inc
  user/adrian/net80211_tx/lib/libc/locale/Symbol.map
  user/adrian/net80211_tx/lib/libc/locale/mbrtowc.3
  user/adrian/net80211_tx/lib/libc/locale/wcrtomb.3
  user/adrian/net80211_tx/lib/libc/locale/xlocale_private.h
  user/adrian/net80211_tx/lib/libc/net/getifaddrs.3
  user/adrian/net80211_tx/lib/libc/net/getifmaddrs.3
  user/adrian/net80211_tx/lib/libc/stdlib/atol.3
  user/adrian/net80211_tx/lib/libc/sys/setfib.2
  user/adrian/net80211_tx/lib/libthr/thread/thr_spec.c
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/early-adopter/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/errata/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/installation/i386/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/readme/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml
  user/adrian/net80211_tx/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml
  user/adrian/net80211_tx/release/doc/en_US.ISO8859-1/Makefile
  user/adrian/net80211_tx/release/doc/en_US.ISO8859-1/errata/article.xml
  user/adrian/net80211_tx/release/doc/en_US.ISO8859-1/hardware/Makefile
  user/adrian/net80211_tx/release/doc/en_US.ISO8859-1/hardware/article.xml
  user/adrian/net80211_tx/release/doc/en_US.ISO8859-1/readme/article.xml
  user/adrian/net80211_tx/release/doc/en_US.ISO8859-1/relnotes/article.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/errata/article.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/installation/common/install.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml
  user/adrian/net80211_tx/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/errata/article.xml   (contents, props changed)
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/alpha/Makefile
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/alpha/article.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/amd64/Makefile
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/amd64/article.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml   (contents, props changed)
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/common/artheader.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/common/dev.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/common/intro.xml   (contents, props changed)
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/i386/Makefile
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/i386/article.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml   (contents, props changed)
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/ia64/Makefile
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/ia64/article.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml   (contents, props changed)
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/pc98/Makefile
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/pc98/article.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml   (contents, props changed)
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/relnotes/common/new.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/relnotes/i386/article.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml
  user/adrian/net80211_tx/release/doc/ja_JP.eucJP/share/xml/catalog
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/errata/article.xml   (contents, props changed)
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/installation/common/install.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/installation/common/layout.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/installation/i386/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/readme/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml
  user/adrian/net80211_tx/release/doc/ru_RU.KOI8-R/share/xml/catalog
  user/adrian/net80211_tx/release/doc/share/mk/doc.relnotes.mk
  user/adrian/net80211_tx/release/doc/share/xml/Makefile
  user/adrian/net80211_tx/release/doc/share/xml/release.ent
  user/adrian/net80211_tx/release/doc/zh_CN.GB2312/errata/article.xml
  user/adrian/net80211_tx/release/doc/zh_CN.GB2312/hardware/Makefile
  user/adrian/net80211_tx/release/doc/zh_CN.GB2312/hardware/article.xml
  user/adrian/net80211_tx/release/doc/zh_CN.GB2312/readme/article.xml
  user/adrian/net80211_tx/release/doc/zh_CN.GB2312/relnotes/article.xml
  user/adrian/net80211_tx/sbin/camcontrol/camcontrol.c
  user/adrian/net80211_tx/sbin/dumpfs/dumpfs.8
  user/adrian/net80211_tx/sbin/dumpfs/dumpfs.c
  user/adrian/net80211_tx/sbin/ipfw/ipfw2.c
  user/adrian/net80211_tx/sbin/tunefs/tunefs.c
  user/adrian/net80211_tx/share/man/man4/Makefile
  user/adrian/net80211_tx/share/man/man5/src.conf.5
  user/adrian/net80211_tx/share/misc/bsd-family-tree
  user/adrian/net80211_tx/share/mk/bsd.own.mk
  user/adrian/net80211_tx/sys/amd64/amd64/db_trace.c
  user/adrian/net80211_tx/sys/amd64/amd64/machdep.c
  user/adrian/net80211_tx/sys/amd64/amd64/mp_machdep.c
  user/adrian/net80211_tx/sys/amd64/amd64/pmap.c
  user/adrian/net80211_tx/sys/amd64/include/md_var.h
  user/adrian/net80211_tx/sys/amd64/include/metadata.h
  user/adrian/net80211_tx/sys/amd64/include/pcpu.h
  user/adrian/net80211_tx/sys/arm/arm/cpufunc_asm_sheeva.S
  user/adrian/net80211_tx/sys/arm/arm/pmap-v6.c
  user/adrian/net80211_tx/sys/arm/arm/pmap.c
  user/adrian/net80211_tx/sys/arm/arm/stack_machdep.c
  user/adrian/net80211_tx/sys/arm/conf/BEAGLEBONE
  user/adrian/net80211_tx/sys/arm/include/pmap.h
  user/adrian/net80211_tx/sys/boot/fdt/dts/beaglebone-black.dts
  user/adrian/net80211_tx/sys/cam/ata/ata_da.c
  user/adrian/net80211_tx/sys/cam/cam_xpt.c
  user/adrian/net80211_tx/sys/cam/cam_xpt_periph.h
  user/adrian/net80211_tx/sys/cam/scsi/scsi_cd.c
  user/adrian/net80211_tx/sys/cam/scsi/scsi_ch.c
  user/adrian/net80211_tx/sys/cam/scsi/scsi_da.c
  user/adrian/net80211_tx/sys/cam/scsi/scsi_sa.c
  user/adrian/net80211_tx/sys/compat/freebsd32/freebsd32_misc.c
  user/adrian/net80211_tx/sys/compat/freebsd32/freebsd32_proto.h
  user/adrian/net80211_tx/sys/compat/freebsd32/freebsd32_syscall.h
  user/adrian/net80211_tx/sys/compat/freebsd32/freebsd32_syscalls.c
  user/adrian/net80211_tx/sys/compat/freebsd32/freebsd32_sysent.c
  user/adrian/net80211_tx/sys/compat/freebsd32/freebsd32_systrace_args.c
  user/adrian/net80211_tx/sys/compat/freebsd32/syscalls.master
  user/adrian/net80211_tx/sys/conf/Makefile.amd64
  user/adrian/net80211_tx/sys/conf/Makefile.i386
  user/adrian/net80211_tx/sys/conf/NOTES
  user/adrian/net80211_tx/sys/conf/files
  user/adrian/net80211_tx/sys/conf/files.amd64
  user/adrian/net80211_tx/sys/conf/files.arm
  user/adrian/net80211_tx/sys/conf/files.i386
  user/adrian/net80211_tx/sys/conf/files.mips
  user/adrian/net80211_tx/sys/conf/files.powerpc
  user/adrian/net80211_tx/sys/conf/kern.mk
  user/adrian/net80211_tx/sys/conf/options.arm
  user/adrian/net80211_tx/sys/contrib/dev/acpica/acpica_prep.sh
  user/adrian/net80211_tx/sys/contrib/dev/acpica/changes.txt   (contents, props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/common/adisasm.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/common/adwalk.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/common/dmextern.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/common/dmrestag.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/common/dmtable.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/common/dmtbdump.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/common/getopt.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslanalyze.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslbtypes.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslcodegen.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslcompile.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslcompiler.h
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslerror.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslfold.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslglobal.h
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslhex.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/asllength.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/asllisting.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/asllistsup.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslload.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/asllookup.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslmain.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslmessages.h
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslmethod.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslnamesp.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/asloffset.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslopcodes.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/asloperands.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslpredef.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslresource.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslrestype1i.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslrestype2s.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslstartup.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslsupport.l
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/asltransform.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/asltree.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/asltypes.h
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslutils.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslwalks.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/aslxref.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/dtexpress.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/dtfield.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/dtio.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/dtsubtable.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/dttable.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/dtutils.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/prscan.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/debugger/dbcmds.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/debugger/dbconvert.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/debugger/dbdisply.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/debugger/dbexec.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/debugger/dbhistry.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/debugger/dbinput.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/debugger/dbmethod.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/debugger/dbnames.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/debugger/dbstats.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/debugger/dbutils.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/debugger/dbxface.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/disassembler/dmnames.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/disassembler/dmobject.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/dispatcher/dsinit.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/dispatcher/dswload.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/events/evglock.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/events/evgpe.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/events/evgpeblk.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/events/evgpeinit.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/events/evhandler.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/events/evmisc.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/events/evrgnini.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/events/evxfgpe.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/events/evxfregn.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exconfig.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exconvrt.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/excreate.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exdebug.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exdump.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exfield.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exfldio.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exmisc.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exnames.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exoparg1.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exoparg2.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exoparg3.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exoparg6.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exprep.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exregion.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exresnte.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exresolv.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exresop.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exstore.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/exstoren.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/hardware/hwacpi.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/hardware/hwgpe.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/hardware/hwregs.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/hardware/hwxface.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/namespace/nsaccess.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/namespace/nsconvert.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/namespace/nsdump.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/namespace/nsinit.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/namespace/nspredef.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/namespace/nsrepair.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/namespace/nsutils.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/parser/psargs.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/parser/psloop.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/parser/psobject.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/parser/psparse.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/parser/pstree.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/resources/rscalc.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/resources/rscreate.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/resources/rsdump.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/resources/rsmisc.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/resources/rsutils.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/resources/rsxface.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/tables/tbinstal.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/tables/tbutils.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/tables/tbxfload.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/utilities/utcopy.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/utilities/utdebug.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/utilities/utdelete.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/utilities/uteval.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/utilities/utexcep.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/utilities/utids.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/utilities/utmisc.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/utilities/utobject.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/utilities/utstring.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/utilities/uttrack.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/utilities/utxferror.c
  user/adrian/net80211_tx/sys/contrib/dev/acpica/include/acapps.h
  user/adrian/net80211_tx/sys/contrib/dev/acpica/include/acglobal.h
  user/adrian/net80211_tx/sys/contrib/dev/acpica/include/acpiosxf.h
  user/adrian/net80211_tx/sys/contrib/dev/acpica/include/acpixf.h
  user/adrian/net80211_tx/sys/contrib/dev/acpica/include/actypes.h
  user/adrian/net80211_tx/sys/contrib/dev/acpica/include/acutils.h
  user/adrian/net80211_tx/sys/contrib/dev/acpica/include/platform/acenv.h
  user/adrian/net80211_tx/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
  user/adrian/net80211_tx/sys/dev/acpica/Osd/OsdTable.c
  user/adrian/net80211_tx/sys/dev/ahci/ahci.c
  user/adrian/net80211_tx/sys/dev/ath/ath_hal/ah.c
  user/adrian/net80211_tx/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
  user/adrian/net80211_tx/sys/dev/ath/if_ath.c
  user/adrian/net80211_tx/sys/dev/ath/if_ath_beacon.c
  user/adrian/net80211_tx/sys/dev/ath/if_ath_misc.h
  user/adrian/net80211_tx/sys/dev/ath/if_ath_sysctl.c
  user/adrian/net80211_tx/sys/dev/ath/if_ath_tdma.c
  user/adrian/net80211_tx/sys/dev/ath/if_ath_tx.c
  user/adrian/net80211_tx/sys/dev/ath/if_ath_tx.h
  user/adrian/net80211_tx/sys/dev/ath/if_athvar.h
  user/adrian/net80211_tx/sys/dev/cxgb/cxgb_main.c
  user/adrian/net80211_tx/sys/dev/cxgbe/t4_main.c
  user/adrian/net80211_tx/sys/dev/mmc/mmcsd.c
  user/adrian/net80211_tx/sys/dev/pci/pcireg.h
  user/adrian/net80211_tx/sys/dev/sound/pci/hda/hdaa_patches.c
  user/adrian/net80211_tx/sys/dev/sound/usb/uaudio.c
  user/adrian/net80211_tx/sys/dev/uart/uart_bus_fdt.c
  user/adrian/net80211_tx/sys/dev/usb/quirk/usb_quirk.c
  user/adrian/net80211_tx/sys/dev/usb/serial/uslcom.c
  user/adrian/net80211_tx/sys/dev/usb/usb_freebsd.h
  user/adrian/net80211_tx/sys/dev/usb/usbdevs
  user/adrian/net80211_tx/sys/fs/nfsserver/nfs_nfsdport.c
  user/adrian/net80211_tx/sys/fs/nullfs/null_vfsops.c
  user/adrian/net80211_tx/sys/geom/geom_dump.c
  user/adrian/net80211_tx/sys/geom/raid/md_ddf.c
  user/adrian/net80211_tx/sys/i386/i386/machdep.c
  user/adrian/net80211_tx/sys/i386/i386/pmap.c
  user/adrian/net80211_tx/sys/i386/include/metadata.h
  user/adrian/net80211_tx/sys/i386/xen/pmap.c
  user/adrian/net80211_tx/sys/ia64/ia64/pmap.c
  user/adrian/net80211_tx/sys/kern/init_sysent.c
  user/adrian/net80211_tx/sys/kern/kern_jail.c
  user/adrian/net80211_tx/sys/kern/kern_priv.c
  user/adrian/net80211_tx/sys/kern/subr_sbuf.c
  user/adrian/net80211_tx/sys/kern/syscalls.c
  user/adrian/net80211_tx/sys/kern/syscalls.master
  user/adrian/net80211_tx/sys/kern/systrace_args.c
  user/adrian/net80211_tx/sys/kern/uipc_usrreq.c
  user/adrian/net80211_tx/sys/kern/vfs_bio.c
  user/adrian/net80211_tx/sys/mips/mips/pmap.c
  user/adrian/net80211_tx/sys/modules/Makefile
  user/adrian/net80211_tx/sys/modules/acpi/acpi/Makefile
  user/adrian/net80211_tx/sys/net/if_ethersubr.c
  user/adrian/net80211_tx/sys/net/ppp_defs.h
  user/adrian/net80211_tx/sys/net/route.c
  user/adrian/net80211_tx/sys/netinet/sctp_os_bsd.h
  user/adrian/net80211_tx/sys/netinet/sctp_output.c
  user/adrian/net80211_tx/sys/netinet/sctputil.c
  user/adrian/net80211_tx/sys/netinet6/in6.c
  user/adrian/net80211_tx/sys/netinet6/ip6_output.c
  user/adrian/net80211_tx/sys/powerpc/aim/mmu_oea.c
  user/adrian/net80211_tx/sys/powerpc/aim/mmu_oea64.c
  user/adrian/net80211_tx/sys/powerpc/booke/pmap.c
  user/adrian/net80211_tx/sys/powerpc/include/gdb_machdep.h
  user/adrian/net80211_tx/sys/powerpc/wii/wii_gpio.c
  user/adrian/net80211_tx/sys/powerpc/wii/wii_gpioreg.h
  user/adrian/net80211_tx/sys/sparc64/sparc64/pmap.c
  user/adrian/net80211_tx/sys/sys/_types.h
  user/adrian/net80211_tx/sys/sys/cdefs.h
  user/adrian/net80211_tx/sys/sys/mbuf.h
  user/adrian/net80211_tx/sys/sys/param.h
  user/adrian/net80211_tx/sys/sys/sdt.h
  user/adrian/net80211_tx/sys/sys/syscall.h
  user/adrian/net80211_tx/sys/sys/syscall.mk
  user/adrian/net80211_tx/sys/sys/sysproto.h
  user/adrian/net80211_tx/sys/sys/timex.h
  user/adrian/net80211_tx/sys/ufs/ffs/ffs_softdep.c
  user/adrian/net80211_tx/sys/vm/vm_fault.c
  user/adrian/net80211_tx/sys/vm/vm_map.c
  user/adrian/net80211_tx/sys/vm/vm_object.h
  user/adrian/net80211_tx/sys/vm/vm_page.c
  user/adrian/net80211_tx/tools/regression/lib/libc/gen/Makefile
  user/adrian/net80211_tx/tools/regression/lib/libc/locale/Makefile
  user/adrian/net80211_tx/usr.bin/bmake/Makefile
  user/adrian/net80211_tx/usr.bin/bmake/Makefile.inc
  user/adrian/net80211_tx/usr.bin/lex/Makefile
  user/adrian/net80211_tx/usr.bin/lex/config.h
  user/adrian/net80211_tx/usr.bin/lex/initscan.c
  user/adrian/net80211_tx/usr.bin/lex/lex.1
  user/adrian/net80211_tx/usr.bin/lex/lib/Makefile
  user/adrian/net80211_tx/usr.bin/make/Makefile
  user/adrian/net80211_tx/usr.bin/split/split.c
  user/adrian/net80211_tx/usr.sbin/acpi/acpidb/Makefile
  user/adrian/net80211_tx/usr.sbin/acpi/iasl/Makefile
  user/adrian/net80211_tx/usr.sbin/bsdconfig/bsdconfig
  user/adrian/net80211_tx/usr.sbin/bsdconfig/console/console
  user/adrian/net80211_tx/usr.sbin/bsdconfig/console/font
  user/adrian/net80211_tx/usr.sbin/bsdconfig/console/keymap
  user/adrian/net80211_tx/usr.sbin/bsdconfig/console/repeat
  user/adrian/net80211_tx/usr.sbin/bsdconfig/console/saver
  user/adrian/net80211_tx/usr.sbin/bsdconfig/console/screenmap
  user/adrian/net80211_tx/usr.sbin/bsdconfig/console/ttys
  user/adrian/net80211_tx/usr.sbin/bsdconfig/diskmgmt/diskmgmt
  user/adrian/net80211_tx/usr.sbin/bsdconfig/docsinstall/docsinstall
  user/adrian/net80211_tx/usr.sbin/bsdconfig/mouse/disable
  user/adrian/net80211_tx/usr.sbin/bsdconfig/mouse/enable
  user/adrian/net80211_tx/usr.sbin/bsdconfig/mouse/flags
  user/adrian/net80211_tx/usr.sbin/bsdconfig/mouse/mouse
  user/adrian/net80211_tx/usr.sbin/bsdconfig/mouse/port
  user/adrian/net80211_tx/usr.sbin/bsdconfig/mouse/type
  user/adrian/net80211_tx/usr.sbin/bsdconfig/networking/defaultrouter
  user/adrian/net80211_tx/usr.sbin/bsdconfig/networking/devices
  user/adrian/net80211_tx/usr.sbin/bsdconfig/networking/hostname
  user/adrian/net80211_tx/usr.sbin/bsdconfig/networking/nameservers
  user/adrian/net80211_tx/usr.sbin/bsdconfig/networking/networking
  user/adrian/net80211_tx/usr.sbin/bsdconfig/packages/packages
  user/adrian/net80211_tx/usr.sbin/bsdconfig/password/password
  user/adrian/net80211_tx/usr.sbin/bsdconfig/security/kern_securelevel
  user/adrian/net80211_tx/usr.sbin/bsdconfig/security/security
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/common.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/dialog.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/share/strings.subr
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/misc
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/rcadd
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/rcconf
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/rcdelete
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/rcedit
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/rcvar
  user/adrian/net80211_tx/usr.sbin/bsdconfig/startup/startup
  user/adrian/net80211_tx/usr.sbin/bsdconfig/timezone/timezone
  user/adrian/net80211_tx/usr.sbin/bsdconfig/ttys/ttys
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/groupadd
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/groupdel
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/groupedit
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/useradd
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/userdel
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/useredit
  user/adrian/net80211_tx/usr.sbin/bsdconfig/usermgmt/usermgmt
  user/adrian/net80211_tx/usr.sbin/jls/jls.8
  user/adrian/net80211_tx/usr.sbin/jls/jls.c
  user/adrian/net80211_tx/usr.sbin/pciconf/cap.c
  user/adrian/net80211_tx/usr.sbin/pkg_install/version/pkg_version.1
Directory Properties:
  user/adrian/net80211_tx/   (props changed)
  user/adrian/net80211_tx/cddl/   (props changed)
  user/adrian/net80211_tx/cddl/contrib/opensolaris/   (props changed)
  user/adrian/net80211_tx/contrib/bmake/   (props changed)
  user/adrian/net80211_tx/contrib/libpcap/   (props changed)
  user/adrian/net80211_tx/crypto/heimdal/   (props changed)
  user/adrian/net80211_tx/crypto/openssh/   (props changed)
  user/adrian/net80211_tx/lib/libc/   (props changed)
  user/adrian/net80211_tx/sbin/   (props changed)
  user/adrian/net80211_tx/sbin/ipfw/   (props changed)
  user/adrian/net80211_tx/share/man/man4/   (props changed)
  user/adrian/net80211_tx/sys/   (props changed)
  user/adrian/net80211_tx/sys/boot/   (props changed)
  user/adrian/net80211_tx/sys/conf/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/common/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/compiler/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/debugger/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/disassembler/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/dispatcher/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/events/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/executer/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/hardware/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/namespace/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/parser/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/resources/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/tables/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/components/utilities/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/include/   (props changed)
  user/adrian/net80211_tx/sys/contrib/dev/acpica/os_specific/   (props changed)

Modified: user/adrian/net80211_tx/MAINTAINERS
==============================================================================
--- user/adrian/net80211_tx/MAINTAINERS	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/MAINTAINERS	Wed May 22 00:54:57 2013	(r250896)
@@ -28,6 +28,7 @@ MAC Framework	rwatson	Pre-commit review 
 MAC Modules	rwatson	Pre-commit review requested.
 contrib/openbsm	rwatson	Pre-commit review requested.
 sys/security/audit	rwatson	Pre-commit review requested.
+ath(4)		adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
 ahc(4)		gibbs	Pre-commit review requested.
 ahd(4)		gibbs	Pre-commit review requested.
 PC Card		imp	Pre-commit review requested.
@@ -63,7 +64,7 @@ procfs		des	Pre-commit review requested.
 linprocfs	des	Pre-commit review requested.
 lpr		gad	Pre-commit review requested, particularly for
 			lpd/recvjob.c and lpd/printjob.c.
-newsyslog(8)	gad	Heads-up appreciated.  I'm going thru the PR's for it.
+net80211	adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
 nvi		peter	Try not to break it.
 libz		peter	Try not to break it.
 groff		ru	Recommends pre-commit review.

Modified: user/adrian/net80211_tx/Makefile
==============================================================================
--- user/adrian/net80211_tx/Makefile	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/Makefile	Wed May 22 00:54:57 2013	(r250896)
@@ -281,7 +281,7 @@ kernel: buildkernel installkernel
 #
 upgrade_checks:
 .if !defined(.PARSEDIR)
-.if defined(WITH_BMAKE)
+.if !defined(WITHOUT_BMAKE)
 	(cd ${.CURDIR} && ${MAKE} bmake)
 .else
 	@if ! (cd ${.CURDIR}/tools/build/make_check && \

Modified: user/adrian/net80211_tx/Makefile.inc1
==============================================================================
--- user/adrian/net80211_tx/Makefile.inc1	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/Makefile.inc1	Wed May 22 00:54:57 2013	(r250896)
@@ -273,15 +273,67 @@ WMAKEENV=	${CROSSENV} \
 .if ${MK_CDDL} == "no"
 WMAKEENV+=	NO_CTF=1
 .endif
-.if ${CC:T:Mgcc} == "gcc"
+
+.if defined(CROSS_TOOLCHAIN_PREFIX)
+CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
+CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
+.endif
+XCOMPILERS=	CC CXX CPP
+.for COMPILER in ${XCOMPILERS}
+.if defined(CROSS_COMPILER_PREFIX)
+X${COMPILER}?=	${CROSS_COMPILER_PREFIX}${${COMPILER}}
+.else
+X${COMPILER}?=	${${COMPILER}}
+.endif
+.endfor
+XBINUTILS=	AS AR LD NM OBJDUMP RANLIB STRINGS
+.for BINUTIL in ${XBINUTILS}
+.if defined(CROSS_BINUTILS_PREFIX)
+X${BINUTIL}?=	${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
+.else
+X${BINUTIL}?=	${${BINUTIL}}
+.endif
+.endfor
+WMAKEENV+=	CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \
+		CPP="${XCPP} ${XFLAGS}" \
+		AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
+		OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
+
+.if ${XCC:T:Mgcc} == "gcc"
 WMAKE_COMPILER_TYPE=	gcc
-.elif ${CC:T:Mclang} == "clang"
+.elif ${XCC:T:Mclang} == "clang"
 WMAKE_COMPILER_TYPE=	clang
 .elif ${MK_CLANG_IS_CC} == "no"
 WMAKE_COMPILER_TYPE=	gcc
 .else
 WMAKE_COMPILER_TYPE=	clang
 .endif
+IMAKE_COMPILER_TYPE=	COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
+
+.if ${XCC:M/*}
+XFLAGS=		--sysroot=${WORLDTMP}
+.if defined(CROSS_BINUTILS_PREFIX)
+# In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a
+# directory, but the compiler will look in the right place for it's
+# tools so we don't need to tell it where to look.
+.if exists(${CROSS_BINUTILS_PREFIX})
+XFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
+.endif
+.else
+XFLAGS+=	-B${WORLDTMP}/usr/bin
+.endif
+.if ${TARGET_ARCH} != ${MACHINE_ARCH} && ${WMAKE_COMPILER_TYPE} == "clang"
+.if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") && \
+${MK_ARM_EABI} != "no"
+TARGET_ABI=	gnueabi
+.else
+TARGET_ABI=	unknown
+.endif
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0
+XFLAGS+=	-target ${TARGET_TRIPLE}
+.endif
+.endif
+
 WMAKEENV+=	COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
 WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
@@ -317,6 +369,9 @@ LIB32FLAGS=	-m32 ${LIB32CPUFLAGS} -DCOMP
 		-isystem ${LIB32TMP}/usr/include/ \
 		-L${LIB32TMP}/usr/lib32 \
 		-B${LIB32TMP}/usr/lib32
+.if ${XCC:M/*}
+LIB32FLAGS+=		--sysroot=${WORLDTMP}
+.endif
 
 # Yes, the flags are redundant.
 LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
@@ -329,8 +384,8 @@ LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTR
 		SHLIBDIR=/usr/lib32 \
 		COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
 LIB32WMAKEFLAGS+=	\
-		CC="${CC} ${LIB32FLAGS}" \
-		CXX="${CXX} ${LIB32FLAGS}" \
+		CC="${XCC} ${LIB32FLAGS}" \
+		CXX="${XCXX} ${LIB32FLAGS}" \
 		DESTDIR=${LIB32TMP} \
 		-DCOMPAT_32BIT \
 		-DLIBRARIES_ONLY \
@@ -346,7 +401,7 @@ LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDES
 
 IMAKEENV=	${CROSSENV:N_LDSCRIPTROOT=*}
 IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1 \
-		${IMAKE_INSTALL} ${IMAKE_MTREE}
+		${IMAKE_INSTALL} ${IMAKE_MTREE} ${IMAKE_COMPILER_TYPE}
 .if empty(.MAKEFLAGS:M-n)
 IMAKEENV+=	PATH=${STRICTTMPPATH}:${INSTALLTMP} \
 		LD_LIBRARY_PATH=${INSTALLTMP} \
@@ -970,25 +1025,52 @@ distributekernel distributekernel.debug:
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
 	false
 .endif
+	mkdir -p ${DESTDIR}/${DISTDIR}
+.if defined(NO_ROOT)
+	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.premeta
+.endif
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
-	    ${CROSSENV} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
-	    DESTDIR=${DESTDIR}/${DISTDIR}/kernel \
+	    ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.premeta/} \
+	    ${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
+	    DESTDIR=${INSTALL_DDIR:S://:/:g:C:/$::}/kernel \
 	    ${.TARGET:S/distributekernel/install/}
+.if defined(NO_ROOT)
+	sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
+	    ${DESTDIR}/${DISTDIR}/kernel.meta
+.endif
 .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
+.if defined(NO_ROOT)
+	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
+.endif
 	cd ${KRNLOBJDIR}/${_kernel}; \
-	    ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
+	    ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \
+	    ${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} \
 	    KERNEL=${INSTKERNNAME}.${_kernel} \
-	    DESTDIR=${DESTDIR}/${DISTDIR}/kernel.${_kernel} \
+	    DESTDIR=${INSTALL_DDIR:S://:/:g:C:/$::}/kernel.${_kernel} \
 	    ${.TARGET:S/distributekernel/install/}
+	sed -e 's|^./kernel|.|' \
+	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \
+	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
 .endfor
 
 packagekernel:
+.if defined(NO_ROOT)
+	cd ${DESTDIR}/${DISTDIR}/kernel; \
+	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \
+	    @${DESTDIR}/${DISTDIR}/kernel.meta
+.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
+	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
+	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \
+	    @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
+.endfor
+.else
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz .
 .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .
 .endfor
+.endif
 
 #
 # doxygen
@@ -1124,6 +1206,10 @@ _sed=		usr.bin/sed
 _lex=		usr.bin/lex
 .endif
 
+.if ${BOOTSTRAPPING} < 1000002
+_m4=		usr.bin/m4
+.endif
+
 .if ${BOOTSTRAPPING} < 1000013
 _yacc=		lib/liby \
 		usr.bin/yacc
@@ -1201,6 +1287,7 @@ bootstrap-tools:
     usr.bin/rpcgen \
     ${_sed} \
     ${_yacc} \
+    ${_m4} \
     ${_lex} \
     lib/libmd \
     usr.bin/xinstall \
@@ -1279,10 +1366,13 @@ _kgzip=		usr.sbin/kgzip
 .endif
 .endif
 
-.if ${MK_BINUTILS} != "no"
+.if ${XAS:M/*} == "" && ${MK_BINUTILS} != "no"
 _binutils=	gnu/usr.bin/binutils
 .endif
 
+# If an full path to an external cross compiler is given, don't build
+# a cross compiler.
+.if ${XCC:M/*} == "" && ${MK_CROSS_COMPILER} != "no"
 .if ${MK_CLANG} != "no" && (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang")
 _clang=		usr.bin/clang
 _clang_libs=	lib/clang
@@ -1291,6 +1381,7 @@ _clang_libs=	lib/clang
 .if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98")
 _cc=		gnu/usr.bin/cc
 .endif
+.endif
 
 cross-tools:
 .for _tool in \

Modified: user/adrian/net80211_tx/ObsoleteFiles.inc
==============================================================================
--- user/adrian/net80211_tx/ObsoleteFiles.inc	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/ObsoleteFiles.inc	Wed May 22 00:54:57 2013	(r250896)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20130417: nfs fha moved from nfsserver to nfs
+OLD_FILES+=usr/include/nfsserver/nfs_fha.h
 # 20130411: new clang import which bumps version from 3.2 to 3.3.
 OLD_FILES+=usr/include/clang/3.2/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.2/__wmmintrin_pclmul.h

Modified: user/adrian/net80211_tx/UPDATING
==============================================================================
--- user/adrian/net80211_tx/UPDATING	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/UPDATING	Wed May 22 00:54:57 2013	(r250896)
@@ -31,6 +31,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130516:
+	Use bmake by default.
+	Whereas before one could choose to build with bmake via
+	-DWITH_BMAKE one must now use -DWITHOUT_BMAKE to use the old
+	make. The goal is to remove these knobs for 10-RELEASE.
+
+	It is worth noting that bmake (like gmake) treats the command
+	line as the unit of failure, rather than statements within the
+	command line.  Thus '(cd some/where && dosomething)' is safer
+	than 'cd some/where; dosomething'. The '()' allows consistent
+	behavior in parallel build.
+
 20130429:
         Fix a bug that allows NFS clients to issue READDIR on files.
 

Modified: user/adrian/net80211_tx/bin/df/df.1
==============================================================================
--- user/adrian/net80211_tx/bin/df/df.1	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/bin/df/df.1	Wed May 22 00:54:57 2013	(r250896)
@@ -196,7 +196,9 @@ If the value is outside, it will be set 
 .Xr localeconv 3 ,
 .Xr fstab 5 ,
 .Xr mount 8 ,
-.Xr quot 8 .
+.Xr pstat 8 ,
+.Xr quot 8 ,
+.Xr swapinfo 8 .
 .Sh STANDARDS
 With the exception of most options,
 the

Modified: user/adrian/net80211_tx/bin/kenv/kenv.c
==============================================================================
--- user/adrian/net80211_tx/bin/kenv/kenv.c	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/bin/kenv/kenv.c	Wed May 22 00:54:57 2013	(r250896)
@@ -37,9 +37,9 @@ __FBSDID("$FreeBSD$");
 
 static void	usage(void);
 static int	kdumpenv(void);
-static int	kgetenv(char *);
-static int	ksetenv(char *, char *);
-static int	kunsetenv(char *);
+static int	kgetenv(const char *);
+static int	ksetenv(const char *, char *);
+static int	kunsetenv(const char *);
 
 static int hflag = 0;
 static int Nflag = 0;
@@ -170,7 +170,7 @@ kdumpenv(void)
 }
 
 static int
-kgetenv(char *env)
+kgetenv(const char *env)
 {
 	char buf[1024];
 	int ret;
@@ -186,7 +186,7 @@ kgetenv(char *env)
 }
 
 static int
-ksetenv(char *env, char *val)
+ksetenv(const char *env, char *val)
 {
 	int ret;
 
@@ -197,7 +197,7 @@ ksetenv(char *env, char *val)
 }
 
 static int
-kunsetenv(char *env)
+kunsetenv(const char *env)
 {
 	int ret;
 	

Modified: user/adrian/net80211_tx/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl
==============================================================================
--- user/adrian/net80211_tx/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl	Wed May 22 00:54:57 2013	(r250896)
@@ -73,7 +73,7 @@ die "Could not determine local IP addres
 # Find the first remote host that responds to an icmp echo,
 # which isn't a local address.
 #
-open PING, "/sbin/ping -ns $Broadcast{$local} 56 $MAXHOSTS |" or
+open PING, "/sbin/ping -n -s 56 -c $MAXHOSTS $Broadcast{$local} |" or
     die "Couldn't run ping: $!\n";
 while (<PING>) {
 	if (/bytes from (.*): / and not defined $Broadcast{$1}) {

Modified: user/adrian/net80211_tx/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl
==============================================================================
--- user/adrian/net80211_tx/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl	Wed May 22 00:54:57 2013	(r250896)
@@ -48,7 +48,9 @@ my $MULTICAST = "FF02::1";		# IPv6 multi
 #
 my $local = "";
 my $remote = "";
+my $interf = "";
 my %Local;
+my %Addr;
 my $up;
 open IFCONFIG, '/sbin/ifconfig -a inet6 |'
     or die "Couldn't run ifconfig: $!\n";
@@ -59,27 +61,34 @@ while (<IFCONFIG>) {
 	$up = 1 if /^[a-z].*<UP,/;
 	$up = 0 if /^[a-z].*<,/;
 
+	if (m:(\S+\d+)\: :) {
+		$interf = $1;
+	}
+
 	# assume output is "inet6 ...":
-	if (m:inet6 (\S+)/:) {
+	if (m:inet6 (\S+) :) {
 		my $addr = $1;
                 $Local{$addr} = 1;
-                $local = $addr if $up and $local eq "";
+                $Addr{$interf} = $addr;
 		$up = 0;
+		$interf = "";
 	}
 }
 close IFCONFIG;
-exit 1 if $local eq "";
 
 #
 # Find the first remote host that responds to an icmp echo,
-# which isn't a local address.
+# which isn't a local address. Try each IPv6-enabled interface.
 #
-open PING, "/sbin/ping -ns -A inet6 $MULTICAST 56 $MAXHOSTS |" or
-    die "Couldn't run ping: $!\n";
-while (<PING>) {
-	if (/bytes from (.*): / and not defined $Local{$1}) {
-		$remote = $1;
-		last;
+foreach $interf (split(' ', `ifconfig -l -u inet6`)) {
+	next if $interf =~ /lo[0-9]+/;
+	open PING, "/sbin/ping6 -n -s 56 -c $MAXHOSTS $MULTICAST\%$interf |" or next;
+	while (<PING>) {
+		if (/bytes from (.*), / and not defined $Local{$1}) {
+			$remote = $1;
+			$local = $Addr{$interf};
+			last;
+		}
 	}
 }
 close PING;

Modified: user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c
==============================================================================
--- user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c	Wed May 22 00:54:57 2013	(r250896)
@@ -19,12 +19,15 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
 
 #include <sys/types.h>
 #include <sys/sysmacros.h>
@@ -193,9 +196,6 @@ dt_cg_ptrsize(dt_node_t *dnp, dt_irlist_
 	ssize_t size;
 	int sreg;
 
-	if ((sreg = dt_regset_alloc(drp)) == -1)
-		longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
-
 	type = ctf_type_resolve(ctfp, dnp->dn_type);
 	kind = ctf_type_kind(ctfp, type);
 	assert(kind == CTF_K_POINTER || kind == CTF_K_ARRAY);
@@ -212,6 +212,7 @@ dt_cg_ptrsize(dt_node_t *dnp, dt_irlist_
 	if ((size = ctf_type_size(ctfp, type)) == 1)
 		return; /* multiply or divide by one can be omitted */
 
+	sreg = dt_regset_alloc(drp);
 	dt_cg_setx(dlp, sreg, size);
 	instr = DIF_INSTR_FMT(op, dreg, sreg, dreg);
 	dt_irlist_append(dlp, dt_cg_node_alloc(DT_LBL_NONE, instr));
@@ -251,9 +252,7 @@ dt_cg_field_get(dt_node_t *dnp, dt_irlis
 
 	assert(dnp->dn_op == DT_TOK_PTR || dnp->dn_op == DT_TOK_DOT);
 	r1 = dnp->dn_left->dn_reg;
-
-	if ((r2 = dt_regset_alloc(drp)) == -1)
-		longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
+	r2 = dt_regset_alloc(drp);
 
 	/*
 	 * On little-endian architectures, ctm_offset counts from the right so
@@ -356,10 +355,9 @@ dt_cg_field_set(dt_node_t *src, dt_irlis
 		    "bits %u\n", m.ctm_offset, m.ctm_type, e.cte_bits);
 	}
 
-	if ((r1 = dt_regset_alloc(drp)) == -1 ||
-	    (r2 = dt_regset_alloc(drp)) == -1 ||
-	    (r3 = dt_regset_alloc(drp)) == -1)
-		longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
+	r1 = dt_regset_alloc(drp);
+	r2 = dt_regset_alloc(drp);
+	r3 = dt_regset_alloc(drp);
 
 	/*
 	 * Compute shifts and masks.  We need to compute "shift" as the amount
@@ -423,8 +421,7 @@ dt_cg_store(dt_node_t *src, dt_irlist_t 
 		size = dt_node_type_size(src);
 
 	if (src->dn_flags & DT_NF_REF) {
-		if ((reg = dt_regset_alloc(drp)) == -1)
-			longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
+		reg = dt_regset_alloc(drp);
 		dt_cg_setx(dlp, reg, size);
 		instr = DIF_INSTR_COPYS(src->dn_reg, reg, dst->dn_reg);
 		dt_irlist_append(dlp, dt_cg_node_alloc(DT_LBL_NONE, instr));
@@ -474,30 +471,58 @@ dt_cg_typecast(const dt_node_t *src, con
 	size_t dstsize = dt_node_type_size(dst);
 
 	dif_instr_t instr;
-	int reg, n;
+	int rg;
 
-	if (dt_node_is_scalar(dst) && (dstsize < srcsize ||
-	    (src->dn_flags & DT_NF_SIGNED) ^ (dst->dn_flags & DT_NF_SIGNED))) {
-		if ((reg = dt_regset_alloc(drp)) == -1)
-			longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
+	if (!dt_node_is_scalar(dst))
+		return; /* not a scalar */
+	if (dstsize == srcsize &&
+	    ((src->dn_flags ^ dst->dn_flags) & DT_NF_SIGNED) != 0)
+		return; /* not narrowing or changing signed-ness */
+	if (dstsize > srcsize && (src->dn_flags & DT_NF_SIGNED) == 0)
+		return; /* nothing to do in this case */
 
-		if (dstsize < srcsize)
-			n = sizeof (uint64_t) * NBBY - dstsize * NBBY;
-		else
-			n = sizeof (uint64_t) * NBBY - srcsize * NBBY;
+	rg = dt_regset_alloc(drp);
+
+	if (dstsize > srcsize) {
+		int n = sizeof (uint64_t) * NBBY - srcsize * NBBY;
+		int s = (dstsize - srcsize) * NBBY;
 
-		dt_cg_setx(dlp, reg, n);
+		dt_cg_setx(dlp, rg, n);
 
-		instr = DIF_INSTR_FMT(DIF_OP_SLL,
-		    src->dn_reg, reg, dst->dn_reg);
+		instr = DIF_INSTR_FMT(DIF_OP_SLL, src->dn_reg, rg, dst->dn_reg);
 		dt_irlist_append(dlp, dt_cg_node_alloc(DT_LBL_NONE, instr));
 
-		instr = DIF_INSTR_FMT((dst->dn_flags & DT_NF_SIGNED) ?
-		    DIF_OP_SRA : DIF_OP_SRL, dst->dn_reg, reg, dst->dn_reg);
+		if ((dst->dn_flags & DT_NF_SIGNED) || n == s) {
+			instr = DIF_INSTR_FMT(DIF_OP_SRA,
+			    dst->dn_reg, rg, dst->dn_reg);
+			dt_irlist_append(dlp,
+			    dt_cg_node_alloc(DT_LBL_NONE, instr));
+		} else {
+			dt_cg_setx(dlp, rg, s);
+			instr = DIF_INSTR_FMT(DIF_OP_SRA,
+			    dst->dn_reg, rg, dst->dn_reg);
+			dt_irlist_append(dlp,
+			    dt_cg_node_alloc(DT_LBL_NONE, instr));
+			dt_cg_setx(dlp, rg, n - s);
+			instr = DIF_INSTR_FMT(DIF_OP_SRL,
+			    dst->dn_reg, rg, dst->dn_reg);
+			dt_irlist_append(dlp,
+			    dt_cg_node_alloc(DT_LBL_NONE, instr));
+		}
+	} else if (dstsize != sizeof (uint64_t)) {
+		int n = sizeof (uint64_t) * NBBY - dstsize * NBBY;
+
+		dt_cg_setx(dlp, rg, n);
 
+		instr = DIF_INSTR_FMT(DIF_OP_SLL, src->dn_reg, rg, dst->dn_reg);
+		dt_irlist_append(dlp, dt_cg_node_alloc(DT_LBL_NONE, instr));
+
+		instr = DIF_INSTR_FMT((dst->dn_flags & DT_NF_SIGNED) ?
+		    DIF_OP_SRA : DIF_OP_SRL, dst->dn_reg, rg, dst->dn_reg);
 		dt_irlist_append(dlp, dt_cg_node_alloc(DT_LBL_NONE, instr));
-		dt_regset_free(drp, reg);
 	}
+
+	dt_regset_free(drp, rg);
 }
 
 /*
@@ -523,8 +548,7 @@ dt_cg_arglist(dt_ident_t *idp, dt_node_t
 	for (dnp = args; dnp != NULL; dnp = dnp->dn_list)
 		dt_cg_node(dnp, dlp, drp);
 
-	dt_irlist_append(dlp,
-	    dt_cg_node_alloc(DT_LBL_NONE, DIF_INSTR_FLUSHTS));
+	dt_irlist_append(dlp, dt_cg_node_alloc(DT_LBL_NONE, DIF_INSTR_FLUSHTS));
 
 	for (dnp = args; dnp != NULL; dnp = dnp->dn_list, i++) {
 		dtrace_diftype_t t;
@@ -538,17 +562,18 @@ dt_cg_arglist(dt_ident_t *idp, dt_node_t
 		dt_cg_typecast(dnp, &isp->dis_args[i], dlp, drp);
 		isp->dis_args[i].dn_reg = -1;
 
-		if (t.dtdt_flags & DIF_TF_BYREF)
+		if (t.dtdt_flags & DIF_TF_BYREF) {
 			op = DIF_OP_PUSHTR;
-		else
+			if (t.dtdt_size != 0) {
+				reg = dt_regset_alloc(drp);
+				dt_cg_setx(dlp, reg, t.dtdt_size);
+			} else {
+				reg = DIF_REG_R0;
+			}
+		} else {
 			op = DIF_OP_PUSHTV;
-
-		if (t.dtdt_size != 0) {
-			if ((reg = dt_regset_alloc(drp)) == -1)
-				longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
-			dt_cg_setx(dlp, reg, t.dtdt_size);
-		} else
 			reg = DIF_REG_R0;
+		}
 
 		instr = DIF_INSTR_PUSHTS(op, t.dtdt_kind, reg, dnp->dn_reg);
 		dt_irlist_append(dlp, dt_cg_node_alloc(DT_LBL_NONE, instr));
@@ -629,9 +654,7 @@ dt_cg_prearith_op(dt_node_t *dnp, dt_irl
 	dt_cg_node(dnp->dn_child, dlp, drp);
 	dnp->dn_reg = dnp->dn_child->dn_reg;
 
-	if ((reg = dt_regset_alloc(drp)) == -1)
-		longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
-
+	reg = dt_regset_alloc(drp);
 	dt_cg_setx(dlp, reg, size);
 
 	instr = DIF_INSTR_FMT(op, dnp->dn_reg, reg, dnp->dn_reg);
@@ -688,9 +711,7 @@ dt_cg_postarith_op(dt_node_t *dnp, dt_ir
 	dt_cg_node(dnp->dn_child, dlp, drp);
 	dnp->dn_reg = dnp->dn_child->dn_reg;
 
-	if ((nreg = dt_regset_alloc(drp)) == -1)
-		longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
-
+	nreg = dt_regset_alloc(drp);
 	dt_cg_setx(dlp, nreg, size);
 	instr = DIF_INSTR_FMT(op, dnp->dn_reg, nreg, nreg);
 	dt_irlist_append(dlp, dt_cg_node_alloc(DT_LBL_NONE, instr));
@@ -1008,9 +1029,7 @@ dt_cg_asgn_op(dt_node_t *dnp, dt_irlist_
 		 * set it to the size of our data structure, and then replace
 		 * it with the result of an allocs of the specified size.
 		 */
-		if ((r1 = dt_regset_alloc(drp)) == -1)
-			longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
-
+		r1 = dt_regset_alloc(drp);
 		dt_cg_setx(dlp, r1,
 		    ctf_type_size(dxp->dx_dst_ctfp, dxp->dx_dst_base));
 
@@ -1054,8 +1073,7 @@ dt_cg_asgn_op(dt_node_t *dnp, dt_irlist_
 			 * and add r1 to it before storing the result.
 			 */
 			if (ctm.ctm_offset != 0) {
-				if ((r2 = dt_regset_alloc(drp)) == -1)
-					longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
+				r2 = dt_regset_alloc(drp);
 
 				/*
 				 * Add the member offset rounded down to the
@@ -1142,8 +1160,7 @@ dt_cg_assoc_op(dt_node_t *dnp, dt_irlist
 
 	dt_cg_arglist(dnp->dn_ident, dnp->dn_args, dlp, drp);
 
-	if ((dnp->dn_reg = dt_regset_alloc(drp)) == -1)
-		longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
+	dnp->dn_reg = dt_regset_alloc(drp);
 
 	if (dnp->dn_ident->di_flags & DT_IDFLG_TLS)
 		op = DIF_OP_LDTAA;
@@ -1273,9 +1290,7 @@ dt_cg_array_op(dt_node_t *dnp, dt_irlist
 	if ((size = dt_node_type_size(dnp)) == sizeof (uint64_t))
 		return;
 
-	if ((reg = dt_regset_alloc(drp)) == -1)
-		longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
-
+	reg = dt_regset_alloc(drp);
 	assert(size < sizeof (uint64_t));
 	n = sizeof (uint64_t) * NBBY - size * NBBY;
 
@@ -1384,7 +1399,6 @@ dt_cg_node(dt_node_t *dnp, dt_irlist_t *
 	dt_ident_t *idp;
 	ssize_t stroff;
 	uint_t op;
-	int reg;
 
 	switch (dnp->dn_op) {
 	case DT_TOK_COMMA:
@@ -1622,10 +1636,7 @@ dt_cg_node(dt_node_t *dnp, dt_irlist_t *
 
 	case DT_TOK_SIZEOF: {
 		size_t size = dt_node_sizeof(dnp->dn_child);
-
-		if ((dnp->dn_reg = dt_regset_alloc(drp)) == -1)
-			longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
-
+		dnp->dn_reg = dt_regset_alloc(drp);
 		assert(size != 0);
 		dt_cg_setx(dlp, dnp->dn_reg, size);
 		break;
@@ -1650,8 +1661,7 @@ dt_cg_node(dt_node_t *dnp, dt_irlist_t *
 			assert(dxp->dx_ident->di_flags & DT_IDFLG_CGREG);
 			assert(dxp->dx_ident->di_id != 0);
 
-			if ((dnp->dn_reg = dt_regset_alloc(drp)) == -1)
-				longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
+			dnp->dn_reg = dt_regset_alloc(drp);
 
 			if (dxp->dx_arg == -1) {
 				instr = DIF_INSTR_MOV(
@@ -1735,8 +1745,9 @@ dt_cg_node(dt_node_t *dnp, dt_irlist_t *
 		}
 
 		if (m.ctm_offset != 0) {
-			if ((reg = dt_regset_alloc(drp)) == -1)
-				longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
+			int reg;
+
+			reg = dt_regset_alloc(drp);
 
 			/*
 			 * If the offset is not aligned on a byte boundary, it
@@ -1782,8 +1793,7 @@ dt_cg_node(dt_node_t *dnp, dt_irlist_t *
 		break;
 
 	case DT_TOK_STRING:
-		if ((dnp->dn_reg = dt_regset_alloc(drp)) == -1)
-			longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
+		dnp->dn_reg = dt_regset_alloc(drp);
 
 		assert(dnp->dn_kind == DT_NODE_STRING);
 		stroff = dt_strtab_insert(yypcb->pcb_strtab, dnp->dn_string);
@@ -1806,8 +1816,7 @@ dt_cg_node(dt_node_t *dnp, dt_irlist_t *
 		 */
 		if (dnp->dn_kind == DT_NODE_VAR &&
 		    (dnp->dn_ident->di_flags & DT_IDFLG_CGREG)) {
-			if ((dnp->dn_reg = dt_regset_alloc(drp)) == -1)
-				longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
+			dnp->dn_reg = dt_regset_alloc(drp);
 			instr = DIF_INSTR_MOV(dnp->dn_ident->di_id,
 			    dnp->dn_reg);
 			dt_irlist_append(dlp,
@@ -1848,11 +1857,9 @@ dt_cg_node(dt_node_t *dnp, dt_irlist_t *
 
 			dt_cg_arglist(dnp->dn_ident, dnp->dn_args, dlp, drp);
 
-			if ((dnp->dn_reg = dt_regset_alloc(drp)) == -1)
-				longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
-
-			instr = DIF_INSTR_CALL(
-			    dnp->dn_ident->di_id, dnp->dn_reg);
+			dnp->dn_reg = dt_regset_alloc(drp);
+			instr = DIF_INSTR_CALL(dnp->dn_ident->di_id,
+			    dnp->dn_reg);
 
 			dt_irlist_append(dlp,
 			    dt_cg_node_alloc(DT_LBL_NONE, instr));
@@ -1880,8 +1887,7 @@ dt_cg_node(dt_node_t *dnp, dt_irlist_t *
 				break;
 			}
 
-			if ((dnp->dn_reg = dt_regset_alloc(drp)) == -1)
-				longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
+			dnp->dn_reg = dt_regset_alloc(drp);
 
 			if (dnp->dn_ident->di_flags & DT_IDFLG_LOCAL)
 				op = DIF_OP_LDLS;
@@ -1911,9 +1917,7 @@ dt_cg_node(dt_node_t *dnp, dt_irlist_t *
 				    dtrace_errmsg(dtp, dtrace_errno(dtp)));
 			}
 
-			if ((dnp->dn_reg = dt_regset_alloc(drp)) == -1)
-				longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
-
+			dnp->dn_reg = dt_regset_alloc(drp);
 			dt_cg_xsetx(dlp, dnp->dn_ident,
 			    DT_LBL_NONE, dnp->dn_reg, sym.st_value);
 
@@ -1933,9 +1937,7 @@ dt_cg_node(dt_node_t *dnp, dt_irlist_t *
 		break;
 
 	case DT_TOK_INT:
-		if ((dnp->dn_reg = dt_regset_alloc(drp)) == -1)
-			longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
-
+		dnp->dn_reg = dt_regset_alloc(drp);
 		dt_cg_setx(dlp, dnp->dn_reg, dnp->dn_value);
 		break;
 
@@ -1950,6 +1952,7 @@ dt_cg(dt_pcb_t *pcb, dt_node_t *dnp)
 {
 	dif_instr_t instr;
 	dt_xlator_t *dxp;
+	dt_ident_t *idp;
 
 	if (pcb->pcb_regs == NULL && (pcb->pcb_regs =
 	    dt_regset_create(pcb->pcb_hdl->dt_conf.dtc_difintregs)) == NULL)
@@ -1976,9 +1979,9 @@ dt_cg(dt_pcb_t *pcb, dt_node_t *dnp)
 	assert(pcb->pcb_dret == NULL);
 	pcb->pcb_dret = dnp;
 
-	if (dt_node_is_dynamic(dnp)) {
+	if (dt_node_resolve(dnp, DT_IDENT_XLPTR) != NULL) {
 		dnerror(dnp, D_CG_DYN, "expression cannot evaluate to result "
-		    "of dynamic type\n");
+		    "of a translated pointer\n");
 	}
 
 	/*
@@ -1994,6 +1997,7 @@ dt_cg(dt_pcb_t *pcb, dt_node_t *dnp)
 	}
 
 	dt_cg_node(dnp, &pcb->pcb_ir, pcb->pcb_regs);
+
 	instr = DIF_INSTR_RET(dnp->dn_reg);
 	dt_regset_free(pcb->pcb_regs, dnp->dn_reg);
 	dt_irlist_append(&pcb->pcb_ir, dt_cg_node_alloc(DT_LBL_NONE, instr));
@@ -2003,4 +2007,7 @@ dt_cg(dt_pcb_t *pcb, dt_node_t *dnp)
 		dxp->dx_ident->di_id = 0;
 		dxp->dx_ident->di_flags &= ~DT_IDFLG_CGREG;
 	}
+
+	dt_regset_free(pcb->pcb_regs, 0);
+	dt_regset_assert_free(pcb->pcb_regs);
 }

Modified: user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c
==============================================================================
--- user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c	Wed May 22 00:54:57 2013	(r250896)
@@ -19,12 +19,15 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
 
 #include <strings.h>
 #include <stdio.h>
@@ -212,12 +215,22 @@ dt_dis_pushts(const dtrace_difo_t *dp,
 {
 	static const char *const tnames[] = { "D type", "string" };
 	uint_t type = DIF_INSTR_TYPE(in);
+	const char *pad;
 
-	(void) fprintf(fp, "%-4s DT_TYPE(%u), %%r%u, %%r%u",
-	    name, type, DIF_INSTR_R2(in), DIF_INSTR_RS(in));
+	if (DIF_INSTR_OP(in) == DIF_OP_PUSHTV) {
+		(void) fprintf(fp, "%-4s DT_TYPE(%u), %%r%u",
+		    name, type, DIF_INSTR_RS(in));
+		pad = "\t\t";
+	} else {
+		(void) fprintf(fp, "%-4s DT_TYPE(%u), %%r%u, %%r%u",
+		    name, type, DIF_INSTR_R2(in), DIF_INSTR_RS(in));
+		pad = "\t";
+	}
 
-	if (type < sizeof (tnames) / sizeof (tnames[0]))
-		(void) fprintf(fp, "\t! DT_TYPE(%u) = %s", type, tnames[type]);
+	if (type < sizeof (tnames) / sizeof (tnames[0])) {
+		(void) fprintf(fp, "%s! DT_TYPE(%u) = %s", pad,
+		    type, tnames[type]);
+	}
 }
 
 static void

Modified: user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
==============================================================================
--- user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c	Wed May 22 00:54:57 2013	(r250896)
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
+
 #include <string.h>
 #include <strings.h>
 #include <dt_impl.h>
@@ -37,7 +41,6 @@ static const struct {
 	{ EDT_VERSREDUCED, "Requested version conflicts with earlier setting" },
 	{ EDT_CTF,	"Unexpected libctf error" },
 	{ EDT_COMPILER, "Error in D program compilation" },
-	{ EDT_NOREG,	"Insufficient registers to generate code" },
 	{ EDT_NOTUPREG,	"Insufficient tuple registers to generate code" },
 	{ EDT_NOMEM,	"Memory allocation failure" },
 	{ EDT_INT2BIG,	"Integer constant table limit exceeded" },

Modified: user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h
==============================================================================
--- user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h	Wed May 22 00:54:57 2013	(r250896)
@@ -26,7 +26,7 @@
 
  /*
   * Copyright (c) 2011, Joyent, Inc. All rights reserved.
-  * Copyright (c) 2011 by Delphix. All rights reserved.
+  * Copyright (c) 2012 by Delphix. All rights reserved.
   */
 
 #ifndef	_DT_ERRTAGS_H
@@ -260,6 +260,7 @@ typedef enum {
 	D_LLQUANT_FACTOREVEN,		/* llquantize() bad # steps/factor */
 	D_LLQUANT_FACTORSMALL,		/* llquantize() magnitude too small */
 	D_LLQUANT_MAGTOOBIG,		/* llquantize() high mag too large */
+	D_NOREG,			/* no available internal registers */
 	D_PRINTM_ADDR,			/* printm() memref bad type */
 	D_PRINTM_SIZE,			/* printm() size bad type */
 	D_PRINTT_ADDR,			/* printt() typeref bad type */

Modified: user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c
==============================================================================
--- user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c	Wed May 22 00:54:57 2013	(r250896)
@@ -19,12 +19,15 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
 
 #include <sys/types.h>
 #include <sys/bitmap.h>
@@ -33,18 +36,19 @@
 #include <stdlib.h>
 
 #include <dt_regset.h>
+#include <dt_impl.h>
 
 dt_regset_t *
-dt_regset_create(ulong_t size)
+dt_regset_create(ulong_t nregs)
 {
-	ulong_t n = BT_BITOUL(size + 1); /* + 1 for %r0 */
+	ulong_t n = BT_BITOUL(nregs);
 	dt_regset_t *drp = malloc(sizeof (dt_regset_t));
 
 	if (drp == NULL)
 		return (NULL);
 
 	drp->dr_bitmap = malloc(sizeof (ulong_t) * n);
-	drp->dr_size = size + 1;
+	drp->dr_size = nregs;
 
 	if (drp->dr_bitmap == NULL) {
 		dt_regset_destroy(drp);
@@ -68,6 +72,25 @@ dt_regset_reset(dt_regset_t *drp)
 	bzero(drp->dr_bitmap, sizeof (ulong_t) * BT_BITOUL(drp->dr_size));
 }
 
+void
+dt_regset_assert_free(dt_regset_t *drp)
+{
+	int reg;
+	boolean_t fail = B_FALSE;
+	for (reg = 0; reg < drp->dr_size; reg++) {
+		if (BT_TEST(drp->dr_bitmap, reg) != 0)  {
+			dt_dprintf("%%r%d was left allocated\n", reg);
+			fail = B_TRUE;
+		}
+	}
+
+	/*
+	 * We set this during dtest runs to check for register leaks.
+	 */
+	if (fail && getenv("DTRACE_DEBUG_REGSET") != NULL)
+		abort();
+}
+
 int
 dt_regset_alloc(dt_regset_t *drp)
 {
@@ -95,13 +118,15 @@ dt_regset_alloc(dt_regset_t *drp)
 		}
 	}
 
-	return (-1); /* no available registers */
+	xyerror(D_NOREG, "Insufficient registers to generate code");
+	/*NOTREACHED*/
+	return (-1);
 }
 
 void
 dt_regset_free(dt_regset_t *drp, int reg)
 {
-	assert(reg > 0 && reg < drp->dr_size);
+	assert(reg >= 0 && reg < drp->dr_size);
 	assert(BT_TEST(drp->dr_bitmap, reg) != 0);
 	BT_CLEAR(drp->dr_bitmap, reg);
 }

Modified: user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.h
==============================================================================
--- user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.h	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.h	Wed May 22 00:54:57 2013	(r250896)
@@ -19,16 +19,19 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
+
 #ifndef	_DT_REGSET_H
 #define	_DT_REGSET_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 
 #ifdef	__cplusplus
@@ -45,6 +48,7 @@ extern void dt_regset_destroy(dt_regset_
 extern void dt_regset_reset(dt_regset_t *);
 extern int dt_regset_alloc(dt_regset_t *);
 extern void dt_regset_free(dt_regset_t *, int);
+extern void dt_regset_assert_free(dt_regset_t *);
 
 #ifdef	__cplusplus
 }

Modified: user/adrian/net80211_tx/contrib/bmake/ChangeLog
==============================================================================
--- user/adrian/net80211_tx/contrib/bmake/ChangeLog	Wed May 22 00:48:24 2013	(r250895)
+++ user/adrian/net80211_tx/contrib/bmake/ChangeLog	Wed May 22 00:54:57 2013	(r250896)
@@ -1,3 +1,17 @@
+2013-05-20  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20130520
+	  generate manifest from component FILES rather than have to
+	  update FILES when mk/FILES changes.
+
+2013-05-18  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20130518
+	  Merge with NetBSD make, pick up
+	  o suff.c: don't skip all processsing for .PHONY targets
+	    else wildcard srcs do not get expanded.
+	  o var.c: expand name of variable to delete if necessary.
+
 2013-03-30  Simon J. Gerraty  <sjg at bad.crufty.net>

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


More information about the svn-src-user mailing list