svn commit: r249978 - in projects/camlock: . bin/cat bin/chio bin/dd bin/df bin/domainname bin/expr bin/rm bin/sh cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/dtrace/test/cmd/sc...

Alexander Motin mav at FreeBSD.org
Sat Apr 27 11:28:06 UTC 2013 

Author: mav
Date: Sat Apr 27 11:28:00 2013
New Revision: 249978
URL: http://svnweb.freebsd.org/changeset/base/249978

Log:
  MFC @ r249977

Added:
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d
     - copied unchanged from r249977, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh
     - copied unchanged from r249977, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_DYN.bad.d
     - copied unchanged from r249977, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_DYN.bad.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d
     - copied unchanged from r249977, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d.out
     - copied unchanged from r249977, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.enum.d.out
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/man.TestTransStability.d
     - copied unchanged from r249977, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/man.TestTransStability.d
  projects/camlock/cddl/lib/libdtrace/nfssrv.d
     - copied unchanged from r249977, head/cddl/lib/libdtrace/nfssrv.d
  projects/camlock/contrib/sendmail/libsm/t-fget.c
     - copied unchanged from r249977, head/contrib/sendmail/libsm/t-fget.c
  projects/camlock/lib/libprocstat/core.c
     - copied unchanged from r249977, head/lib/libprocstat/core.c
  projects/camlock/lib/libprocstat/core.h
     - copied unchanged from r249977, head/lib/libprocstat/core.h
  projects/camlock/lib/msun/x86/
     - copied from r249977, head/lib/msun/x86/
  projects/camlock/sys/boot/fdt/dts/am335x.dtsi
     - copied unchanged from r249977, head/sys/boot/fdt/dts/am335x.dtsi
  projects/camlock/sys/contrib/dev/acpica/components/namespace/nsarguments.c
     - copied unchanged from r249977, head/sys/contrib/dev/acpica/components/namespace/nsarguments.c
  projects/camlock/sys/dev/etherswitch/ukswitch/
     - copied from r249977, head/sys/dev/etherswitch/ukswitch/
  projects/camlock/sys/fs/nfsserver/nfs_fha_new.c
     - copied unchanged from r249977, head/sys/fs/nfsserver/nfs_fha_new.c
  projects/camlock/sys/fs/nfsserver/nfs_fha_new.h
     - copied unchanged from r249977, head/sys/fs/nfsserver/nfs_fha_new.h
  projects/camlock/sys/geom/label/g_label_disk_ident.c
     - copied unchanged from r249977, head/sys/geom/label/g_label_disk_ident.c
  projects/camlock/sys/nfs/nfs_fha.c
     - copied unchanged from r249977, head/sys/nfs/nfs_fha.c
  projects/camlock/sys/nfs/nfs_fha.h
     - copied unchanged from r249977, head/sys/nfs/nfs_fha.h
  projects/camlock/sys/nfsserver/nfs_fha_old.c
     - copied unchanged from r249977, head/sys/nfsserver/nfs_fha_old.c
  projects/camlock/sys/nfsserver/nfs_fha_old.h
     - copied unchanged from r249977, head/sys/nfsserver/nfs_fha_old.h
Deleted:
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d.out
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d.out
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d.out
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d.out
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d.out
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cg/
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.assigncast1.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.assigncast2.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.temporal.ksh
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.temporal2.ksh
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.temporal3.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.dyn.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d.out
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_AGG.bad.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.dyn.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh.out
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh.out
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/types/tst.const.d
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pq.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pq.h
  projects/camlock/gnu/usr.bin/cc/f77/
  projects/camlock/gnu/usr.bin/cc/f771/
  projects/camlock/gnu/usr.bin/cc/f77doc/
  projects/camlock/lib/msun/amd64/fenv.h
  projects/camlock/lib/msun/i387/fenv.h
  projects/camlock/sys/nfsserver/nfs_fha.c
  projects/camlock/sys/nfsserver/nfs_fha.h
  projects/camlock/tools/build/options/WITH_IDEA
Modified:
  projects/camlock/Makefile.inc1
  projects/camlock/UPDATING
  projects/camlock/bin/cat/cat.c
  projects/camlock/bin/chio/chio.c
  projects/camlock/bin/dd/dd.c
  projects/camlock/bin/df/df.c
  projects/camlock/bin/domainname/domainname.1
  projects/camlock/bin/expr/Makefile
  projects/camlock/bin/rm/rm.1
  projects/camlock/bin/rm/rm.c
  projects/camlock/bin/sh/sh.1
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.copyin.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations1.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.SpecSizeVariations3.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.h
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
  projects/camlock/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c
  projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/camlock/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
  projects/camlock/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c
  projects/camlock/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.c
  projects/camlock/cddl/contrib/opensolaris/tools/ctf/cvt/util.c
  projects/camlock/cddl/lib/libdtrace/Makefile
  projects/camlock/cddl/lib/libdtrace/nfs.d
  projects/camlock/contrib/binutils/include/elf/common.h
  projects/camlock/contrib/bsnmp/snmp_mibII/mibII.c
  projects/camlock/contrib/gdb/gdb/osabi.c
  projects/camlock/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
  projects/camlock/contrib/netcat/FREEBSD-vendor
  projects/camlock/contrib/netcat/atomicio.c
  projects/camlock/contrib/netcat/nc.1
  projects/camlock/contrib/netcat/netcat.c
  projects/camlock/contrib/sendmail/CACerts
  projects/camlock/contrib/sendmail/FREEBSD-upgrade
  projects/camlock/contrib/sendmail/PGPKEYS
  projects/camlock/contrib/sendmail/RELEASE_NOTES
  projects/camlock/contrib/sendmail/cf/cf/submit.cf
  projects/camlock/contrib/sendmail/cf/m4/version.m4
  projects/camlock/contrib/sendmail/contrib/etrn.pl
  projects/camlock/contrib/sendmail/doc/op/op.me
  projects/camlock/contrib/sendmail/include/sm/config.h
  projects/camlock/contrib/sendmail/include/sm/io.h
  projects/camlock/contrib/sendmail/libmilter/Makefile.m4
  projects/camlock/contrib/sendmail/libmilter/sm_gethost.c
  projects/camlock/contrib/sendmail/libsm/Makefile.m4
  projects/camlock/contrib/sendmail/libsm/cf.c
  projects/camlock/contrib/sendmail/libsm/fget.c
  projects/camlock/contrib/sendmail/mailstats/mailstats.c
  projects/camlock/contrib/sendmail/makemap/makemap.c
  projects/camlock/contrib/sendmail/praliases/praliases.c
  projects/camlock/contrib/sendmail/rmail/rmail.c
  projects/camlock/contrib/sendmail/src/Makefile.m4
  projects/camlock/contrib/sendmail/src/alias.c
  projects/camlock/contrib/sendmail/src/collect.c
  projects/camlock/contrib/sendmail/src/conf.c
  projects/camlock/contrib/sendmail/src/control.c
  projects/camlock/contrib/sendmail/src/deliver.c
  projects/camlock/contrib/sendmail/src/main.c
  projects/camlock/contrib/sendmail/src/map.c
  projects/camlock/contrib/sendmail/src/mci.c
  projects/camlock/contrib/sendmail/src/milter.c
  projects/camlock/contrib/sendmail/src/mime.c
  projects/camlock/contrib/sendmail/src/parseaddr.c
  projects/camlock/contrib/sendmail/src/queue.c
  projects/camlock/contrib/sendmail/src/readcf.c
  projects/camlock/contrib/sendmail/src/recipient.c
  projects/camlock/contrib/sendmail/src/savemail.c
  projects/camlock/contrib/sendmail/src/sendmail.h
  projects/camlock/contrib/sendmail/src/sfsasl.c
  projects/camlock/contrib/sendmail/src/srvrsmtp.c
  projects/camlock/contrib/sendmail/src/tls.c
  projects/camlock/contrib/sendmail/src/usersmtp.c
  projects/camlock/contrib/sendmail/src/util.c
  projects/camlock/contrib/sendmail/src/version.c
  projects/camlock/contrib/sendmail/test/Makefile.m4
  projects/camlock/contrib/sendmail/vacation/vacation.c
  projects/camlock/contrib/tzdata/antarctica
  projects/camlock/contrib/tzdata/asia
  projects/camlock/contrib/tzdata/australasia
  projects/camlock/contrib/tzdata/southamerica
  projects/camlock/contrib/tzdata/zone.tab
  projects/camlock/crypto/openssh/readconf.c
  projects/camlock/crypto/openssh/readconf.h
  projects/camlock/crypto/openssh/ssh.c
  projects/camlock/etc/rc.d/sshd
  projects/camlock/etc/sendmail/freebsd.mc
  projects/camlock/etc/sendmail/freebsd.submit.mc
  projects/camlock/gnu/lib/libgcc/Makefile
  projects/camlock/gnu/usr.bin/gdb/kgdb/trgt_mips.c
  projects/camlock/include/rpcsvc/ypxfrd.x
  projects/camlock/include/stringlist.h
  projects/camlock/lib/Makefile
  projects/camlock/lib/csu/Makefile.inc
  projects/camlock/lib/libc/gen/pututxline.c
  projects/camlock/lib/libc/gen/sem_wait.3
  projects/camlock/lib/libc/gen/stringlist.3
  projects/camlock/lib/libc/gen/stringlist.c
  projects/camlock/lib/libc/gen/sysconf.3
  projects/camlock/lib/libc/i386/string/memchr.S
  projects/camlock/lib/libc/i386/string/strchr.S
  projects/camlock/lib/libc/i386/string/strrchr.S
  projects/camlock/lib/libc/stdio/asprintf.c
  projects/camlock/lib/libc/stdio/clrerr.c
  projects/camlock/lib/libc/stdio/fclose.c
  projects/camlock/lib/libc/stdio/fdopen.c
  projects/camlock/lib/libc/stdio/feof.c
  projects/camlock/lib/libc/stdio/ferror.c
  projects/camlock/lib/libc/stdio/fflush.c
  projects/camlock/lib/libc/stdio/fgetc.c
  projects/camlock/lib/libc/stdio/fgetln.c
  projects/camlock/lib/libc/stdio/fgetpos.c
  projects/camlock/lib/libc/stdio/fgets.c
  projects/camlock/lib/libc/stdio/fileno.c
  projects/camlock/lib/libc/stdio/findfp.c
  projects/camlock/lib/libc/stdio/flags.c
  projects/camlock/lib/libc/stdio/fopen.c
  projects/camlock/lib/libc/stdio/fprintf.c
  projects/camlock/lib/libc/stdio/fpurge.c
  projects/camlock/lib/libc/stdio/fputc.c
  projects/camlock/lib/libc/stdio/fputs.c
  projects/camlock/lib/libc/stdio/fread.c
  projects/camlock/lib/libc/stdio/freopen.c
  projects/camlock/lib/libc/stdio/fscanf.c
  projects/camlock/lib/libc/stdio/fseek.c
  projects/camlock/lib/libc/stdio/fsetpos.c
  projects/camlock/lib/libc/stdio/ftell.c
  projects/camlock/lib/libc/stdio/funopen.c
  projects/camlock/lib/libc/stdio/fvwrite.c
  projects/camlock/lib/libc/stdio/fwalk.c
  projects/camlock/lib/libc/stdio/fwrite.c
  projects/camlock/lib/libc/stdio/getc.c
  projects/camlock/lib/libc/stdio/getchar.c
  projects/camlock/lib/libc/stdio/gets.c
  projects/camlock/lib/libc/stdio/getw.c
  projects/camlock/lib/libc/stdio/makebuf.c
  projects/camlock/lib/libc/stdio/mktemp.c
  projects/camlock/lib/libc/stdio/perror.c
  projects/camlock/lib/libc/stdio/printf-pos.c
  projects/camlock/lib/libc/stdio/printf.c
  projects/camlock/lib/libc/stdio/putc.c
  projects/camlock/lib/libc/stdio/putchar.c
  projects/camlock/lib/libc/stdio/puts.c
  projects/camlock/lib/libc/stdio/putw.c
  projects/camlock/lib/libc/stdio/refill.c
  projects/camlock/lib/libc/stdio/remove.c
  projects/camlock/lib/libc/stdio/rewind.c
  projects/camlock/lib/libc/stdio/rget.c
  projects/camlock/lib/libc/stdio/scanf.c
  projects/camlock/lib/libc/stdio/setbuf.c
  projects/camlock/lib/libc/stdio/setbuffer.c
  projects/camlock/lib/libc/stdio/setvbuf.c
  projects/camlock/lib/libc/stdio/snprintf.c
  projects/camlock/lib/libc/stdio/sprintf.c
  projects/camlock/lib/libc/stdio/sscanf.c
  projects/camlock/lib/libc/stdio/stdio.c
  projects/camlock/lib/libc/stdio/tempnam.c
  projects/camlock/lib/libc/stdio/tmpfile.c
  projects/camlock/lib/libc/stdio/tmpnam.c
  projects/camlock/lib/libc/stdio/ungetc.c
  projects/camlock/lib/libc/stdio/vfprintf.c
  projects/camlock/lib/libc/stdio/vfscanf.c
  projects/camlock/lib/libc/stdio/vfwprintf.c
  projects/camlock/lib/libc/stdio/vfwscanf.c
  projects/camlock/lib/libc/stdio/vprintf.c
  projects/camlock/lib/libc/stdio/vscanf.c
  projects/camlock/lib/libc/stdio/vsnprintf.c
  projects/camlock/lib/libc/stdio/vsprintf.c
  projects/camlock/lib/libc/stdio/vsscanf.c
  projects/camlock/lib/libc/stdio/vswscanf.c
  projects/camlock/lib/libc/stdio/wbuf.c
  projects/camlock/lib/libc/stdio/wsetup.c
  projects/camlock/lib/libc/stdlib/lsearch.3
  projects/camlock/lib/libc/stdlib/realpath.c
  projects/camlock/lib/libc/sys/accept.2
  projects/camlock/lib/libc/sys/cpuset.2
  projects/camlock/lib/libc/sys/cpuset_getaffinity.2
  projects/camlock/lib/libc/sys/dup.2
  projects/camlock/lib/libc/sys/getdtablesize.2
  projects/camlock/lib/libcompiler_rt/Makefile
  projects/camlock/lib/libcompiler_rt/__sync_fetch_and_add_4.c
  projects/camlock/lib/libcompiler_rt/__sync_fetch_and_add_8.c
  projects/camlock/lib/libcompiler_rt/__sync_fetch_and_and_4.c
  projects/camlock/lib/libcompiler_rt/__sync_fetch_and_and_8.c
  projects/camlock/lib/libcompiler_rt/__sync_fetch_and_op_n.h
  projects/camlock/lib/libcompiler_rt/__sync_fetch_and_or_4.c
  projects/camlock/lib/libcompiler_rt/__sync_fetch_and_or_8.c
  projects/camlock/lib/libcompiler_rt/__sync_fetch_and_sub_4.c
  projects/camlock/lib/libcompiler_rt/__sync_fetch_and_sub_8.c
  projects/camlock/lib/libcompiler_rt/__sync_fetch_and_xor_4.c
  projects/camlock/lib/libcompiler_rt/__sync_fetch_and_xor_8.c
  projects/camlock/lib/libcompiler_rt/__sync_lock_test_and_set_4.c
  projects/camlock/lib/libcompiler_rt/__sync_lock_test_and_set_8.c
  projects/camlock/lib/libcompiler_rt/__sync_val_compare_and_swap_4.c
  projects/camlock/lib/libcompiler_rt/__sync_val_compare_and_swap_8.c
  projects/camlock/lib/libcompiler_rt/__sync_val_compare_and_swap_n.h
  projects/camlock/lib/libprocstat/Makefile
  projects/camlock/lib/libprocstat/Symbol.map
  projects/camlock/lib/libprocstat/libprocstat.3
  projects/camlock/lib/libprocstat/libprocstat.c
  projects/camlock/lib/libprocstat/libprocstat.h
  projects/camlock/lib/libprocstat/libprocstat_internal.h
  projects/camlock/lib/libstand/Makefile
  projects/camlock/lib/libstand/mips/_setjmp.S
  projects/camlock/lib/libthr/thread/thr_sig.c
  projects/camlock/lib/libvmmapi/vmmapi.c
  projects/camlock/lib/libvmmapi/vmmapi.h
  projects/camlock/lib/libz/zlib.h
  projects/camlock/lib/msun/Makefile
  projects/camlock/libexec/rtld-elf/rtld.c
  projects/camlock/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/camlock/sbin/camcontrol/camcontrol.8
  projects/camlock/sbin/camcontrol/camcontrol.c
  projects/camlock/sbin/devd/devd.h
  projects/camlock/sbin/devfs/devfs.8
  projects/camlock/sbin/dhclient/packet.c
  projects/camlock/sbin/etherswitchcfg/etherswitchcfg.8
  projects/camlock/sbin/etherswitchcfg/etherswitchcfg.c
  projects/camlock/sbin/gbde/Makefile
  projects/camlock/sbin/geom/class/Makefile.inc
  projects/camlock/sbin/geom/class/label/glabel.8
  projects/camlock/sbin/growfs/growfs.c
  projects/camlock/sbin/hastctl/Makefile
  projects/camlock/sbin/hastctl/hastctl.c
  projects/camlock/sbin/hastd/Makefile
  projects/camlock/sbin/hastd/primary.c
  projects/camlock/sbin/hastd/refcnt.h
  projects/camlock/sbin/ifconfig/iflagg.c
  projects/camlock/sbin/md5/Makefile
  projects/camlock/sbin/newfs_nandfs/newfs_nandfs.c
  projects/camlock/sbin/tunefs/tunefs.c
  projects/camlock/secure/Makefile.inc
  projects/camlock/secure/lib/libcrypto/Makefile
  projects/camlock/secure/lib/libcrypto/Makefile.inc
  projects/camlock/share/examples/etc/make.conf
  projects/camlock/share/i18n/csmapper/KAZAKH/KZ1048%UCS.src
  projects/camlock/share/i18n/csmapper/KAZAKH/UCS%KZ1048.src
  projects/camlock/share/man/man3/pthread_affinity_np.3
  projects/camlock/share/man/man3/pthread_attr_affinity_np.3
  projects/camlock/share/man/man3/pthread_getconcurrency.3
  projects/camlock/share/man/man4/syscons.4
  projects/camlock/share/man/man4/usb_quirk.4
  projects/camlock/share/man/man5/make.conf.5
  projects/camlock/share/man/man5/procfs.5
  projects/camlock/share/man/man5/rc.conf.5
  projects/camlock/share/man/man9/DELAY.9
  projects/camlock/share/man/man9/counter.9
  projects/camlock/share/man/man9/ifnet.9
  projects/camlock/share/misc/committers-src.dot
  projects/camlock/share/misc/iso639
  projects/camlock/share/mk/bsd.own.mk
  projects/camlock/share/mk/bsd.progs.mk
  projects/camlock/share/mk/bsd.sys.mk
  projects/camlock/share/syscons/keymaps/us.dvorakp.kbd
  projects/camlock/sys/amd64/amd64/identcpu.c
  projects/camlock/sys/amd64/include/vmm.h   (contents, props changed)
  projects/camlock/sys/amd64/include/xen/xen-os.h
  projects/camlock/sys/amd64/vmm/intel/vmcs.c
  projects/camlock/sys/amd64/vmm/intel/vmcs.h
  projects/camlock/sys/amd64/vmm/intel/vmx.c
  projects/camlock/sys/amd64/vmm/vmm.c
  projects/camlock/sys/amd64/vmm/vmm_instruction_emul.c
  projects/camlock/sys/arm/arm/gic.c
  projects/camlock/sys/arm/include/sysarch.h
  projects/camlock/sys/arm/ti/omap4/omap4_prcm_clks.c
  projects/camlock/sys/arm/xscale/ixp425/ixp425_npe.c
  projects/camlock/sys/boot/common/module.c
  projects/camlock/sys/boot/fdt/dts/beaglebone.dts
  projects/camlock/sys/boot/i386/btx/btx/btx.S
  projects/camlock/sys/boot/pc98/btx/btx/btx.S
  projects/camlock/sys/cam/ata/ata_da.c
  projects/camlock/sys/cam/cam_periph.h
  projects/camlock/sys/cam/cam_xpt.c
  projects/camlock/sys/cam/scsi/scsi_all.c
  projects/camlock/sys/cam/scsi/scsi_all.h
  projects/camlock/sys/cam/scsi/scsi_ch.c
  projects/camlock/sys/cam/scsi/scsi_ch.h
  projects/camlock/sys/cam/scsi/scsi_da.c
  projects/camlock/sys/cam/scsi/scsi_pass.c
  projects/camlock/sys/cam/scsi/scsi_target.c
  projects/camlock/sys/cam/scsi/scsi_xpt.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
  projects/camlock/sys/conf/NOTES
  projects/camlock/sys/conf/files
  projects/camlock/sys/conf/files.powerpc
  projects/camlock/sys/conf/options
  projects/camlock/sys/conf/options.mips
  projects/camlock/sys/contrib/dev/acpica/changes.txt   (contents, props changed)
  projects/camlock/sys/contrib/dev/acpica/compiler/aslpredef.c
  projects/camlock/sys/contrib/dev/acpica/compiler/aslprepkg.c
  projects/camlock/sys/contrib/dev/acpica/components/debugger/dbdisply.c
  projects/camlock/sys/contrib/dev/acpica/components/debugger/dbexec.c
  projects/camlock/sys/contrib/dev/acpica/components/debugger/dbmethod.c
  projects/camlock/sys/contrib/dev/acpica/components/debugger/dbnames.c
  projects/camlock/sys/contrib/dev/acpica/components/events/evgpe.c
  projects/camlock/sys/contrib/dev/acpica/components/events/evregion.c
  projects/camlock/sys/contrib/dev/acpica/components/executer/exconfig.c
  projects/camlock/sys/contrib/dev/acpica/components/executer/exfldio.c
  projects/camlock/sys/contrib/dev/acpica/components/hardware/hwxface.c
  projects/camlock/sys/contrib/dev/acpica/components/namespace/nseval.c
  projects/camlock/sys/contrib/dev/acpica/components/namespace/nsinit.c
  projects/camlock/sys/contrib/dev/acpica/components/namespace/nspredef.c
  projects/camlock/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
  projects/camlock/sys/contrib/dev/acpica/components/namespace/nsrepair.c
  projects/camlock/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
  projects/camlock/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
  projects/camlock/sys/contrib/dev/acpica/components/parser/psxface.c
  projects/camlock/sys/contrib/dev/acpica/components/resources/rsutils.c
  projects/camlock/sys/contrib/dev/acpica/components/utilities/uteval.c
  projects/camlock/sys/contrib/dev/acpica/components/utilities/utosi.c
  projects/camlock/sys/contrib/dev/acpica/components/utilities/utpredef.c
  projects/camlock/sys/contrib/dev/acpica/components/utilities/utxferror.c
  projects/camlock/sys/contrib/dev/acpica/include/acconfig.h
  projects/camlock/sys/contrib/dev/acpica/include/aclocal.h
  projects/camlock/sys/contrib/dev/acpica/include/acmacros.h
  projects/camlock/sys/contrib/dev/acpica/include/acnamesp.h
  projects/camlock/sys/contrib/dev/acpica/include/acoutput.h
  projects/camlock/sys/contrib/dev/acpica/include/acpixf.h
  projects/camlock/sys/contrib/dev/acpica/include/acpredef.h
  projects/camlock/sys/contrib/dev/acpica/include/acstruct.h
  projects/camlock/sys/contrib/dev/acpica/include/acutils.h
  projects/camlock/sys/dev/acpi_support/acpi_toshiba.c
  projects/camlock/sys/dev/acpica/acpi.c
  projects/camlock/sys/dev/acpica/acpi_pci_link.c
  projects/camlock/sys/dev/aic7xxx/ahc_isa.c
  projects/camlock/sys/dev/ath/ath_hal/ar5416/ar5416.h
  projects/camlock/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c
  projects/camlock/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
  projects/camlock/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
  projects/camlock/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
  projects/camlock/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c
  projects/camlock/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c
  projects/camlock/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c
  projects/camlock/sys/dev/ath/if_ath.c
  projects/camlock/sys/dev/ath/if_ath_beacon.c
  projects/camlock/sys/dev/ath/if_ath_rx_edma.c
  projects/camlock/sys/dev/ath/if_ath_tx.c
  projects/camlock/sys/dev/ath/if_ath_tx_ht.c
  projects/camlock/sys/dev/ath/if_athrate.h
  projects/camlock/sys/dev/ath/if_athvar.h
  projects/camlock/sys/dev/bktr/CHANGELOG.TXT
  projects/camlock/sys/dev/bktr/bktr_core.c
  projects/camlock/sys/dev/bktr/bktr_os.c
  projects/camlock/sys/dev/cas/if_casvar.h
  projects/camlock/sys/dev/ciss/ciss.c
  projects/camlock/sys/dev/cxgb/common/cxgb_t3_hw.c
  projects/camlock/sys/dev/cxgbe/common/t4_hw.c
  projects/camlock/sys/dev/cxgbe/tom/t4_tom.c
  projects/camlock/sys/dev/cxgbe/tom/t4_tom.h
  projects/camlock/sys/dev/drm/mach64_dma.c
  projects/camlock/sys/dev/e1000/if_em.c
  projects/camlock/sys/dev/etherswitch/arswitch/arswitch.c
  projects/camlock/sys/dev/etherswitch/etherswitch.h
  projects/camlock/sys/dev/etherswitch/rtl8366/rtl8366rb.c
  projects/camlock/sys/dev/hptmv/entry.c
  projects/camlock/sys/dev/iicbus/if_ic.c
  projects/camlock/sys/dev/ips/ips.c
  projects/camlock/sys/dev/isci/scil/scic_sds_phy.c
  projects/camlock/sys/dev/isci/scil/scic_sds_port.c
  projects/camlock/sys/dev/isci/scil/scic_sds_port_configuration_agent.c
  projects/camlock/sys/dev/lmc/if_lmc.c
  projects/camlock/sys/dev/lmc/if_lmc.h
  projects/camlock/sys/dev/mmc/mmcsd.c
  projects/camlock/sys/dev/mpt/mpt_pci.c
  projects/camlock/sys/dev/msk/if_msk.c
  projects/camlock/sys/dev/mvs/mvs_pci.c
  projects/camlock/sys/dev/mvs/mvs_soc.c
  projects/camlock/sys/dev/mxge/if_mxge.c
  projects/camlock/sys/dev/netmap/netmap.c
  projects/camlock/sys/dev/netmap/netmap_kern.h
  projects/camlock/sys/dev/netmap/netmap_mem2.c
  projects/camlock/sys/dev/ppbus/if_plip.c
  projects/camlock/sys/dev/ppbus/ppbconf.c
  projects/camlock/sys/dev/random/randomdev_soft.c
  projects/camlock/sys/dev/rndtest/rndtest.c
  projects/camlock/sys/dev/siis/siis.c
  projects/camlock/sys/dev/sound/pci/emu10kx.c
  projects/camlock/sys/dev/sound/pcm/dsp.c
  projects/camlock/sys/dev/sound/usb/uaudio.c
  projects/camlock/sys/dev/uart/uart_bus_pci.c
  projects/camlock/sys/dev/uart/uart_subr.c
  projects/camlock/sys/dev/usb/controller/ohci_pci.c
  projects/camlock/sys/dev/usb/controller/usb_controller.c
  projects/camlock/sys/dev/usb/controller/xhci.c
  projects/camlock/sys/dev/usb/net/if_usie.c
  projects/camlock/sys/dev/usb/net/uhso.c
  projects/camlock/sys/dev/usb/usb_process.h
  projects/camlock/sys/dev/usb/wlan/if_zydreg.h
  projects/camlock/sys/dev/xen/netback/netback.c
  projects/camlock/sys/fs/devfs/devfs_devs.c
  projects/camlock/sys/fs/msdosfs/msdosfs_conv.c
  projects/camlock/sys/fs/nfs/nfs_commonkrpc.c
  projects/camlock/sys/fs/nfs/nfs_commonport.c
  projects/camlock/sys/fs/nfs/nfs_commonsubs.c
  projects/camlock/sys/fs/nfs/nfs_var.h
  projects/camlock/sys/fs/nfs/nfsm_subs.h
  projects/camlock/sys/fs/nfs/nfsport.h
  projects/camlock/sys/fs/nfsclient/nfs_clbio.c
  projects/camlock/sys/fs/nfsclient/nfs_clkrpc.c
  projects/camlock/sys/fs/nfsclient/nfs_clnfsiod.c
  projects/camlock/sys/fs/nfsclient/nfs_clvfsops.c
  projects/camlock/sys/fs/nfsserver/nfs_nfsdkrpc.c
  projects/camlock/sys/fs/nfsserver/nfs_nfsdport.c
  projects/camlock/sys/fs/nfsserver/nfs_nfsdsocket.c
  projects/camlock/sys/geom/geom_dev.c
  projects/camlock/sys/geom/geom_disk.c
  projects/camlock/sys/geom/geom_disk.h
  projects/camlock/sys/geom/geom_dump.c
  projects/camlock/sys/geom/geom_flashmap.c
  projects/camlock/sys/geom/label/g_label.c
  projects/camlock/sys/geom/label/g_label.h
  projects/camlock/sys/geom/raid/g_raid.c
  projects/camlock/sys/i386/include/param.h
  projects/camlock/sys/i386/isa/spic.c
  projects/camlock/sys/kern/imgact_elf.c
  projects/camlock/sys/kern/imgact_gzip.c
  projects/camlock/sys/kern/kern_descrip.c
  projects/camlock/sys/kern/kern_environment.c
  projects/camlock/sys/kern/kern_fork.c
  projects/camlock/sys/kern/kern_mbuf.c
  projects/camlock/sys/kern/kern_proc.c
  projects/camlock/sys/kern/kern_umtx.c
  projects/camlock/sys/kern/sched_ule.c
  projects/camlock/sys/kern/subr_bus_dma.c
  projects/camlock/sys/kern/subr_counter.c
  projects/camlock/sys/kern/uipc_syscalls.c
  projects/camlock/sys/kern/vfs_mount.c
  projects/camlock/sys/kern/vfs_subr.c
  projects/camlock/sys/libkern/arc4random.c
  projects/camlock/sys/mips/cavium/uart_dev_oct16550.c
  projects/camlock/sys/mips/include/cpufunc.h
  projects/camlock/sys/mips/include/frame.h
  projects/camlock/sys/mips/include/pcb.h
  projects/camlock/sys/mips/include/regnum.h
  projects/camlock/sys/mips/malta/malta_machdep.c
  projects/camlock/sys/mips/mips/bus_space_generic.c
  projects/camlock/sys/mips/mips/db_interface.c
  projects/camlock/sys/mips/mips/db_trace.c
  projects/camlock/sys/mips/mips/support.S
  projects/camlock/sys/mips/mips/swtch.S
  projects/camlock/sys/mips/mips/trap.c
  projects/camlock/sys/mips/mips/vm_machdep.c
  projects/camlock/sys/modules/acpi/acpi/Makefile
  projects/camlock/sys/modules/geom/geom_label/Makefile
  projects/camlock/sys/modules/nfsd/Makefile
  projects/camlock/sys/modules/nfsserver/Makefile
  projects/camlock/sys/modules/uart/Makefile
  projects/camlock/sys/net/ethernet.h
  projects/camlock/sys/net/if.c
  projects/camlock/sys/net/if_arc.h
  projects/camlock/sys/net/if_arcsubr.c
  projects/camlock/sys/net/if_atm.h
  projects/camlock/sys/net/if_atmsubr.c
  projects/camlock/sys/net/if_dead.c
  projects/camlock/sys/net/if_disc.c
  projects/camlock/sys/net/if_ef.c
  projects/camlock/sys/net/if_enc.c
  projects/camlock/sys/net/if_ethersubr.c
  projects/camlock/sys/net/if_faith.c
  projects/camlock/sys/net/if_fddisubr.c
  projects/camlock/sys/net/if_fwsubr.c
  projects/camlock/sys/net/if_gif.c
  projects/camlock/sys/net/if_gif.h
  projects/camlock/sys/net/if_gre.c
  projects/camlock/sys/net/if_iso88025subr.c
  projects/camlock/sys/net/if_lagg.c
  projects/camlock/sys/net/if_lagg.h
  projects/camlock/sys/net/if_loop.c
  projects/camlock/sys/net/if_spppsubr.c
  projects/camlock/sys/net/if_stf.c
  projects/camlock/sys/net/if_tun.c
  projects/camlock/sys/net/if_var.h
  projects/camlock/sys/net/if_vlan.c
  projects/camlock/sys/net/iso88025.h
  projects/camlock/sys/net80211/ieee80211.c
  projects/camlock/sys/net80211/ieee80211_output.c
  projects/camlock/sys/net80211/ieee80211_proto.h
  projects/camlock/sys/net80211/ieee80211_var.h
  projects/camlock/sys/netatalk/aarp.c
  projects/camlock/sys/netatalk/aarp.h
  projects/camlock/sys/netatalk/at_control.c
  projects/camlock/sys/netatalk/at_extern.h
  projects/camlock/sys/netgraph/ng_base.c
  projects/camlock/sys/netgraph/ng_fec.c
  projects/camlock/sys/netgraph/ng_iface.c
  projects/camlock/sys/netinet/if_atm.c
  projects/camlock/sys/netinet/if_atm.h
  projects/camlock/sys/netinet/if_ether.c
  projects/camlock/sys/netinet/if_ether.h
  projects/camlock/sys/netinet/in.c
  projects/camlock/sys/netinet/ip_carp.c
  projects/camlock/sys/netinet/ip_carp.h
  projects/camlock/sys/netinet/ip_mroute.c
  projects/camlock/sys/netinet/ip_output.c
  projects/camlock/sys/netinet/tcp_input.c
  projects/camlock/sys/netinet/tcp_subr.c
  projects/camlock/sys/netinet6/in6.c
  projects/camlock/sys/netinet6/in6_pcb.c
  projects/camlock/sys/netinet6/in6_src.c
  projects/camlock/sys/netinet6/in6_var.h
  projects/camlock/sys/netinet6/ip6_input.c
  projects/camlock/sys/netinet6/ip6_var.h
  projects/camlock/sys/netinet6/nd6.c
  projects/camlock/sys/netinet6/nd6.h
  projects/camlock/sys/netpfil/ipfw/ip_fw_log.c
  projects/camlock/sys/netpfil/pf/if_pflog.c
  projects/camlock/sys/netpfil/pf/if_pfsync.c
  projects/camlock/sys/nfsclient/nfs_bio.c
  projects/camlock/sys/nfsclient/nfs_nfsiod.c
  projects/camlock/sys/nfsclient/nfs_vfsops.c
  projects/camlock/sys/nfsserver/nfs_srvkrpc.c
  projects/camlock/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
  projects/camlock/sys/pc98/pc98/canbus.c
  projects/camlock/sys/pci/ncr.c
  projects/camlock/sys/powerpc/aim/mmu_oea.c
  projects/camlock/sys/powerpc/wii/platform_wii.c
  projects/camlock/sys/powerpc/wii/wii_bus.c
  projects/camlock/sys/powerpc/wii/wii_fb.c
  projects/camlock/sys/powerpc/wii/wii_pic.c
  projects/camlock/sys/powerpc/wii/wii_picreg.h
  projects/camlock/sys/sys/ata.h
  projects/camlock/sys/sys/chio.h
  projects/camlock/sys/sys/elf_common.h
  projects/camlock/sys/sys/libkern.h
  projects/camlock/sys/sys/param.h
  projects/camlock/sys/sys/proc.h
  projects/camlock/sys/sys/user.h
  projects/camlock/sys/ufs/ffs/ffs_balloc.c
  projects/camlock/sys/vm/uma_core.c
  projects/camlock/sys/vm/vm_radix.c
  projects/camlock/sys/x86/include/specialreg.h
  projects/camlock/sys/x86/x86/tsc.c
  projects/camlock/tools/build/mk/OptionalObsoleteFiles.inc
  projects/camlock/tools/build/options/WITHOUT_JAIL
  projects/camlock/tools/build/options/WITHOUT_LEGACY_CONSOLE
  projects/camlock/tools/regression/pjdfstest/pjdfstest.c
  projects/camlock/tools/regression/usr.bin/yacc/grammar.y
  projects/camlock/tools/regression/usr.bin/yacc/regress.08.out
  projects/camlock/tools/tools/notescheck/notescheck.py
  projects/camlock/tools/tools/sysbuild/sysbuild.sh
  projects/camlock/usr.bin/ar/Makefile
  projects/camlock/usr.bin/bc/Makefile
  projects/camlock/usr.bin/bzip2recover/Makefile
  projects/camlock/usr.bin/find/Makefile
  projects/camlock/usr.bin/gcore/Makefile
  projects/camlock/usr.bin/gcore/elfcore.c
  projects/camlock/usr.bin/indent/Makefile
  projects/camlock/usr.bin/m4/Makefile
  projects/camlock/usr.bin/mklocale/Makefile
  projects/camlock/usr.bin/netstat/inet6.c
  projects/camlock/usr.bin/procstat/procstat.1
  projects/camlock/usr.bin/procstat/procstat.c
  projects/camlock/usr.bin/procstat/procstat.h
  projects/camlock/usr.bin/procstat/procstat_args.c
  projects/camlock/usr.bin/procstat/procstat_auxv.c
  projects/camlock/usr.bin/procstat/procstat_bin.c
  projects/camlock/usr.bin/procstat/procstat_cred.c
  projects/camlock/usr.bin/procstat/procstat_kstack.c
  projects/camlock/usr.bin/procstat/procstat_rlimit.c
  projects/camlock/usr.bin/procstat/procstat_sigs.c
  projects/camlock/usr.bin/procstat/procstat_threads.c
  projects/camlock/usr.bin/procstat/procstat_vm.c
  projects/camlock/usr.bin/touch/touch.c
  projects/camlock/usr.sbin/acpi/acpidb/Makefile
  projects/camlock/usr.sbin/acpi/acpidb/acpidb.c
  projects/camlock/usr.sbin/acpi/iasl/Makefile
  projects/camlock/usr.sbin/auditdistd/Makefile
  projects/camlock/usr.sbin/bhyve/bhyverun.c
  projects/camlock/usr.sbin/bhyve/pci_emul.c
  projects/camlock/usr.sbin/bhyve/pci_emul.h
  projects/camlock/usr.sbin/bhyve/pci_virtio_block.c
  projects/camlock/usr.sbin/bhyve/pci_virtio_net.c
  projects/camlock/usr.sbin/bluetooth/bthidd/Makefile
  projects/camlock/usr.sbin/bsdconfig/USAGE
  projects/camlock/usr.sbin/bsdconfig/bsdconfig
  projects/camlock/usr.sbin/bsdconfig/console/USAGE
  projects/camlock/usr.sbin/bsdconfig/console/console
  projects/camlock/usr.sbin/bsdconfig/console/font
  projects/camlock/usr.sbin/bsdconfig/console/keymap
  projects/camlock/usr.sbin/bsdconfig/console/repeat
  projects/camlock/usr.sbin/bsdconfig/console/saver
  projects/camlock/usr.sbin/bsdconfig/console/screenmap
  projects/camlock/usr.sbin/bsdconfig/console/ttys
  projects/camlock/usr.sbin/bsdconfig/diskmgmt/USAGE
  projects/camlock/usr.sbin/bsdconfig/diskmgmt/diskmgmt
  projects/camlock/usr.sbin/bsdconfig/docsinstall/USAGE
  projects/camlock/usr.sbin/bsdconfig/docsinstall/docsinstall
  projects/camlock/usr.sbin/bsdconfig/dot/USAGE
  projects/camlock/usr.sbin/bsdconfig/dot/dot
  projects/camlock/usr.sbin/bsdconfig/include/messages.subr
  projects/camlock/usr.sbin/bsdconfig/mouse/USAGE
  projects/camlock/usr.sbin/bsdconfig/mouse/disable
  projects/camlock/usr.sbin/bsdconfig/mouse/enable
  projects/camlock/usr.sbin/bsdconfig/mouse/flags
  projects/camlock/usr.sbin/bsdconfig/mouse/mouse
  projects/camlock/usr.sbin/bsdconfig/mouse/port
  projects/camlock/usr.sbin/bsdconfig/mouse/type
  projects/camlock/usr.sbin/bsdconfig/networking/USAGE
  projects/camlock/usr.sbin/bsdconfig/networking/defaultrouter
  projects/camlock/usr.sbin/bsdconfig/networking/devices
  projects/camlock/usr.sbin/bsdconfig/networking/hostname
  projects/camlock/usr.sbin/bsdconfig/networking/nameservers
  projects/camlock/usr.sbin/bsdconfig/networking/networking
  projects/camlock/usr.sbin/bsdconfig/networking/share/device.subr
  projects/camlock/usr.sbin/bsdconfig/networking/share/media.subr
  projects/camlock/usr.sbin/bsdconfig/networking/share/resolv.subr
  projects/camlock/usr.sbin/bsdconfig/password/USAGE
  projects/camlock/usr.sbin/bsdconfig/password/include/messages.subr
  projects/camlock/usr.sbin/bsdconfig/password/password
  projects/camlock/usr.sbin/bsdconfig/password/share/password.subr
  projects/camlock/usr.sbin/bsdconfig/security/USAGE
  projects/camlock/usr.sbin/bsdconfig/security/kern_securelevel
  projects/camlock/usr.sbin/bsdconfig/security/security
  projects/camlock/usr.sbin/bsdconfig/share/common.subr
  projects/camlock/usr.sbin/bsdconfig/share/device.subr
  projects/camlock/usr.sbin/bsdconfig/share/dialog.subr
  projects/camlock/usr.sbin/bsdconfig/share/media/common.subr
  projects/camlock/usr.sbin/bsdconfig/share/media/ftp.subr
  projects/camlock/usr.sbin/bsdconfig/share/media/options.subr
  projects/camlock/usr.sbin/bsdconfig/share/media/tcpip.subr
  projects/camlock/usr.sbin/bsdconfig/share/mustberoot.subr
  projects/camlock/usr.sbin/bsdconfig/share/strings.subr
  projects/camlock/usr.sbin/bsdconfig/startup/USAGE
  projects/camlock/usr.sbin/bsdconfig/startup/include/messages.subr
  projects/camlock/usr.sbin/bsdconfig/startup/misc
  projects/camlock/usr.sbin/bsdconfig/startup/rcadd
  projects/camlock/usr.sbin/bsdconfig/startup/rcconf
  projects/camlock/usr.sbin/bsdconfig/startup/rcdelete
  projects/camlock/usr.sbin/bsdconfig/startup/rcedit
  projects/camlock/usr.sbin/bsdconfig/startup/rcvar
  projects/camlock/usr.sbin/bsdconfig/startup/share/rcconf.subr
  projects/camlock/usr.sbin/bsdconfig/startup/share/rcvar.subr
  projects/camlock/usr.sbin/bsdconfig/startup/startup
  projects/camlock/usr.sbin/bsdconfig/timezone/USAGE
  projects/camlock/usr.sbin/bsdconfig/timezone/timezone
  projects/camlock/usr.sbin/bsdconfig/ttys/USAGE
  projects/camlock/usr.sbin/bsdconfig/ttys/ttys
  projects/camlock/usr.sbin/bsdconfig/usermgmt/USAGE
  projects/camlock/usr.sbin/bsdconfig/usermgmt/groupadd
  projects/camlock/usr.sbin/bsdconfig/usermgmt/groupdel
  projects/camlock/usr.sbin/bsdconfig/usermgmt/groupedit
  projects/camlock/usr.sbin/bsdconfig/usermgmt/groupinput
  projects/camlock/usr.sbin/bsdconfig/usermgmt/include/messages.subr
  projects/camlock/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
  projects/camlock/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
  projects/camlock/usr.sbin/bsdconfig/usermgmt/useradd
  projects/camlock/usr.sbin/bsdconfig/usermgmt/userdel
  projects/camlock/usr.sbin/bsdconfig/usermgmt/useredit
  projects/camlock/usr.sbin/bsdconfig/usermgmt/userinput
  projects/camlock/usr.sbin/bsdconfig/usermgmt/usermgmt
  projects/camlock/usr.sbin/bsnmpd/modules/Makefile.inc
  projects/camlock/usr.sbin/config/Makefile
  projects/camlock/usr.sbin/fifolog/lib/Makefile
  projects/camlock/usr.sbin/jail/Makefile
  projects/camlock/usr.sbin/mergemaster/mergemaster.sh
  projects/camlock/usr.sbin/nandsim/nandsim_cfgparse.c
  projects/camlock/usr.sbin/ppp/command.c
  projects/camlock/usr.sbin/timed/timed/timed.8
Directory Properties:
  projects/camlock/   (props changed)
  projects/camlock/cddl/   (props changed)
  projects/camlock/cddl/contrib/opensolaris/   (props changed)
  projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/   (props changed)
  projects/camlock/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/camlock/contrib/binutils/   (props changed)
  projects/camlock/contrib/gdb/   (props changed)
  projects/camlock/contrib/llvm/   (props changed)
  projects/camlock/contrib/netcat/   (props changed)
  projects/camlock/contrib/sendmail/   (props changed)
  projects/camlock/contrib/tzdata/   (props changed)
  projects/camlock/crypto/openssh/   (props changed)
  projects/camlock/gnu/lib/   (props changed)
  projects/camlock/gnu/usr.bin/gdb/   (props changed)
  projects/camlock/lib/libc/   (props changed)
  projects/camlock/lib/libvmmapi/   (props changed)
  projects/camlock/lib/libz/   (props changed)
  projects/camlock/sbin/   (props changed)
  projects/camlock/share/man/man4/   (props changed)
  projects/camlock/sys/   (props changed)
  projects/camlock/sys/amd64/include/xen/   (props changed)
  projects/camlock/sys/amd64/vmm/   (props changed)
  projects/camlock/sys/boot/   (props changed)
  projects/camlock/sys/cddl/contrib/opensolaris/   (props changed)
  projects/camlock/sys/conf/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/compiler/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/components/debugger/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/components/events/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/components/executer/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/components/hardware/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/components/namespace/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/components/parser/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/components/resources/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/components/utilities/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/include/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/os_specific/   (props changed)
  projects/camlock/usr.bin/procstat/   (props changed)
  projects/camlock/usr.sbin/bhyve/   (props changed)
  projects/camlock/usr.sbin/jail/   (props changed)

Modified: projects/camlock/Makefile.inc1
==============================================================================
--- projects/camlock/Makefile.inc1	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/Makefile.inc1	Sat Apr 27 11:28:00 2013	(r249978)
@@ -616,6 +616,7 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_inc
 # Checks to be sure system is ready for installworld/installkernel.
 #
 installcheck:
+installcheck_UGID:
 
 #
 # Require DESTDIR to be set if installing for a different architecture or
@@ -647,7 +648,6 @@ CHECK_GIDS+=	smmsp
 CHECK_UIDS+=	proxy
 CHECK_GIDS+=	proxy authpf
 .endif
-installcheck: installcheck_UGID
 installcheck_UGID:
 .for uid in ${CHECK_UIDS}
 	@if ! `id -u ${uid} >/dev/null 2>&1`; then \
@@ -703,7 +703,7 @@ EXTRA_DISTRIBUTIONS+=	lib32
 
 MTREE_MAGIC?=	mtree 2.0
 
-distributeworld installworld: installcheck
+distributeworld installworld: installcheck installcheck_UGID
 	mkdir -p ${INSTALLTMP}
 	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
@@ -1382,7 +1382,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_kerberos5_lib_libwind} \
 		${_lib_atf_libatf_c} \
 		lib/libbz2 ${_libcom_err} lib/libcrypt \
-		lib/libexpat \
+		lib/libelf lib/libexpat \
 		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \

Modified: projects/camlock/UPDATING
==============================================================================
--- projects/camlock/UPDATING	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/UPDATING	Sat Apr 27 11:28:00 2013	(r249978)
@@ -11,6 +11,11 @@ handbook:
 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running portupgrade.
 
+NOTE: FreeBSD has switched from gcc to clang. If you have trouble bootstrapping
+from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of
+head, and then rebuild without this option. The bootstrap process from
+older version of current is a bit fragile.
+
 NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
 	FreeBSD 10.x has many debugging features turned on, in both the kernel
 	and userland.  These features attempt to detect incorrect use of
@@ -26,6 +31,25 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130426:
+	The WITHOUT_IDEA option has been removed because
+	the IDEA patent expired.
+
+20130426:
+	The sysctl which controls TRIM support under ZFS has been renamed
+	from vfs.zfs.trim_disable -> vfs.zfs.trim.enabled and has been
+	enabled by default.
+
+20130425:
+	The mergemaster command now uses the default MAKEOBJDIRPREFIX
+	rather than creating it's own in the temporary directory in
+	order allow access to bootstrapped versions of tools such as
+	install and mtree.  When upgrading from version of FreeBSD where
+	the install command does not support -l, you will need to
+	install a new mergemaster command if mergemaster -p is required.
+	This can be accomplished with the command (cd src/usr.sbin/mergemaster
+	&& make install).
+
 20130404:
 	Legacy ATA stack, disabled and replaced by new CAM-based one since
 	FreeBSD 9.0, completely removed from the sources.  Kernel modules
@@ -122,7 +146,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	This means that the world and kernel will be compiled with clang
 	and that clang will be installed as /usr/bin/cc, /usr/bin/c++,
 	and /usr/bin/cpp.  To disable this behavior and revert to building
-	with gcc, compile with WITHOUT_CLANG_IS_CC.
+	with gcc, compile with WITHOUT_CLANG_IS_CC. Really old versions
+	of current may need to bootstrap WITHOUT_CLANG first if the clang
+	build fails (its compatibility window doesn't extend to the 9 stable
+	branch point).
 
 20121102:
 	The IPFIREWALL_FORWARD kernel option has been removed. Its
@@ -1604,6 +1631,11 @@ COMMON ITEMS:
 	path, and has the highest probability of being successful.  Please try
 	this approach before reporting problems with a major version upgrade.
 
+	When upgrading a live system, having a root shell around before
+	installing anything can help undo problems. Not having a root shell
+	around can lead to problems if pam has changed too much from your
+	starting point to allow continued authentication after the upgrade.
+
 	ZFS notes
 	---------
 	When upgrading the boot ZFS pool to a new version, always follow
@@ -1669,7 +1701,6 @@ COMMON ITEMS:
 	make delete-old					[6]
 	<reboot>
 
-
 	To cross-install current onto a separate partition
 	--------------------------------------------------
 	# In this approach we use a separate partition to hold
@@ -1745,7 +1776,7 @@ COMMON ITEMS:
 	step.  It never hurts to do it all the time.  You may need to
 	install a new mergemaster (cd src/usr.sbin/mergemaster && make
 	install) after the buildworld before this step if you last updated
-	from current before 20020224 or from -stable before 20020408.
+	from current before 20130425 or from -stable before 20130430.
 
 	[6] This only deletes old files and directories. Old libraries
 	can be deleted by "make delete-old-libs", but you have to make

Modified: projects/camlock/bin/cat/cat.c
==============================================================================
--- projects/camlock/bin/cat/cat.c	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/bin/cat/cat.c	Sat Apr 27 11:28:00 2013	(r249978)
@@ -68,7 +68,7 @@ static int bflag, eflag, lflag, nflag, s
 static int rval;
 static const char *filename;
 
-static void usage(void);
+static void usage(void) __dead2;
 static void scanfiles(char *argv[], int cooked);
 static void cook_cat(FILE *);
 static void raw_cat(int);
@@ -153,6 +153,7 @@ main(int argc, char *argv[])
 static void
 usage(void)
 {
+
 	fprintf(stderr, "usage: cat [-belnstuv] [file ...]\n");
 	exit(1);
 	/* NOTREACHED */

Modified: projects/camlock/bin/chio/chio.c
==============================================================================
--- projects/camlock/bin/chio/chio.c	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/bin/chio/chio.c	Sat Apr 27 11:28:00 2013	(r249978)
@@ -54,6 +54,8 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <langinfo.h>
+#include <locale.h>
 
 #include "defs.h"
 #include "pathnames.h"
@@ -81,6 +83,7 @@ static	int do_status(const char *, int, 
 static	int do_ielem(const char *, int, char **);
 static	int do_return(const char *, int, char **);
 static	int do_voltag(const char *, int, char **);
+static	void print_designator(const char *, u_int8_t, u_int8_t);
 
 #ifndef CHET_VT
 #define	CHET_VT		10			/* Completely Arbitrary */
@@ -723,6 +726,10 @@ do_status(const char *cname, int argc, c
 					putchar('?');
 				putchar('>');
 			}
+			if (ces->ces_designator_length > 0)
+				print_designator(ces->ces_designator,
+						 ces->ces_code_set,
+						 ces->ces_designator_length);
 			putchar('\n');
 		}
 
@@ -1177,3 +1184,66 @@ usage(void)
 		"arg1 arg2 [arg3 [...]]\n", getprogname());
 	exit(1);
 }
+
+#define	UTF8CODESET	"UTF-8"
+
+static void
+print_designator(const char *designator, u_int8_t code_set,
+    u_int8_t designator_length)
+{
+	printf(" serial number: <");
+	switch (code_set) {
+	case CES_CODE_SET_ASCII: {
+		/*
+		 * The driver insures that the string is always NUL terminated.
+		 */
+		printf("%s", designator);
+		break;
+	}
+	case CES_CODE_SET_UTF_8: {
+		char *cs_native;
+
+		setlocale(LC_ALL, "");
+		cs_native = nl_langinfo(CODESET);
+
+		/* See if we can natively print UTF-8 */
+		if (strcmp(cs_native, UTF8CODESET) == 0)
+			cs_native = NULL;
+
+		if (cs_native == NULL) {
+			/* We can natively print UTF-8, so use printf. */
+			printf("%s", designator);
+		} else {
+			int i;
+
+			/*
+			 * We can't natively print UTF-8.  We should
+			 * convert it to the terminal's codeset, but that
+			 * requires iconv(3) and FreeBSD doesn't have
+			 * iconv(3) in the base system yet.  So we use %XX
+			 * notation for non US-ASCII characters instead.
+			 */
+			for (i = 0; i < designator_length &&
+			    designator[i] != '\0'; i++) {
+				if ((unsigned char)designator[i] < 0x80)
+					printf("%c", designator[i]);
+				else
+					printf("%%%02x",
+					    (unsigned char)designator[i]);
+			}
+		}
+		break;
+	}
+	case CES_CODE_SET_BINARY: {
+		int i;
+
+		for (i = 0; i < designator_length; i++)
+			printf("%02X%s", designator[i],
+			    (i == designator_length - 1) ? "" : " ");
+		break;
+	}
+	default:
+		break;
+	}
+	printf(">");
+}

Modified: projects/camlock/bin/dd/dd.c
==============================================================================
--- projects/camlock/bin/dd/dd.c	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/bin/dd/dd.c	Sat Apr 27 11:28:00 2013	(r249978)
@@ -358,7 +358,7 @@ dd_in(void)
 		 * than noerror, notrunc or sync are specified, the block
 		 * is output without buffering as it is read.
 		 */
-		if (ddflags & C_BS) {
+		if ((ddflags & ~(C_NOERROR | C_NOTRUNC | C_SYNC)) == C_BS) {
 			out.dbcnt = in.dbcnt;
 			dd_out(1);
 			in.dbcnt = 0;

Modified: projects/camlock/bin/df/df.c
==============================================================================
--- projects/camlock/bin/df/df.c	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/bin/df/df.c	Sat Apr 27 11:28:00 2013	(r249978)
@@ -114,6 +114,7 @@ main(int argc, char *argv[])
 
 	fstype = "ufs";
 	(void)setlocale(LC_ALL, "");
+	memset(&maxwidths, 0, sizeof(maxwidths));
 	memset(&totalbuf, 0, sizeof(totalbuf));
 	totalbuf.f_bsize = DEV_BSIZE;
 	strlcpy(totalbuf.f_mntfromname, "total", MNAMELEN);
@@ -200,7 +201,7 @@ main(int argc, char *argv[])
 	} else {
 		/* just the filesystems specified on the command line */
 		mntbuf = malloc(argc * sizeof(*mntbuf));
-		if (mntbuf == 0)
+		if (mntbuf == NULL)
 			err(1, "malloc()");
 		mntsize = 0;
 		/* continued in for loop below */
@@ -209,13 +210,13 @@ main(int argc, char *argv[])
 	/* iterate through specified filesystems */
 	for (; *argv; argv++) {
 		if (stat(*argv, &stbuf) < 0) {
-			if ((mntpt = getmntpt(*argv)) == 0) {
+			if ((mntpt = getmntpt(*argv)) == NULL) {
 				warn("%s", *argv);
 				rv = 1;
 				continue;
 			}
 		} else if (S_ISCHR(stbuf.st_mode)) {
-			if ((mntpt = getmntpt(*argv)) == 0) {
+			if ((mntpt = getmntpt(*argv)) == NULL) {
 				mdev.fspec = *argv;
 				mntpath = strdup("/tmp/df.XXXXXX");
 				if (mntpath == NULL) {
@@ -282,7 +283,7 @@ main(int argc, char *argv[])
 		mntbuf[mntsize++] = statfsbuf;
 	}
 
-	bzero(&maxwidths, sizeof(maxwidths));
+	memset(&maxwidths, 0, sizeof(maxwidths));
 	for (i = 0; i < mntsize; i++) {
 		if (aflag || (mntbuf[i].f_flags & MNT_IGNORE) == 0) {
 			update_maxwidths(&maxwidths, &mntbuf[i]);
@@ -309,7 +310,7 @@ getmntpt(const char *name)
 		if (!strcmp(mntbuf[i].f_mntfromname, name))
 			return (mntbuf[i].f_mntonname);
 	}
-	return (0);
+	return (NULL);
 }
 
 /*

Modified: projects/camlock/bin/domainname/domainname.1
==============================================================================
--- projects/camlock/bin/domainname/domainname.1	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/bin/domainname/domainname.1	Sat Apr 27 11:28:00 2013	(r249978)
@@ -29,7 +29,7 @@
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
 .\" $FreeBSD$
 .\"
-.Dd September 18, 1994
+.Dd April 22, 2013
 .Dt DOMAINNAME 1
 .Os
 .Sh NAME
@@ -43,10 +43,11 @@ The
 .Nm
 utility prints the name of the current YP/NIS domain.
 The super-user can
-set the domain name by supplying an argument; this is usually done in the
-network initialization script
-.Pa /etc/rc.network ,
-normally run at boot
+set the domain name by supplying an argument; this is usually done with the
+.Va nisdomainname
+variable in the
+.Pa /etc/rc.conf
+file, normally run at boot
 time.
 .Sh NOTES
 The YP/NIS (formerly ``Yellow Pages'' but renamed for legal reasons)
@@ -54,7 +55,8 @@ domain name does not necessarily have an
 Name System domain name, although they are often set equal for administrative
 convenience.
 .Sh SEE ALSO
-.Xr getdomainname 3
+.Xr getdomainname 3 ,
+.Xr rc.conf 5
 .Sh HISTORY
 The
 .Nm

Modified: projects/camlock/bin/expr/Makefile
==============================================================================
--- projects/camlock/bin/expr/Makefile	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/bin/expr/Makefile	Sat Apr 27 11:28:00 2013	(r249978)
@@ -4,4 +4,6 @@ PROG=	expr
 SRCS=	expr.y
 YFLAGS=
 
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
 .include <bsd.prog.mk>

Modified: projects/camlock/bin/rm/rm.1
==============================================================================
--- projects/camlock/bin/rm/rm.1	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/bin/rm/rm.1	Sat Apr 27 11:28:00 2013	(r249978)
@@ -32,7 +32,7 @@
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
 .\" $FreeBSD$
 .\"
-.Dd March 15, 2013
+.Dd April 25, 2013
 .Dt RM 1
 .Os
 .Sh NAME
@@ -42,7 +42,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl f | i
-.Op Fl dIPRrvW
+.Op Fl dIPRrvWx
 .Ar
 .Nm unlink
 .Ar file
@@ -132,6 +132,8 @@ Attempt to undelete the named files.
 Currently, this option can only be used to recover
 files covered by whiteouts in a union file system (see
 .Xr undelete 2 ) .
+.It Fl x
+When removing a hierarchy, do not cross mount points.
 .El
 .Pp
 The

Modified: projects/camlock/bin/rm/rm.c
==============================================================================
--- projects/camlock/bin/rm/rm.c	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/bin/rm/rm.c	Sat Apr 27 11:28:00 2013	(r249978)
@@ -59,19 +59,19 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 
 static int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok;
-static int rflag, Iflag;
+static int rflag, Iflag, xflag;
 static uid_t uid;
 static volatile sig_atomic_t info;
 
-int	check(char *, char *, struct stat *);
-int	check2(char **);
-void	checkdot(char **);
-void	checkslash(char **);
-void	rm_file(char **);
-int	rm_overwrite(char *, struct stat *);
-void	rm_tree(char **);
+static int	check(const char *, const char *, struct stat *);
+static int	check2(char **);
+static void	checkdot(char **);
+static void	checkslash(char **);
+static void	rm_file(char **);
+static int	rm_overwrite(const char *, struct stat *);
+static void	rm_tree(char **);
 static void siginfo(int __unused);
-void	usage(void);
+static void	usage(void);
 
 /*
  * rm --
@@ -106,8 +106,8 @@ main(int argc, char *argv[])
 		exit(eval);
 	}
 
-	Pflag = rflag = 0;
-	while ((ch = getopt(argc, argv, "dfiIPRrvW")) != -1)
+	Pflag = rflag = xflag = 0;
+	while ((ch = getopt(argc, argv, "dfiIPRrvWx")) != -1)
 		switch(ch) {
 		case 'd':
 			dflag = 1;
@@ -136,6 +136,9 @@ main(int argc, char *argv[])
 		case 'W':
 			Wflag = 1;
 			break;
+		case 'x':
+			xflag = 1;
+			break;
 		default:
 			usage();
 		}
@@ -170,7 +173,7 @@ main(int argc, char *argv[])
 	exit (eval);
 }
 
-void
+static void
 rm_tree(char **argv)
 {
 	FTS *fts;
@@ -196,6 +199,8 @@ rm_tree(char **argv)
 		flags |= FTS_NOSTAT;
 	if (Wflag)
 		flags |= FTS_WHITEOUT;
+	if (xflag)
+		flags |= FTS_XDEV;
 	if (!(fts = fts_open(argv, flags, NULL))) {
 		if (fflag && errno == ENOENT)
 			return;
@@ -335,7 +340,7 @@ err:
 	fts_close(fts);
 }
 
-void
+static void
 rm_file(char **argv)
 {
 	struct stat sb;
@@ -412,8 +417,8 @@ rm_file(char **argv)
  * System V file system).  In a logging or COW file system, you'll have to
  * have kernel support.
  */
-int
-rm_overwrite(char *file, struct stat *sbp)
+static int
+rm_overwrite(const char *file, struct stat *sbp)
 {
 	struct stat sb, sb2;
 	struct statfs fsb;
@@ -479,8 +484,8 @@ err:	eval = 1;
 }
 
 
-int
-check(char *path, char *name, struct stat *sp)
+static int
+check(const char *path, const char *name, struct stat *sp)
 {
 	int ch, first;
 	char modep[15], *flagsp;
@@ -491,7 +496,7 @@ check(char *path, char *name, struct sta
 	else {
 		/*
 		 * If it's not a symbolic link and it's unwritable and we're
-		 * talking to a terminal, ask.	Symbolic links are excluded
+		 * talking to a terminal, ask.  Symbolic links are excluded
 		 * because their permissions are meaningless.  Check stdin_ok
 		 * first because we may not have stat'ed the file.
 		 */
@@ -524,7 +529,7 @@ check(char *path, char *name, struct sta
 }
 
 #define ISSLASH(a)	((a)[0] == '/' && (a)[1] == '\0')
-void
+static void
 checkslash(char **argv)
 {
 	char **t, **u;
@@ -544,7 +549,7 @@ checkslash(char **argv)
 	}
 }
 
-int
+static int
 check2(char **argv)
 {
 	struct stat st;
@@ -595,7 +600,7 @@ check2(char **argv)
 }
 
 #define ISDOT(a)	((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2])))
-void
+static void
 checkdot(char **argv)
 {
 	char *p, **save, **t;
@@ -619,12 +624,12 @@ checkdot(char **argv)
 	}
 }
 
-void
+static void
 usage(void)
 {
 
 	(void)fprintf(stderr, "%s\n%s\n",
-	    "usage: rm [-f | -i] [-dIPRrvW] file ...",
+	    "usage: rm [-f | -i] [-dIPRrvWx] file ...",
 	    "       unlink file");
 	exit(EX_USAGE);
 }

Modified: projects/camlock/bin/sh/sh.1
==============================================================================
--- projects/camlock/bin/sh/sh.1	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/bin/sh/sh.1	Sat Apr 27 11:28:00 2013	(r249978)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd March 24, 2013
+.Dd April 21, 2013
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1340,9 +1340,33 @@ The primary prompt string, which default
 .Dq Li "$ " ,
 unless you are the superuser, in which case it defaults to
 .Dq Li "# " .
+.Va PS1
+may include any of the following formatting sequences,
+which are replaced by the given information:
+.Bl -tag -width indent
+.It Li \eH
+The local hostname.
+.It Li \eh
+The fully-qualified hostname.
+.It Li \eW
+The final component of the current working directory.
+.It Li \ew
+The entire path of the current working directory.
+.It Li \e$
+Superuser status.
+.Dq Li "$ "
+for normal users and
+.Dq Li "# "
+for superusers.
+.It Li \e\e
+A literal backslash.
+.El
 .It Va PS2
 The secondary prompt string, which defaults to
 .Dq Li "> " .
+.Va PS2
+may include any of the formatting sequences from
+.Va PS1 .
 .It Va PS4
 The prefix for the trace output (if
 .Fl x

Modified: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c	Sat Apr 27 11:28:00 2013	(r249978)
@@ -23,9 +23,8 @@
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-/*
- * Copyright (c) 2012 by Delphix. All rights reserved.
- */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -1410,7 +1409,6 @@ main(int argc, char *argv[])
 	(void) dtrace_setopt(g_dtp, "bufsize", "4m");
 	(void) dtrace_setopt(g_dtp, "aggsize", "4m");
 #endif
-	(void) dtrace_setopt(g_dtp, "temporal", "yes");
 
 	/*
 	 * If -G is specified, enable -xlink=dynamic and -xunodefs to permit

Modified: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl	Sat Apr 27 11:28:00 2013	(r249978)
@@ -583,8 +583,6 @@ if ($opt_x) {
 die "$PNAME: failed to open $PNAME.$$.log: $!\n"
     unless (!$opt_l || open(LOG, ">$PNAME.$$.log"));
 
-$ENV{'DTRACE_DEBUG_REGSET'} = 'true';
-
 if ($opt_g) {
 	$ENV{'UMEM_DEBUG'} = 'default,verbose';
 	$ENV{'UMEM_LOGGING'} = 'fail,contents';

Copied: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d (from r249977, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d	Sat Apr 27 11:28:00 2013	(r249978, copy of r249977, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d)
@@ -0,0 +1,57 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma	ident	"%Z%%M%	%I%	%E% SMI"
+
+/*
+ * ASSERTION:
+ * 	Complex expressions.
+ *	Call complex expressions and make sure test succeeds.
+ *	Match expected output in tst.complex.d.out
+ *
+ * SECTION: Types, Operators, and Expressions/Arithmetic Operators
+ *
+ */
+
+#pragma D option quiet
+
+BEGIN
+{
+	i = 0;
+	i = i++ + ++i;
+	printf("The value of i is %d\n", i);
+	i = i-- - --i;
+	printf("The value of i is %d\n", i);
+	i = i-- + ++i;
+	printf("The value of i is %d\n", i);
+	i += i++ + -- i + ++i - ++i * i ;
+	printf("The value of i is %d\n", i);
+	i -= i++ * 3;
+	printf("The value of i is %d\n", i);
+	i = i++/i--+i++-++i-++i;
+	printf("The value of i is %d\n", i);
+	exit (0);
+}

Modified: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d	Sat Apr 27 11:28:00 2013	(r249978)
@@ -23,29 +23,26 @@
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-/*
- * Copyright (c) 2012 by Delphix. All rights reserved.
- */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * ASSERTION:
  *   Positive test for fill buffer policy.
  *
  * SECTION: Buffers and Buffering/fill Policy;
- *	Buffers and Buffering/Buffer Sizes;
+ * 	Buffers and Buffering/Buffer Sizes;
  *	Options and Tunables/bufsize;
  *	Options and Tunables/bufpolicy;
  *	Options and Tunables/statusrate
  */
 /*
- * This is a brute-force way of testing fill buffers.  We assume that
- * each printf() stores 16 bytes (4x 32-bit words for EPID, timestamp
- * lo, timestamp hi, and the variable i).  Because each fill buffer is
- * per-CPU, we must fill up our buffer in one series of enablings on a
- * single CPU.
+ * This is a brute-force way of testing fill buffers.  We assume that each
+ * printf() stores 8 bytes.  Because each fill buffer is per-CPU, we must
+ * fill up our buffer in one series of enablings on a single CPU.
  */
 #pragma D option bufpolicy=fill
-#pragma D option bufsize=128
+#pragma D option bufsize=64
 #pragma D option statusrate=10ms
 #pragma D option quiet
 

Modified: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d	Sat Apr 27 11:28:00 2013	(r249978)
@@ -23,9 +23,8 @@
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-/*
- * Copyright (c) 2012 by Delphix. All rights reserved.
- */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * ASSERTION:
@@ -38,20 +37,19 @@
  */
 
 /*
- * We make some regrettable assumptions about the implementation in this
- * test.  First, we assume that each entry for the printf() of an int
- * takes _exactly_ 16 bytes (4 bytes for the EPID, 8 bytes for the
- * timestamp, 4 bytes for the payload).  Second, we assume that by
- * allocating storage for n + 1 records, we will get exactly n.  Here is
- * why:  the final predicate that evaluates to false will reserve space
- * that it won't use.  This act of reservation will advance the wrapped
- * offset.  That record won't be subsequently used, but the wrapped
- * offset has advanced.  (And in this case, that old record is clobbered
- * by the exit() anyway.)  Thirdly:  we rely on t_cpu/cpu_id.  Finally:
- * we rely on being able to run on the CPU that we first ran on.
+ * We make some regrettable assumptions about the implementation in this test.
+ * First, we assume that each entry for the printf() of an int takes _exactly_
+ * eight bytes (four bytes for the EPID, four bytes for the payload).  Second,
+ * we assume that by allocating storage for n + 1 records, we will get exactly
+ * n.  Here is why:  the final predicate that evaluates to false will reserve
+ * space that it won't use.  This act of reservation will advance the wrapped
+ * offset.  That record won't be subsequently used, but the wrapped offset has
+ * advanced.  (And in this case, that old record is clobbered by the exit()
+ * anyway.)  Thirdly:  we rely on t_cpu/cpu_id.  Finally:  we rely on being
+ * able to run on the CPU that we first ran on.
  */
 #pragma D option bufpolicy=ring
-#pragma D option bufsize=80
+#pragma D option bufsize=40
 #pragma D option quiet
 
 int n;

Modified: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d	Sat Apr 27 11:28:00 2013	(r249978)
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-/*
- * Copyright (c) 2012 by Delphix. All rights reserved.
- */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #pragma D option quiet
 
@@ -38,8 +36,3 @@ BEGIN
 	printf("%s\n", strjoin("", ""));
 	exit(0);
 }
-
-BEGIN
-{
-	exit(1);
-}

Modified: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh	Sat Apr 27 11:28:00 2013	(r249978)
@@ -24,9 +24,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-
-#
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 if [ $# != 1 ]; then
@@ -51,13 +49,13 @@ tick-1s
 tick-1s
 /(i % 2) == 0/
 {
-	system("dtrace -c date -n 'pid\$target::main:entry' >/dev/null");
+	system("dtrace -c date -ln 'pid\$target::main:entry' >/dev/null");
 }
 
 tick-1s
 /(i % 2) == 1/
 {
-	system("dtrace -c date -n 'pid\$target::main:return' >/dev/null");
+	system("dtrace -c date -ln 'pid\$target::main:return' >/dev/null");
 }
 EOF
 

Modified: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d	Sat Apr 27 11:28:00 2013	(r249978)
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-/*
- * Copyright (c) 2012 by Delphix. All rights reserved.
- */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * ASSERTION: This test reproduces the alignment error.
@@ -41,10 +39,9 @@
 
 BEGIN
 {
-	x = (int *)64;
+	x = (int *) 64;
 	y = *x;
 	trace(y);
-	exit(0);
 }
 
 ERROR

Modified: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d	Sat Apr 27 11:28:00 2013	(r249978)
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-/*
- * Copyright (c) 2012 by Delphix. All rights reserved.
- */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * ASSERTION: D pointers do not allow invalid pointer accesses.
@@ -46,7 +44,6 @@ BEGIN
 	y = (int *) (x - 3300778156056);
 	*y = 3;
 	trace(*y);
-	exit(0);
 }
 
 ERROR

Modified: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d	Sat Apr 27 11:28:00 2013	(r249978)
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-/*
- * Copyright (c) 2012 by Delphix. All rights reserved.
- */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * ASSERTION: D pointers do not allow invalid pointer accesses.
@@ -41,10 +39,9 @@
 
 BEGIN
 {
-	y = (int *)-33007;
+	y = (int *) (-33007);
 	*y = 3;
 	trace(*y);
-	exit(0);
 }
 
 ERROR

Modified: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d	Sat Apr 27 08:40:37 2013	(r249977)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d	Sat Apr 27 11:28:00 2013	(r249978)
@@ -24,9 +24,7 @@
  * Use is subject to license terms.
  */
 
-/*
- * Copyright (c) 2012 by Delphix. All rights reserved.
- */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * ASSERTION: Demonstrating valid memory access.
@@ -42,11 +40,10 @@
 BEGIN
 {
 	x = (int *)alloca(sizeof (int));
-	printf("Address x: %x\n", (int)x);
-	y = (int *)(x - 2);
+	printf("Address x: %x\n", (int) x);
+	y = (int *) (x - 2);
 	*y = 3;
-	printf("Address y: %x\tValue: %d\n", (int)y, *y);
-	exit(0);
+	printf("Address y: %x\tValue: %d\n", (int) y, *y);
 }
 
 ERROR

Copied: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh (from r249977, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh	Sat Apr 27 11:28:00 2013	(r249978, copy of r249977, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh)
@@ -0,0 +1,197 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+
+unload()
+{
+	#
+	# Get the list of services whose processes have USDT probes.  Ideally
+	# it would be possible to unload the fasttrap provider while USDT
+	# probes exist -- once that fix is integrated, this hack can go away
+	# We create two lists -- one of regular SMF services and one of legacy
+	# services -- since each must be enabled and disabled using a specific
+	# mechanism.
+	#
+	pids=$(dtrace -l | \
+	    perl -ne 'print "$1\n" if (/^\s*\S+\s+\S*\D(\d+)\s+/);' | \
+	    sort | uniq | tr '\n' ',')
+
+	ctids=$(ps -p $pids -o ctid | tail +2 | sort | uniq)
+	svcs=
+	lrcs=
+
+	for ct in $ctids
+	do
+		line=$(svcs -o fmri,ctid | grep " $ct\$")
+		svc=$(echo $line | cut -d' ' -f1)
+
+		if [[ $(svcs -Ho STA $svc) == "LRC" ]]; then
+			lrc=$(svcs -Ho SVC $svc | tr _ '?')
+			lrcs="$lrcs $lrc"
+		else
+			svcs="$svcs $svc"
+	fi
+	done
+
+	for svc in $svcs
+	do
+		svcadm disable -ts $svc
+	done
+
+	for lrc in $lrcs
+	do
+		#
+		# Does it seem a little paternalistic that lsvcrun requires
+		# this environment variable to be set? I'd say so...
+		#
+		SMF_RESTARTER=svc:/system/svc/restarter:default \
+		    /lib/svc/bin/lsvcrun $lrc stop
+	done
+
+	modunload -i 0
+	modunload -i 0
+	modunload -i 0
+	modinfo | grep dtrace
+	success=$?
+
+	for svc in $svcs
+	do
+		svcadm enable -ts $svc
+	done
+
+	for lrc in $lrcs
+	do
+		SMF_RESTARTER=svc:/system/svc/restarter:default \
+		    /lib/svc/bin/lsvcrun $lrc start
+	done
+
+	if [ ! $success ]; then
+		echo $tst: could not unload dtrace
+		exit 1
+	fi
+}
+
+script1()
+{
+	$dtrace -s /dev/stdin <<EOF
+	syscall:::entry

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

More information about the svn-src-projects mailing list