svn commit: r279149 - in user/dchagin/lemul: . bin/pkill/tests contrib/ipfilter etc lib/libc/db/man lib/libc/gen lib/libc/regex lib/libc/sys lib/msun/src release release/doc/en_US.ISO8859-1/relnote...

Dmitry Chagin dchagin at FreeBSD.org
Sun Feb 22 08:25:21 UTC 2015 

Author: dchagin
Date: Sun Feb 22 08:25:08 2015
New Revision: 279149
URL: https://svnweb.freebsd.org/changeset/base/279149

Log:
  Merge from head.

Added:
  user/dchagin/lemul/share/man/man4/man4.powerpc/llan.4
     - copied unchanged from r279148, head/share/man/man4/man4.powerpc/llan.4
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslprintf.c
     - copied unchanged from r279148, head/sys/contrib/dev/acpica/compiler/aslprintf.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslprune.c
     - copied unchanged from r279148, head/sys/contrib/dev/acpica/compiler/aslprune.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c
     - copied unchanged from r279148, head/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c
  user/dchagin/lemul/sys/dev/ofw/ofw_cpu.h
     - copied unchanged from r279148, head/sys/dev/ofw/ofw_cpu.h
Deleted:
  user/dchagin/lemul/sys/dev/cxgb/sys/mbufq.h
  user/dchagin/lemul/sys/dev/xen/netfront/mbufq.h
Modified:
  user/dchagin/lemul/Makefile.inc1
  user/dchagin/lemul/UPDATING
  user/dchagin/lemul/bin/pkill/tests/pgrep-j_test.sh
  user/dchagin/lemul/bin/pkill/tests/pkill-j_test.sh
  user/dchagin/lemul/contrib/ipfilter/ip_fil.c
  user/dchagin/lemul/contrib/ipfilter/ipf.h
  user/dchagin/lemul/etc/netstart
  user/dchagin/lemul/lib/libc/db/man/dbm.3
  user/dchagin/lemul/lib/libc/gen/getgrent.c
  user/dchagin/lemul/lib/libc/gen/getpwent.c
  user/dchagin/lemul/lib/libc/gen/setmode.c
  user/dchagin/lemul/lib/libc/regex/engine.c
  user/dchagin/lemul/lib/libc/regex/regcomp.c
  user/dchagin/lemul/lib/libc/sys/mmap.2
  user/dchagin/lemul/lib/msun/src/e_j0.c
  user/dchagin/lemul/lib/msun/src/e_j0f.c
  user/dchagin/lemul/lib/msun/src/e_j1.c
  user/dchagin/lemul/lib/msun/src/e_j1f.c
  user/dchagin/lemul/release/doc/en_US.ISO8859-1/relnotes/article.xml
  user/dchagin/lemul/release/release.conf.sample
  user/dchagin/lemul/release/release.sh
  user/dchagin/lemul/share/man/man4/Makefile
  user/dchagin/lemul/share/man/man4/man4.arm/devcfg.4
  user/dchagin/lemul/share/man/man4/man4.i386/apm.4
  user/dchagin/lemul/share/man/man4/man4.powerpc/Makefile
  user/dchagin/lemul/share/man/man4/man4.powerpc/tsec.4
  user/dchagin/lemul/share/man/man5/rc.conf.5
  user/dchagin/lemul/share/man/man7/release.7
  user/dchagin/lemul/share/man/man9/microuptime.9
  user/dchagin/lemul/share/misc/committers-doc.dot
  user/dchagin/lemul/share/mk/bsd.sys.mk
  user/dchagin/lemul/sys/amd64/amd64/ptrace_machdep.c
  user/dchagin/lemul/sys/arm/arm/db_trace.c
  user/dchagin/lemul/sys/arm/arm/unwind.c
  user/dchagin/lemul/sys/arm/include/atomic.h
  user/dchagin/lemul/sys/arm/include/stack.h
  user/dchagin/lemul/sys/boot/efi/include/amd64/efibind.h
  user/dchagin/lemul/sys/boot/efi/include/efidef.h
  user/dchagin/lemul/sys/boot/efi/include/i386/efibind.h
  user/dchagin/lemul/sys/cddl/dev/dtrace/arm/dtrace_isa.c
  user/dchagin/lemul/sys/conf/NOTES
  user/dchagin/lemul/sys/conf/files
  user/dchagin/lemul/sys/conf/files.arm
  user/dchagin/lemul/sys/conf/kmod.mk
  user/dchagin/lemul/sys/contrib/dev/acpica/changes.txt   (contents, props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/common/acgetline.c
  user/dchagin/lemul/sys/contrib/dev/acpica/common/adfile.c
  user/dchagin/lemul/sys/contrib/dev/acpica/common/adisasm.c
  user/dchagin/lemul/sys/contrib/dev/acpica/common/adwalk.c
  user/dchagin/lemul/sys/contrib/dev/acpica/common/ahids.c
  user/dchagin/lemul/sys/contrib/dev/acpica/common/ahpredef.c
  user/dchagin/lemul/sys/contrib/dev/acpica/common/ahuuids.c
  user/dchagin/lemul/sys/contrib/dev/acpica/common/cmfsize.c
  user/dchagin/lemul/sys/contrib/dev/acpica/common/dmextern.c
  user/dchagin/lemul/sys/contrib/dev/acpica/common/dmrestag.c
  user/dchagin/lemul/sys/contrib/dev/acpica/common/dmtable.c
  user/dchagin/lemul/sys/contrib/dev/acpica/common/dmtbdump.c
  user/dchagin/lemul/sys/contrib/dev/acpica/common/dmtbinfo.c
  user/dchagin/lemul/sys/contrib/dev/acpica/common/getopt.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslanalyze.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslascii.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslbtypes.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslcodegen.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslcompile.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslcompiler.h
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslcompiler.l
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/asldefine.h
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslerror.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslfileio.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslfiles.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslfold.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslglobal.h
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslhex.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/asllength.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/asllisting.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/asllistsup.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslload.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/asllookup.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslmain.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslmap.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslmapenter.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslmapoutput.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslmaputils.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslmessages.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslmessages.h
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslmethod.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslnamesp.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/asloffset.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslopcodes.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/asloperands.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslopt.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/asloptions.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslparser.y
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslpredef.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslprepkg.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslresource.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslrestype1.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslrestype1i.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslrestype2.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslrestype2d.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslrestype2e.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslrestype2q.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslrestype2s.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslrestype2w.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslrules.y
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslstartup.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslstubs.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslsupport.l
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslsupport.y
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/asltokens.y
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/asltransform.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/asltree.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/asltypes.h
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/asltypes.y
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslutils.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/asluuid.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslwalks.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/aslxref.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/dtcompile.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/dtcompiler.h
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/dtexpress.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/dtfield.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/dtio.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/dtparser.l
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/dtparser.y
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/dtsubtable.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/dttable.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/dttemplate.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/dttemplate.h
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/dtutils.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/preprocess.h
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/prexpress.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/prmacros.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/prparser.l
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/prparser.y
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/prscan.c
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/prutils.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/debugger/dbcmds.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/debugger/dbconvert.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/debugger/dbdisply.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/debugger/dbexec.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/debugger/dbfileio.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/debugger/dbhistry.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/debugger/dbinput.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/debugger/dbmethod.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/debugger/dbnames.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/debugger/dbstats.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/debugger/dbtest.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/debugger/dbutils.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/debugger/dbxface.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/disassembler/dmnames.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/disassembler/dmobject.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/disassembler/dmutils.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/dispatcher/dsargs.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/dispatcher/dsinit.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/dispatcher/dswload.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/dispatcher/dswscope.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/dispatcher/dswstate.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/evevent.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/evglock.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/evgpe.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/evgpeblk.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/evgpeinit.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/evgpeutil.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/evhandler.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/evmisc.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/evregion.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/evrgnini.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/evsci.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/evxface.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/evxfevnt.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/evxfgpe.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/evxfregn.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exconfig.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exconvrt.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/excreate.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exdebug.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exdump.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exfield.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exfldio.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exmisc.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exmutex.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exnames.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exoparg1.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exoparg2.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exoparg3.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exoparg6.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exprep.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exregion.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exresnte.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exresolv.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exresop.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exstore.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exstoren.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exstorob.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exsystem.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/exutils.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/hardware/hwacpi.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/hardware/hwesleep.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/hardware/hwgpe.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/hardware/hwpci.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/hardware/hwregs.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/hardware/hwsleep.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/hardware/hwtimer.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/hardware/hwvalid.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/hardware/hwxface.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsaccess.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsalloc.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsarguments.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsconvert.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsdump.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nseval.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsinit.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsload.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsnames.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsobject.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsparse.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nspredef.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsrepair.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nssearch.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsutils.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nswalk.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsxfname.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/nsxfobj.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/parser/psargs.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/parser/psloop.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/parser/psobject.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/parser/psopcode.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/parser/psopinfo.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/parser/psparse.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/parser/psscope.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/parser/pstree.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/parser/psutils.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/parser/pswalk.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/parser/psxface.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/resources/rsaddr.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/resources/rscalc.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/resources/rscreate.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/resources/rsdump.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/resources/rsinfo.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/resources/rsio.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/resources/rsirq.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/resources/rslist.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/resources/rsmemory.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/resources/rsmisc.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/resources/rsserial.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/resources/rsutils.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/resources/rsxface.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/tables/tbdata.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/tables/tbfadt.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/tables/tbfind.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/tables/tbinstal.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/tables/tbprint.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/tables/tbutils.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/tables/tbxface.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/tables/tbxfload.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/tables/tbxfroot.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utaddress.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utalloc.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utbuffer.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utcache.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utcopy.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utdebug.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utdecode.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utdelete.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/uterror.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/uteval.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utexcep.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utfileio.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utglobal.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/uthex.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utids.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utinit.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utlock.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utmath.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utmisc.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utmutex.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utobject.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utosi.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utownerid.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utpredef.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utprint.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utresrc.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utstate.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utstring.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/uttrack.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utuuid.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utxface.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utxferror.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utxfinit.c
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/utxfmutex.c
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acapps.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acbuffer.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/accommon.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acconfig.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acdebug.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acdisasm.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acdispat.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acevents.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acexcep.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acglobal.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/achware.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acinterp.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/aclocal.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acmacros.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acnames.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acnamesp.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acobject.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acopcode.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acoutput.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acparser.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acpi.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acpiosxf.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acpixf.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acpredef.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acresrc.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acrestyp.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acstruct.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/actables.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/actbl.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/actbl1.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/actbl2.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/actbl3.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/actypes.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/acutils.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/amlcode.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/amlresrc.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/platform/acenv.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/platform/acenvex.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/platform/acfreebsd.h
  user/dchagin/lemul/sys/contrib/dev/acpica/include/platform/acgcc.h
  user/dchagin/lemul/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c
  user/dchagin/lemul/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
  user/dchagin/lemul/sys/dev/cxgb/cxgb_adapter.h
  user/dchagin/lemul/sys/dev/cxgb/cxgb_sge.c
  user/dchagin/lemul/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  user/dchagin/lemul/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h
  user/dchagin/lemul/sys/dev/cxgbe/t4_sge.c
  user/dchagin/lemul/sys/dev/ixl/i40e_adminq.c
  user/dchagin/lemul/sys/dev/ixl/i40e_adminq_cmd.h
  user/dchagin/lemul/sys/dev/ixl/i40e_common.c
  user/dchagin/lemul/sys/dev/ixl/i40e_lan_hmc.c
  user/dchagin/lemul/sys/dev/ixl/i40e_prototype.h
  user/dchagin/lemul/sys/dev/ixl/i40e_type.h
  user/dchagin/lemul/sys/dev/ixl/if_ixl.c
  user/dchagin/lemul/sys/dev/ixl/if_ixlv.c
  user/dchagin/lemul/sys/dev/ixl/ixl.h
  user/dchagin/lemul/sys/dev/ixl/ixl_pf.h
  user/dchagin/lemul/sys/dev/ixl/ixl_txrx.c
  user/dchagin/lemul/sys/dev/ixl/ixlvc.c
  user/dchagin/lemul/sys/dev/ofw/ofw_cpu.c
  user/dchagin/lemul/sys/dev/sfxge/common/efsys.h
  user/dchagin/lemul/sys/dev/sfxge/common/efx.h
  user/dchagin/lemul/sys/dev/sfxge/common/efx_ev.c
  user/dchagin/lemul/sys/dev/sfxge/common/efx_filter.c
  user/dchagin/lemul/sys/dev/sfxge/common/efx_impl.h
  user/dchagin/lemul/sys/dev/sfxge/common/efx_mcdi.c
  user/dchagin/lemul/sys/dev/sfxge/common/efx_mcdi.h
  user/dchagin/lemul/sys/dev/sfxge/common/efx_mon.c
  user/dchagin/lemul/sys/dev/sfxge/common/efx_nic.c
  user/dchagin/lemul/sys/dev/sfxge/common/efx_phy.c
  user/dchagin/lemul/sys/dev/sfxge/common/efx_regs_ef10.h
  user/dchagin/lemul/sys/dev/sfxge/common/efx_regs_mcdi.h
  user/dchagin/lemul/sys/dev/sfxge/common/efx_tx.c
  user/dchagin/lemul/sys/dev/sfxge/common/siena_mac.c
  user/dchagin/lemul/sys/dev/sfxge/common/siena_mon.c
  user/dchagin/lemul/sys/dev/sfxge/common/siena_nic.c
  user/dchagin/lemul/sys/dev/sfxge/common/siena_nvram.c
  user/dchagin/lemul/sys/dev/sfxge/common/siena_sram.c
  user/dchagin/lemul/sys/dev/sfxge/sfxge_rx.c
  user/dchagin/lemul/sys/dev/sfxge/sfxge_tx.c
  user/dchagin/lemul/sys/dev/sfxge/sfxge_tx.h
  user/dchagin/lemul/sys/dev/xen/netfront/netfront.c
  user/dchagin/lemul/sys/i386/i386/ptrace_machdep.c
  user/dchagin/lemul/sys/kern/kern_ctf.c
  user/dchagin/lemul/sys/kern/link_elf.c
  user/dchagin/lemul/sys/net/if_var.h
  user/dchagin/lemul/sys/net/if_vlan.c
  user/dchagin/lemul/sys/netinet/igmp.c
  user/dchagin/lemul/sys/netinet/igmp_var.h
  user/dchagin/lemul/sys/netinet/in_mcast.c
  user/dchagin/lemul/sys/netinet/in_var.h
  user/dchagin/lemul/sys/netinet6/in6_mcast.c
  user/dchagin/lemul/sys/netinet6/in6_var.h
  user/dchagin/lemul/sys/netinet6/mld6.c
  user/dchagin/lemul/sys/netinet6/mld6_var.h
  user/dchagin/lemul/sys/ofed/drivers/infiniband/core/cma.c
  user/dchagin/lemul/sys/powerpc/powermac/powermac_thermal.c
  user/dchagin/lemul/sys/powerpc/ps3/ps3_syscons.c
  user/dchagin/lemul/sys/sys/cpu.h
  user/dchagin/lemul/sys/sys/mbuf.h
  user/dchagin/lemul/sys/x86/acpica/acpi_wakeup.c
  user/dchagin/lemul/sys/x86/iommu/busdma_dmar.c
  user/dchagin/lemul/usr.bin/mkimg/Makefile
  user/dchagin/lemul/usr.bin/mkimg/mkimg.1
  user/dchagin/lemul/usr.bin/mkimg/mkimg.c
  user/dchagin/lemul/usr.bin/mkimg/scheme.c
  user/dchagin/lemul/usr.bin/netstat/Makefile
  user/dchagin/lemul/usr.bin/netstat/bpf.c
  user/dchagin/lemul/usr.bin/netstat/flowtable.c
  user/dchagin/lemul/usr.bin/netstat/if.c
  user/dchagin/lemul/usr.bin/netstat/inet.c
  user/dchagin/lemul/usr.bin/netstat/inet6.c
  user/dchagin/lemul/usr.bin/netstat/ipsec.c
  user/dchagin/lemul/usr.bin/netstat/main.c
  user/dchagin/lemul/usr.bin/netstat/mbuf.c
  user/dchagin/lemul/usr.bin/netstat/mroute.c
  user/dchagin/lemul/usr.bin/netstat/mroute6.c
  user/dchagin/lemul/usr.bin/netstat/netgraph.c
  user/dchagin/lemul/usr.bin/netstat/netisr.c
  user/dchagin/lemul/usr.bin/netstat/netstat.1
  user/dchagin/lemul/usr.bin/netstat/netstat.h
  user/dchagin/lemul/usr.bin/netstat/pfkey.c
  user/dchagin/lemul/usr.bin/netstat/route.c
  user/dchagin/lemul/usr.bin/netstat/sctp.c
  user/dchagin/lemul/usr.bin/netstat/unix.c
  user/dchagin/lemul/usr.sbin/acpi/acpidb/Makefile
  user/dchagin/lemul/usr.sbin/acpi/acpidb/acpidb.c
  user/dchagin/lemul/usr.sbin/acpi/iasl/Makefile
  user/dchagin/lemul/usr.sbin/ifmcstat/Makefile
  user/dchagin/lemul/usr.sbin/ifmcstat/ifmcstat.c
  user/dchagin/lemul/usr.sbin/jls/jls.8
  user/dchagin/lemul/usr.sbin/jls/jls.c
  user/dchagin/lemul/usr.sbin/syslogd/syslogd.c
Directory Properties:
  user/dchagin/lemul/   (props changed)
  user/dchagin/lemul/contrib/ipfilter/   (props changed)
  user/dchagin/lemul/etc/   (props changed)
  user/dchagin/lemul/lib/libc/   (props changed)
  user/dchagin/lemul/share/   (props changed)
  user/dchagin/lemul/share/man/man4/   (props changed)
  user/dchagin/lemul/sys/   (props changed)
  user/dchagin/lemul/sys/boot/   (props changed)
  user/dchagin/lemul/sys/conf/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/common/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/compiler/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/components/debugger/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/components/disassembler/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/components/dispatcher/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/components/events/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/components/executer/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/components/hardware/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/components/namespace/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/components/parser/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/components/resources/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/components/tables/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/components/utilities/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/include/   (props changed)
  user/dchagin/lemul/sys/contrib/dev/acpica/os_specific/   (props changed)
  user/dchagin/lemul/usr.bin/mkimg/   (props changed)

Modified: user/dchagin/lemul/Makefile.inc1
==============================================================================
--- user/dchagin/lemul/Makefile.inc1	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/Makefile.inc1	Sun Feb 22 08:25:08 2015	(r279149)
@@ -1247,11 +1247,6 @@ _m4=		lib/libohash \
 		usr.bin/m4
 .endif
 
-.if ${BOOTSTRAPPING} < 1000013
-_yacc=		lib/liby \
-		usr.bin/yacc
-.endif
-
 .if ${BOOTSTRAPPING} < 1000014
 _crunch=	usr.sbin/crunch
 .endif
@@ -1273,6 +1268,11 @@ _lex=		usr.bin/lex
 _awk=		usr.bin/awk
 .endif
 
+.if ${BOOTSTRAPPING} < 1001506
+_yacc=		lib/liby \
+		usr.bin/yacc
+.endif
+
 .if ${MK_BSNMP} != "no"
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif

Modified: user/dchagin/lemul/UPDATING
==============================================================================
--- user/dchagin/lemul/UPDATING	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/UPDATING	Sun Feb 22 08:25:08 2015	(r279149)
@@ -36,8 +36,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	but before r278950, the RNG was not seeded properly.  Immediately
 	upgrade the kernel to r278950 or later and regenerate any keys (e.g.
 	ssh keys or openssl keys) that were generated w/ a kernel from that
-	range.  This does not effect programs that directly used /dev/random
-	or /dev/urandom.  All userland uses of arc4random(3) are effected.
+	range.  This does not affect programs that directly used /dev/random
+	or /dev/urandom.  All userland uses of arc4random(3) are affected.
 
 20150210:
 	The autofs(4) ABI was changed in order to restore binary compatibility

Modified: user/dchagin/lemul/bin/pkill/tests/pgrep-j_test.sh
==============================================================================
--- user/dchagin/lemul/bin/pkill/tests/pgrep-j_test.sh	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/bin/pkill/tests/pgrep-j_test.sh	Sun Feb 22 08:25:08 2015	(r279149)
@@ -4,7 +4,7 @@
 jail_name_to_jid()
 {
 	local check_name="$1"
-	jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g'
+	jls -j "$check_name" -s | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g'
 }
 
 base=pgrep_j_test
@@ -38,6 +38,7 @@ for i in `seq 1 10`; do
 	esac
 	sleep 0.1
 done
+sleep 0.5
 
 pid1="$(pgrep -f -x -j "$jid" "$sleep $sleep_amount" | sort)"
 pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \

Modified: user/dchagin/lemul/bin/pkill/tests/pkill-j_test.sh
==============================================================================
--- user/dchagin/lemul/bin/pkill/tests/pkill-j_test.sh	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/bin/pkill/tests/pkill-j_test.sh	Sun Feb 22 08:25:08 2015	(r279149)
@@ -4,7 +4,7 @@
 jail_name_to_jid()
 {
 	local check_name="$1"
-	jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g'
+	jls -j "$check_name" -s | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g'
 }
 
 base=pkill_j_test
@@ -40,6 +40,7 @@ for i in `seq 1 10`; do
 	esac
 	sleep 0.1
 done
+sleep 0.5
 
 if pkill -f -j "$jid" $sleep && sleep 0.5 &&
     ! -f ${PWD}/${base}_1_1.pid &&

Modified: user/dchagin/lemul/contrib/ipfilter/ip_fil.c
==============================================================================
--- user/dchagin/lemul/contrib/ipfilter/ip_fil.c	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/contrib/ipfilter/ip_fil.c	Sun Feb 22 08:25:08 2015	(r279149)
@@ -44,6 +44,9 @@ static int	write_output __P((struct ifne
 # endif
 #endif
 
+struct ifaddr {
+	struct sockaddr_storage ifa_addr;
+};
 
 int
 ipfattach(softc)

Modified: user/dchagin/lemul/contrib/ipfilter/ipf.h
==============================================================================
--- user/dchagin/lemul/contrib/ipfilter/ipf.h	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/contrib/ipfilter/ipf.h	Sun Feb 22 08:25:08 2015	(r279149)
@@ -43,9 +43,6 @@ struct file;
 #include <sys/socket.h>
 #include <net/if.h>
 
-#define	_WANT_IFADDR
-#include <net/if_var.h>
-
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>

Modified: user/dchagin/lemul/etc/netstart
==============================================================================
--- user/dchagin/lemul/etc/netstart	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/etc/netstart	Sun Feb 22 08:25:08 2015	(r279149)
@@ -57,7 +57,6 @@ _start=quietstart
 /etc/rc.d/routing ${_start}
 /etc/rc.d/mroute6d ${_start}
 /etc/rc.d/route6d ${_start}
-/etc/rc.d/mrouted ${_start}
 /etc/rc.d/routed ${_start}
 /etc/rc.d/rtsold ${_start}
 /etc/rc.d/nisdomain ${_start}

Modified: user/dchagin/lemul/lib/libc/db/man/dbm.3
==============================================================================
--- user/dchagin/lemul/lib/libc/db/man/dbm.3	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/lib/libc/db/man/dbm.3	Sun Feb 22 08:25:08 2015	(r279149)
@@ -15,7 +15,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 16, 2006
+.Dd February 19, 2015
 .Dt DBM 3
 .Os
 .Sh NAME
@@ -174,9 +174,7 @@ deletes the entry for
 The
 .Fn dbm_delete
 function
-normally returns zero but returns 1 if there was no entry with
-.Fa key
-in the database or returns -1 and sets
+normally returns zero or returns -1 and sets
 .Va errno
 if there were any errors.
 .Pp

Modified: user/dchagin/lemul/lib/libc/gen/getgrent.c
==============================================================================
--- user/dchagin/lemul/lib/libc/gen/getgrent.c	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/lib/libc/gen/getgrent.c	Sun Feb 22 08:25:08 2015	(r279149)
@@ -1173,8 +1173,10 @@ nis_group(void *retval, void *mdata, va_
 		 * terminator, alignment padding, and one (char *)
 		 * pointer for the member list terminator.
 		 */
-		if (resultlen >= bufsize - _ALIGNBYTES - sizeof(char *))
+		if (resultlen >= bufsize - _ALIGNBYTES - sizeof(char *)) {
+			free(result);
 			goto erange;
+		}
 		memcpy(buffer, result, resultlen);
 		buffer[resultlen] = '\0';
 		free(result);

Modified: user/dchagin/lemul/lib/libc/gen/getpwent.c
==============================================================================
--- user/dchagin/lemul/lib/libc/gen/getpwent.c	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/lib/libc/gen/getpwent.c	Sun Feb 22 08:25:08 2015	(r279149)
@@ -1392,8 +1392,10 @@ nis_passwd(void *retval, void *mdata, va
 				continue;
 			}
 		}
-		if (resultlen >= bufsize)
+		if (resultlen >= bufsize) {
+			free(result);
 			goto erange;
+		}
 		memcpy(buffer, result, resultlen);
 		buffer[resultlen] = '\0';
 		free(result);

Modified: user/dchagin/lemul/lib/libc/gen/setmode.c
==============================================================================
--- user/dchagin/lemul/lib/libc/gen/setmode.c	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/lib/libc/gen/setmode.c	Sun Feb 22 08:25:08 2015	(r279149)
@@ -186,10 +186,10 @@ setmode(const char *p)
 	 * as best we can.
 	 */
 	sigfillset(&sigset);
-        (void)_sigprocmask(SIG_BLOCK, &sigset, &sigoset);
+	(void)_sigprocmask(SIG_BLOCK, &sigset, &sigoset);
 	(void)umask(mask = umask(0));
 	mask = ~mask;
-        (void)_sigprocmask(SIG_SETMASK, &sigoset, NULL);
+	(void)_sigprocmask(SIG_SETMASK, &sigoset, NULL);
 
 	setlen = SET_LEN + 2;
 

Modified: user/dchagin/lemul/lib/libc/regex/engine.c
==============================================================================
--- user/dchagin/lemul/lib/libc/regex/engine.c	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/lib/libc/regex/engine.c	Sun Feb 22 08:25:08 2015	(r279149)
@@ -157,7 +157,7 @@ matcher(struct re_guts *g,
 	int i;
 	struct match mv;
 	struct match *m = &mv;
-	const char *dp;
+	const char *dp = NULL;
 	const sopno gf = g->firststate+1;	/* +1 for OEND */
 	const sopno gl = g->laststate;
 	const char *start;
@@ -244,7 +244,7 @@ matcher(struct re_guts *g,
 	ZAPSTATE(&m->mbs);
 
 	/* Adjust start according to moffset, to speed things up */
-	if (g->moffset > -1)
+	if (dp != NULL && g->moffset > -1)
 		start = ((dp - g->moffset) < start) ? start : dp - g->moffset;
 
 	SP("mloop", m->st, *start);

Modified: user/dchagin/lemul/lib/libc/regex/regcomp.c
==============================================================================
--- user/dchagin/lemul/lib/libc/regex/regcomp.c	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/lib/libc/regex/regcomp.c	Sun Feb 22 08:25:08 2015	(r279149)
@@ -1422,8 +1422,8 @@ static void
 findmust(struct parse *p, struct re_guts *g)
 {
 	sop *scan;
-	sop *start;
-	sop *newstart;
+	sop *start = NULL;
+	sop *newstart = NULL;
 	sopno newlen;
 	sop s;
 	char *cp;

Modified: user/dchagin/lemul/lib/libc/sys/mmap.2
==============================================================================
--- user/dchagin/lemul/lib/libc/sys/mmap.2	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/lib/libc/sys/mmap.2	Sun Feb 22 08:25:08 2015	(r279149)
@@ -28,7 +28,7 @@
 .\"	@(#)mmap.2	8.4 (Berkeley) 5/11/95
 .\" $FreeBSD$
 .\"
-.Dd September 17, 2014
+.Dd February 18, 2015
 .Dt MMAP 2
 .Os
 .Sh NAME
@@ -160,7 +160,7 @@ is specified,
 must be a multiple of the pagesize.
 If
 .Dv MAP_EXCL
-is not specified, a successfull
+is not specified, a successful
 .Dv MAP_FIXED
 request replaces any previous mappings for the process'
 pages in the range from
@@ -225,7 +225,7 @@ it.
 You can test file fragmentation by observing the KB/t (kilobytes per
 transfer) results from an
 .Dq Li iostat 1
-while reading a large file sequentially, e.g.\& using
+while reading a large file sequentially, e.g.,\& using
 .Dq Li dd if=filename of=/dev/null bs=32k .
 .Pp
 The
@@ -448,17 +448,3 @@ was specified and insufficient memory wa
 .Xr munmap 2 ,
 .Xr getpagesize 3 ,
 .Xr getpagesizes 3
-.Sh BUGS
-The
-.Fa len
-argument
-is limited to the maximum file size or available userland address
-space.
-Files may not be able to be made more than 1TB large on 32 bit systems
-due to file systems restrictions and bugs, but address space is far more
-restrictive.
-Larger files may be possible on 64 bit systems.
-.Pp
-The previous documented limit of 2GB was a documentation bug.
-That limit has not existed since
-.Fx 2.2 .

Modified: user/dchagin/lemul/lib/msun/src/e_j0.c
==============================================================================
--- user/dchagin/lemul/lib/msun/src/e_j0.c	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/lib/msun/src/e_j0.c	Sun Feb 22 08:25:08 2015	(r279149)
@@ -278,7 +278,7 @@ static const double pS2[5] = {
 	if(ix>=0x40200000)     {p = pR8; q= pS8;}
 	else if(ix>=0x40122E8B){p = pR5; q= pS5;}
 	else if(ix>=0x4006DB6D){p = pR3; q= pS3;}
-	else if(ix>=0x40000000){p = pR2; q= pS2;}
+	else                   {p = pR2; q= pS2;}	/* ix>=0x40000000 */
 	z = one/(x*x);
 	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
 	s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*q[4]))));

Modified: user/dchagin/lemul/lib/msun/src/e_j0f.c
==============================================================================
--- user/dchagin/lemul/lib/msun/src/e_j0f.c	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/lib/msun/src/e_j0f.c	Sun Feb 22 08:25:08 2015	(r279149)
@@ -234,7 +234,7 @@ static const float pS2[5] = {
 	if(ix>=0x41000000)     {p = pR8; q= pS8;}
 	else if(ix>=0x40f71c58){p = pR5; q= pS5;}
 	else if(ix>=0x4036db68){p = pR3; q= pS3;}
-	else if(ix>=0x40000000){p = pR2; q= pS2;}
+	else                   {p = pR2; q= pS2;}	/* ix>=0x40000000 */
 	z = one/(x*x);
 	r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
 	s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*q[4]))));

Modified: user/dchagin/lemul/lib/msun/src/e_j1.c
==============================================================================
--- user/dchagin/lemul/lib/msun/src/e_j1.c	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/lib/msun/src/e_j1.c	Sun Feb 22 08:25:08 2015	(r279149)
@@ -272,7 +272,7 @@ static const double ps2[5] = {
         if(ix>=0x40200000)     {p = pr8; q= ps8;}
         else if(ix>=0x40122E8B){p = pr5; q= ps5;}
         else if(ix>=0x4006DB6D){p = pr3; q= ps3;}
-        else if(ix>=0x40000000){p = pr2; q= ps2;}
+	else                   {p = pr2; q= ps2;}	/* ix>=0x40000000 */
         z = one/(x*x);
         r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
         s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*q[4]))));

Modified: user/dchagin/lemul/lib/msun/src/e_j1f.c
==============================================================================
--- user/dchagin/lemul/lib/msun/src/e_j1f.c	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/lib/msun/src/e_j1f.c	Sun Feb 22 08:25:08 2015	(r279149)
@@ -229,7 +229,7 @@ static const float ps2[5] = {
         if(ix>=0x41000000)     {p = pr8; q= ps8;}
         else if(ix>=0x40f71c58){p = pr5; q= ps5;}
         else if(ix>=0x4036db68){p = pr3; q= ps3;}
-        else if(ix>=0x40000000){p = pr2; q= ps2;}
+	else                   {p = pr2; q= ps2;}	/* ix>=0x40000000 */
         z = one/(x*x);
         r = p[0]+z*(p[1]+z*(p[2]+z*(p[3]+z*(p[4]+z*p[5]))));
         s = one+z*(q[0]+z*(q[1]+z*(q[2]+z*(q[3]+z*q[4]))));

Modified: user/dchagin/lemul/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- user/dchagin/lemul/release/doc/en_US.ISO8859-1/relnotes/article.xml	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/release/doc/en_US.ISO8859-1/relnotes/article.xml	Sun Feb 22 08:25:08 2015	(r279149)
@@ -22,7 +22,7 @@
 
     <pubdate>$FreeBSD$</pubdate>
 
-    <!-- Last rev: 277458 -->
+    <!-- Last rev: 278934 -->
 
     <copyright>
       <year>2015</year>
@@ -302,6 +302,13 @@
       <para revision="277166" arch="powerpc">The &man.ptrace.2; system
 	call has been updated include support for Altivec registers on
 	&os;/&arch.powerpc;.</para>
+
+      <para revision="278320">A new device control utility,
+	&man.devctl.8; has been added, which allows making
+	administrative changes to individual devices, such as
+	attaching and detaching drivers, and enabling and disabling
+	devices.  The &man.devctl.8; utility uses the new
+	&man.devctl.3; library.</para>
     </sect2>
 
     <sect2 xml:id="userland-contrib">
@@ -375,6 +382,12 @@
 
       <para revision="277270"><application>OpenSSL</application> has
 	been updated to version 1.0.1l.</para>
+
+      <para revision="278433">The &man.xz.1; utility has been udpated
+	to version 5.2.0.</para>
+
+      <para revision="278433">The &man.xz.1; utility has been updated
+	to support multi-threaded compression.</para>
     </sect2>
 
     <sect2 xml:id="userland-installer">
@@ -460,6 +473,16 @@
       <para revision="274987">The &man.gpio.3; library has been added,
 	providing a wrapper around the &man.gpio.4; kernel
 	interface.</para>
+
+      <para revision="277610">The <literal>futimens()</literal> and
+	<literal>utimensat()</literal> system calls have been
+	added.  See &man.utimensat.2; for more information.</para>
+
+      <para revision="278934">The &man.elf.3; compile-time dependency
+	has been removed from <filename>dtri.o</filename>, which
+	allows adding <application>DTrace</application> probes to
+	userland applications and libraries without also linking
+	against &man.elf.3;.</para>
     </sect2>
 
     <sect2 xml:id="userland-abi">
@@ -515,12 +538,32 @@
 	at the &man.loader.8; prompt during boot, or add
 	<literal>kern.vty=vt</literal> to &man.loader.conf.5; and
 	reboot the system.</para>
+
+      <para revision="277904">The &man.config.8; utility has been
+	updated to allow using a non-standard <filename
+	  class="directory">src/</filename> tree, specified as an
+	argument to the <literal>-s</literal> flag.</para>
+
+      <para revision="277990" arch="powerpc64">The
+	&os;/&arch.powerpc64; kernel now builds as
+	a position-independent executable, allowing the kernel to be
+	loaded into and run from any physical or virtual
+	address.</para>
+
+      <important>
+	<para>This change requires an update to &man.loader.8;.
+	  The userland and kernel must be updated before rebooting the
+	  system.</para>
+      </important>
     </sect2>
 
     <sect2 xml:id="kernel-sysctl">
       <title>System Tuning and Controls</title>
 
-      <para> </para>
+      <para revision="275140" contrib="sponsor" sponsor="&ff;">The
+	&man.hwpmc.4; default and maximum callchain depths have been
+	increased.  The default has been increased from 16 to 32, and
+	the maximum increased from 32 to 128.</para>
     </sect2>
   </sect1>
 
@@ -761,6 +804,18 @@
     <para>This section covers changes and additions to file systems
       and other storage subsystems, both local and networked.</para>
 
+    <sect2 xml:id="storage-general">
+      <title>General Storage</title>
+      <para revision="278037" contrib="sponsor" sponsor="&ix;">The
+	&man.ctl.4; <acronym>LUN</acronym> mapping has been rewritten,
+	replacing <acronym>iSCSI</acronym>-specific mapping mechanisms
+	with a new mechanism that works for any port.</para>
+
+      <para revision="278354" contrib="sponsor" sponsor="&ix;">The
+	&man.ctld.8; utility has been updated to allow controlling
+	non-<acronym>iSCSI</acronym> &man.ctl.4; ports.</para>
+    </sect2>
+
     <sect2 xml:id="storage-net">
       <title>Networked Storage</title>
 
@@ -962,6 +1017,11 @@
 	Release Engineering build tools have been updated to include
 	support for producing virtual machine disk images for various
 	cloud hosting providers.</para>
+
+      <para revision="278926">The Release Engineering build tools have
+	been updated to use multi-threaded &man.xz.1;.  By default,
+	the number of &man.xz.1; threads is set to the number of cores
+	available.</para>
     </sect2>
   </sect1>
 </article>

Modified: user/dchagin/lemul/release/release.conf.sample
==============================================================================
--- user/dchagin/lemul/release/release.conf.sample	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/release/release.conf.sample	Sun Feb 22 08:25:08 2015	(r279149)
@@ -53,6 +53,9 @@ PORTBRANCH="ports/head at rHEAD"
 #WITH_DVD=
 #WITH_COMPRESSED_IMAGES=
 
+## Set to '1' to disable multi-threaded xz(1) compression.
+#XZ_THREADS=0
+
 ## Set when building embedded images.
 #EMBEDDEDBUILD=
 

Modified: user/dchagin/lemul/release/release.sh
==============================================================================
--- user/dchagin/lemul/release/release.sh	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/release/release.sh	Sun Feb 22 08:25:08 2015	(r279149)
@@ -93,6 +93,7 @@ WITH_COMPRESSED_IMAGES=
 # the release.
 WITH_VMIMAGES=
 WITH_COMPRESSED_VMIMAGES=
+XZ_THREADS=0
 
 # Set to non-empty value to build virtual machine images for various
 # cloud providers as part of the release.
@@ -179,7 +180,7 @@ RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORL
 RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}"
 RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=\"${KERNEL}\" ${CONF_FILES} \
 	${DOCPORTS} WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \
-	WITH_CLOUDWARE=${WITH_CLOUDWARE}"
+	WITH_CLOUDWARE=${WITH_CLOUDWARE} XZ_THREADS=${XZ_THREADS}"
 
 # Force src checkout if configured
 FORCE_SRC_KEY=

Modified: user/dchagin/lemul/share/man/man4/Makefile
==============================================================================
--- user/dchagin/lemul/share/man/man4/Makefile	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/share/man/man4/Makefile	Sun Feb 22 08:25:08 2015	(r279149)
@@ -573,7 +573,9 @@ MLINKS+=cdce.4 if_cdce.4
 MLINKS+=crypto.4 cryptodev.4
 MLINKS+=cue.4 if_cue.4
 MLINKS+=cxgb.4 if_cxgb.4
-MLINKS+=cxgbe.4 if_cxgbe.4
+MLINKS+=cxgbe.4 if_cxgbe.4 \
+	cxgbe.4 cxl.4 \
+	cxgbe.4 if_cxl.4
 MLINKS+=dc.4 if_dc.4
 MLINKS+=de.4 if_de.4
 MLINKS+=disc.4 if_disc.4

Modified: user/dchagin/lemul/share/man/man4/man4.arm/devcfg.4
==============================================================================
--- user/dchagin/lemul/share/man/man4/man4.arm/devcfg.4	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/share/man/man4/man4.arm/devcfg.4	Sun Feb 22 08:25:08 2015	(r279149)
@@ -92,4 +92,4 @@ driver.
 .Sh SEE ALSO
 Zynq-7000 SoC Technical Reference Manual (Xilinx doc UG585)
 .Sh AUTHORS
-Thomas Skibo
+.An Thomas Skibo

Modified: user/dchagin/lemul/share/man/man4/man4.i386/apm.4
==============================================================================
--- user/dchagin/lemul/share/man/man4/man4.i386/apm.4	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/share/man/man4/man4.i386/apm.4	Sun Feb 22 08:25:08 2015	(r279149)
@@ -121,7 +121,7 @@ polls APM events and handles the followi
 .Xr apm 8 ,
 .Xr zzz 8
 .Sh AUTHORS
-Tatsumi Hosokawa <hosokawa at jp.FreeBSD.org>
+.An Tatsumi Hosokawa Aq Mt hosokawa at jp.FreeBSD.org
 .Sh BUGS
 WARNING!
 Many, if not most, of the implementations of APM-bios in laptops

Modified: user/dchagin/lemul/share/man/man4/man4.powerpc/Makefile
==============================================================================
--- user/dchagin/lemul/share/man/man4/man4.powerpc/Makefile	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/share/man/man4/man4.powerpc/Makefile	Sun Feb 22 08:25:08 2015	(r279149)
@@ -6,6 +6,7 @@ MAN=	adb.4 \
 	ams.4 \
 	bm.4 \
 	cuda.4 \
+	llan.4 \
 	pmu.4 \
 	powermac_nvram.4 \
 	smu.4 \

Copied: user/dchagin/lemul/share/man/man4/man4.powerpc/llan.4 (from r279148, head/share/man/man4/man4.powerpc/llan.4)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/dchagin/lemul/share/man/man4/man4.powerpc/llan.4	Sun Feb 22 08:25:08 2015	(r279149, copy of r279148, head/share/man/man4/man4.powerpc/llan.4)
@@ -0,0 +1,61 @@
+.\"-
+.\" Copyright (c) 2015 Nathan Whitehorn <nwhitehorn at FreeBSD.org>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+.\" DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd February 19, 2015
+.Dt LLAN 4
+.Os
+.Sh NAME
+.Nm llan
+.Nd POWER Logical Lan
+.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following lines in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device llan"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for the inter-partition logical LAN controller
+provided by PAPR-compliant POWER hypervisors (such as PowerVM and PowerKVM).
+On some firmwares, advanced offload features are supported by the hypervisor,
+but these are not currently supported by the driver.
+.Sh SEE ALSO
+.Xr vtnet 4 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver appeared in
+.Fx 10.0.
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Nathan Whitehorn Aq Mt nwhitehorn at FreeBSD.org .

Modified: user/dchagin/lemul/share/man/man4/man4.powerpc/tsec.4
==============================================================================
--- user/dchagin/lemul/share/man/man4/man4.powerpc/tsec.4	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/share/man/man4/man4.powerpc/tsec.4	Sun Feb 22 08:25:08 2015	(r279149)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 22, 2009
+.Dd February 20, 2015
 .Dt TSEC 4
 .Os
 .Sh NAME
@@ -91,18 +91,23 @@ The
 driver supports interrupts coalescing (IC) so that raising a transmit/receive
 frame interrupt is delayed, if possible, until a threshold-defined period of
 time has elapsed, or a threshold-defined frame counter has been reached
-(whichever occurs first). The following sysctls regulate this behaviour:
+(whichever occurs first).
+The following sysctls regulate this behaviour:
 .Bl -tag -width indent
 .It Va dev.tsec.X.int_coal.rx_time
 .It Va dev.tsec.X.int_coal.rx_count
 .It Va dev.tsec.X.int_coal.tx_time
 .It Va dev.tsec.X.int_coal.tx_count
 .Pp
-Value of 0 for either time or count disables IC on the given path. Time value
+Value of 0 for either time or count disables IC on the given path.
+Time value
 1-65535 corresponds to a real time period and is expressed in units equivalent
-to 64 ticks of the TSEC clock. Count 1-255 represents the number of frames
-(note that value of 1 is equivalent to IC disabled). User provided values
-larger than supported will be trimmed to the maximum supported. More details
+to 64 ticks of the TSEC clock.
+Count 1-255 represents the number of frames
+(note that value of 1 is equivalent to IC disabled).
+User provided values
+larger than supported will be trimmed to the maximum supported.
+More details
 are available in the reference manual of the device.
 .El
 .Sh HARDWARE
@@ -144,9 +149,9 @@ device driver first appeared in
 The base version of
 .Nm
 device driver was written by
-.An Piotr Kruszynski.
+.An Piotr Kruszynski .
 It has been extended with polling and interrupt coalescing support by
-.An Rafal Jaworowski.
+.An Rafal Jaworowski .
 It has been further enhanced with multicast, h/w checksum calculation and vlan
 support by
 .An Piotr Ziecik .

Modified: user/dchagin/lemul/share/man/man5/rc.conf.5
==============================================================================
--- user/dchagin/lemul/share/man/man5/rc.conf.5	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/share/man/man5/rc.conf.5	Sun Feb 22 08:25:08 2015	(r279149)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 11, 2014
+.Dd February 20, 2015
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -2806,16 +2806,8 @@ these are the flags to pass to the routi
 .Pq Vt str
 The IPv6 equivalent of
 .Va routed_flags .
-.It Va mrouted_enable
-.Pq Vt bool
-If set to
-.Dq Li YES ,
-run the multicast routing daemon,
-.Xr mrouted 8 .
 .It Va mroute6d_enable
 .Pq Vt bool
-The IPv6 equivalent of
-.Va mrouted_enable .
 If set to
 .Dq Li YES ,
 run the IPv6 multicast routing daemon.
@@ -2829,19 +2821,8 @@ and
 may be installed from the
 .Fx
 Ports Collection.
-.It Va mrouted_flags
-.Pq Vt str
-If
-.Va mrouted_enable
-is set to
-.Dq Li YES ,
-these are the flags to pass to the
-.Xr mrouted 8
-daemon.
 .It Va mroute6d_flags
 .Pq Vt str
-The IPv6 equivalent of
-.Va mrouted_flags .
 If
 .Va mroute6d_enable
 is set to
@@ -4530,7 +4511,6 @@ ruleset to load for
 .Xr mixer 8 ,
 .Xr mountd 8 ,
 .Xr moused 8 ,
-.Xr mrouted 8 ,
 .Xr newfs 8 ,
 .Xr newsyslog 8 ,
 .Xr nfsd 8 ,

Modified: user/dchagin/lemul/share/man/man7/release.7
==============================================================================
--- user/dchagin/lemul/share/man/man7/release.7	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/share/man/man7/release.7	Sun Feb 22 08:25:08 2015	(r279149)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 28, 2015
+.Dd February 20, 2015
 .Dt RELEASE 7
 .Os
 .Sh NAME
@@ -256,6 +256,15 @@ Set to a non-empty value to compress the
 The original
 .Pq uncompressed
 images are not removed.
+.It Va XZ_THREADS Pq Vt int
+Set to the number of threads
+.Xr xz 1
+should use when compressing images.
+By default,
+.Va XZ_THREADS
+is set to
+.Va 0 ,
+which uses all available cores on the system.
 .It Va VCSCMD
 The command run to obtain the source trees.
 Defaults to

Modified: user/dchagin/lemul/share/man/man9/microuptime.9
==============================================================================
--- user/dchagin/lemul/share/man/man9/microuptime.9	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/share/man/man9/microuptime.9	Sun Feb 22 08:25:08 2015	(r279149)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 25, 2013
+.Dd February 21, 2015
 .Dt MICROUPTIME 9
 .Os
 .Sh NAME
@@ -112,6 +112,7 @@ functions is to enforce the user's prefe
 execution time.
 .Sh SEE ALSO
 .Xr bintime 9 ,
+.Xr get_cyclecount 9 ,
 .Xr getbintime 9 ,
 .Xr getmicrotime 9 ,
 .Xr getnanotime 9 ,

Modified: user/dchagin/lemul/share/misc/committers-doc.dot
==============================================================================
--- user/dchagin/lemul/share/misc/committers-doc.dot	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/share/misc/committers-doc.dot	Sun Feb 22 08:25:08 2015	(r279149)
@@ -53,6 +53,7 @@ node [color=lightblue2, style=filled, bg
 ale [label="Alex Dupre\nale at FreeBSD.org\n2003/12/22"]
 allanjude [label="Allan Jude\nallanjude at FreeBSD.org\n2014/05/17"]
 bcr [label="Benedict Reuschling\nbcr at FreeBSD.org\n2009/12/24"]
+bhd [label="Björn Heidotting\nbhd at FreeBSD.org\n2014/10/14"]
 blackend [label="Marc Fonvieille\nblackend at FreeBSD.org\n2002/06/16"]
 brd [label="Brad Davis\nbrd at FreeBSD.org\n2005/06/01"]
 brueffer [label="Christian Brueffer\nbrueffer at FreeBSD.org\n2003/01/13"]
@@ -102,6 +103,7 @@ bcr -> dru
 bcr -> crees
 bcr -> jgh
 bcr -> allanjude
+bcr -> bhd
 
 blackend -> ale
 

Modified: user/dchagin/lemul/share/mk/bsd.sys.mk
==============================================================================
--- user/dchagin/lemul/share/mk/bsd.sys.mk	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/share/mk/bsd.sys.mk	Sun Feb 22 08:25:08 2015	(r279149)
@@ -118,7 +118,10 @@ CWARNFLAGS+=	-Wno-unknown-pragmas
 CLANG_NO_IAS=	 -no-integrated-as
 .endif
 CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
-		 -mllvm -simplifycfg-dup-ret -mllvm -enable-gvn=false
+		 -mllvm -simplifycfg-dup-ret -mllvm
+.if ${COMPILER_VERSION} > 30400
+CLANG_OPT_SMALL+= -enable-gvn=false
+.endif
 CFLAGS.clang+=	 -Qunused-arguments
 .if ${MACHINE_CPUARCH} == "sparc64"
 # Don't emit .cfi directives, since we must use GNU as on sparc64, for now.

Modified: user/dchagin/lemul/sys/amd64/amd64/ptrace_machdep.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/amd64/ptrace_machdep.c	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/sys/amd64/amd64/ptrace_machdep.c	Sun Feb 22 08:25:08 2015	(r279149)
@@ -88,7 +88,8 @@ cpu_ptrace_xstate(struct thread *td, int
 		break;
 
 	case PT_SETXSTATE:
-		if (data > cpu_max_ext_state_size) {
+		if (data < sizeof(struct savefpu) ||
+		    data > cpu_max_ext_state_size) {
 			error = EINVAL;
 			break;
 		}

Modified: user/dchagin/lemul/sys/arm/arm/db_trace.c
==============================================================================
--- user/dchagin/lemul/sys/arm/arm/db_trace.c	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/sys/arm/arm/db_trace.c	Sun Feb 22 08:25:08 2015	(r279149)
@@ -66,7 +66,7 @@ db_stack_trace_cmd(struct unwind_state *
 
 	finished = false;
 	while (!finished) {
-		finished = unwind_stack_one(state);
+		finished = unwind_stack_one(state, 0);
 
 		/* Print the frame details */
 		sym = db_search_symbol(state->start_pc, DB_STGY_ANY, &offset);

Modified: user/dchagin/lemul/sys/arm/arm/unwind.c
==============================================================================
--- user/dchagin/lemul/sys/arm/arm/unwind.c	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/sys/arm/arm/unwind.c	Sun Feb 22 08:25:08 2015	(r279149)
@@ -33,9 +33,12 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/linker.h>
 
 #include <machine/stack.h>
 
+#include "linker_if.h"
+
 /*
  * Definitions for the instruction interpreter.
  *
@@ -61,7 +64,7 @@ __FBSDID("$FreeBSD$");
  * These are set in the linker script. Their addresses will be
  * either the start or end of the exception table or index.
  */
-extern int extab_start, extab_end, exidx_start, exidx_end;
+extern int exidx_start, exidx_end;
 
 /*
  * Entry types.
@@ -104,13 +107,47 @@ expand_prel31(uint32_t prel31)
 	return ((int32_t)(prel31 & 0x7fffffffu) << 1) / 2;
 }
 
+struct search_context {
+	uint32_t addr;
+	caddr_t exidx_start;
+	caddr_t exidx_end;
+};
+
+static int
+module_search(linker_file_t lf, void *context)
+{
+	struct search_context *sc = context;
+	linker_symval_t symval;
+	c_linker_sym_t sym;
+
+	if (lf->address <= (caddr_t)sc->addr &&
+	    (lf->address + lf->size) >= (caddr_t)sc->addr) {
+		if ((LINKER_LOOKUP_SYMBOL(lf, "__exidx_start", &sym) == 0 ||
+		    LINKER_LOOKUP_SYMBOL(lf, "exidx_start", &sym) == 0) &&
+		    LINKER_SYMBOL_VALUES(lf, sym, &symval) == 0)
+			sc->exidx_start = symval.value;
+
+		if ((LINKER_LOOKUP_SYMBOL(lf, "__exidx_end", &sym) == 0 ||
+		    LINKER_LOOKUP_SYMBOL(lf, "exidx_end", &sym) == 0) &&
+		    LINKER_SYMBOL_VALUES(lf, sym, &symval) == 0)
+			sc->exidx_end = symval.value;
+
+		if (sc->exidx_start != NULL && sc->exidx_end != NULL)
+			return (1);
+		panic("Invalid module %s, no unwind tables\n", lf->filename);
+	}
+	return (0);
+}
+
 /*
  * Perform a binary search of the index table to find the function
  * with the largest address that doesn't exceed addr.
  */
 static struct unwind_idx *
-find_index(uint32_t addr)
+find_index(uint32_t addr, int search_modules)
 {
+	struct search_context sc;
+	caddr_t idx_start, idx_end;
 	unsigned int min, mid, max;
 	struct unwind_idx *start;
 	struct unwind_idx *item;
@@ -118,9 +155,23 @@ find_index(uint32_t addr)
 	uint32_t func_addr;
 
 	start = (struct unwind_idx *)&exidx_start;
+	idx_start = (caddr_t)&exidx_start;
+	idx_end = (caddr_t)&exidx_end;
+
+	/* This may acquire a lock */
+	if (search_modules) {
+		bzero(&sc, sizeof(sc));
+		sc.addr = addr;
+		if (linker_file_foreach(module_search, &sc) != 0 &&
+		   sc.exidx_start != NULL && sc.exidx_end != NULL) {
+			start = (struct unwind_idx *)sc.exidx_start;
+			idx_start = sc.exidx_start;
+			idx_end = sc.exidx_end;
+		}
+	}
 
 	min = 0;
-	max = (&exidx_end - &exidx_start) / 2;
+	max = (idx_end - idx_start) / sizeof(struct unwind_idx);
 
 	while (min != max) {
 		mid = min + (max - min + 1) / 2;
@@ -332,7 +383,7 @@ unwind_tab(struct unwind_state *state)
 }
 
 int
-unwind_stack_one(struct unwind_state *state)
+unwind_stack_one(struct unwind_state *state, int can_lock)
 {
 	struct unwind_idx *index;
 	int finished;
@@ -344,7 +395,7 @@ unwind_stack_one(struct unwind_state *st
 	state->start_pc = state->registers[PC];
 
 	/* Find the item to run */
-	index = find_index(state->start_pc);
+	index = find_index(state->start_pc, can_lock);
 
 	finished = 0;
 	if (index->insn != EXIDX_CANTUNWIND) {

Modified: user/dchagin/lemul/sys/arm/include/atomic.h
==============================================================================
--- user/dchagin/lemul/sys/arm/include/atomic.h	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/sys/arm/include/atomic.h	Sun Feb 22 08:25:08 2015	(r279149)
@@ -582,8 +582,8 @@ atomic_load_64(volatile uint64_t *p)
 
 	/*
 	 * The only way to atomically load 64 bits is with LDREXD which puts the
-	 * exclusive monitor into the open state, so reset it with CLREX because
-	 * we don't actually need to store anything.
+	 * exclusive monitor into the exclusive state, so reset it to open state
+	 * with CLREX because we don't actually need to store anything.
 	 */
 	__asm __volatile(
 		"1:          \n"

Modified: user/dchagin/lemul/sys/arm/include/stack.h
==============================================================================
--- user/dchagin/lemul/sys/arm/include/stack.h	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/sys/arm/include/stack.h	Sun Feb 22 08:25:08 2015	(r279149)
@@ -55,6 +55,6 @@ struct unwind_state {
 #define	LR	14
 #define	PC	15
 
-int unwind_stack_one(struct unwind_state *);
+int unwind_stack_one(struct unwind_state *, int);
 
 #endif /* !_MACHINE_STACK_H_ */

Modified: user/dchagin/lemul/sys/boot/efi/include/amd64/efibind.h
==============================================================================
--- user/dchagin/lemul/sys/boot/efi/include/amd64/efibind.h	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/sys/boot/efi/include/amd64/efibind.h	Sun Feb 22 08:25:08 2015	(r279149)
@@ -85,6 +85,9 @@ Revision History
 // Basic EFI types of various widths
 //
 
+#ifndef ACPI_THREAD_ID		/* ACPI's definitions are fine */
+#define ACPI_USE_SYSTEM_INTTYPES 1	/* Tell ACPI we've defined types */
+
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
 
@@ -98,6 +101,7 @@ typedef int16_t    INT16;
 typedef uint8_t    UINT8;
 typedef int8_t     INT8;
 
+#endif
 
 #undef VOID
 #define VOID    void

Modified: user/dchagin/lemul/sys/boot/efi/include/efidef.h
==============================================================================
--- user/dchagin/lemul/sys/boot/efi/include/efidef.h	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/sys/boot/efi/include/efidef.h	Sun Feb 22 08:25:08 2015	(r279149)
@@ -30,7 +30,9 @@ Revision History
 
 typedef UINT16          CHAR16;
 typedef UINT8           CHAR8;
+#ifndef ACPI_THREAD_ID		/* ACPI's definitions are fine */
 typedef UINT8           BOOLEAN;
+#endif
 
 #ifndef TRUE
     #define TRUE    ((BOOLEAN) 1)

Modified: user/dchagin/lemul/sys/boot/efi/include/i386/efibind.h
==============================================================================
--- user/dchagin/lemul/sys/boot/efi/include/i386/efibind.h	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/sys/boot/efi/include/i386/efibind.h	Sun Feb 22 08:25:08 2015	(r279149)
@@ -85,6 +85,9 @@ Revision History
 // Basic EFI types of various widths
 //
 
+#ifndef ACPI_THREAD_ID		/* ACPI's definitions are fine, use those */
+#define ACPI_USE_SYSTEM_INTTYPES 1	/* Tell ACPI we've defined types */
+
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
 
@@ -98,6 +101,7 @@ typedef int16_t    INT16;
 typedef uint8_t    UINT8;
 typedef int8_t     INT8;
 
+#endif
 
 #undef VOID
 #define VOID    void

Modified: user/dchagin/lemul/sys/cddl/dev/dtrace/arm/dtrace_isa.c
==============================================================================
--- user/dchagin/lemul/sys/cddl/dev/dtrace/arm/dtrace_isa.c	Sun Feb 22 08:03:44 2015	(r279148)
+++ user/dchagin/lemul/sys/cddl/dev/dtrace/arm/dtrace_isa.c	Sun Feb 22 08:25:08 2015	(r279149)
@@ -69,9 +69,10 @@ void
 dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes,
     uint32_t *intrpc)
 {
-	u_int32_t	*frame, *lastframe;
-	int	scp_offset;
-	int	depth = 0;
+	struct unwind_state state;
+	register_t sp;
+	int scp_offset;
+	int depth = 0;
 	pc_t caller = (pc_t) solaris_cpu[curcpu].cpu_dtrace_caller;
 
 	if (intrpc != 0)
@@ -79,23 +80,17 @@ dtrace_getpcstack(pc_t *pcstack, int pcs
 
 	aframes++;
 
-	frame = (u_int32_t *)__builtin_frame_address(0);;
-	lastframe = NULL;
-	scp_offset = -(get_pc_str_offset() >> 2);
-
-	while ((frame != NULL) && (depth < pcstack_limit)) {
-		db_addr_t	scp;
-#if 0 
-		u_int32_t	savecode;
-		int		r;
-		u_int32_t	*rp;
-#endif
-
-		/*
-		 * In theory, the SCP isn't guaranteed to be in the function
-		 * that generated the stack frame.  We hope for the best.
-		 */
-		scp = frame[FR_SCP];
+	__asm __volatile("mov %0, sp" : "=&r" (sp));
+
+	state.registers[FP] = (uint32_t)__builtin_frame_address(0);
+	state.registers[SP] = sp;
+	state.registers[LR] = (uint32_t)__builtin_return_address(0);
+	state.registers[PC] = (uint32_t)dtrace_getpcstack;

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

More information about the svn-src-user mailing list