From owner-svn-src-projects@FreeBSD.ORG Sun Oct 20 12:50:17 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C36E7819; Sun, 20 Oct 2013 12:50:17 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AD09A270F; Sun, 20 Oct 2013 12:50:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9KCoHG1006022; Sun, 20 Oct 2013 12:50:17 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9KCoGtc006010; Sun, 20 Oct 2013 12:50:16 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201310201250.r9KCoGtc006010@svn.freebsd.org> From: Andrew Turner Date: Sun, 20 Oct 2013 12:50:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256784 - in projects/arm_eabi_vfp: . bin bin/dd bin/freebsd-version bin/pkill bin/sh cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/l... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Oct 2013 12:50:17 -0000 Author: andrew Date: Sun Oct 20 12:50:13 2013 New Revision: 256784 URL: http://svnweb.freebsd.org/changeset/base/256784 Log: MFC to r256779 Added: projects/arm_eabi_vfp/bin/freebsd-version/ - copied from r256779, head/bin/freebsd-version/ projects/arm_eabi_vfp/contrib/dialog/package/freebsd/ - copied from r256779, head/contrib/dialog/package/freebsd/ projects/arm_eabi_vfp/contrib/dialog/po/fa.po - copied unchanged from r256779, head/contrib/dialog/po/fa.po projects/arm_eabi_vfp/contrib/ldns/drill/config.h - copied unchanged from r256779, head/contrib/ldns/drill/config.h projects/arm_eabi_vfp/contrib/ldns/drill/drill.1 - copied unchanged from r256779, head/contrib/ldns/drill/drill.1 projects/arm_eabi_vfp/crypto/openssh/freebsd-configure.sh - copied unchanged from r256779, head/crypto/openssh/freebsd-configure.sh projects/arm_eabi_vfp/crypto/openssh/krb5_config.h - copied unchanged from r256779, head/crypto/openssh/krb5_config.h projects/arm_eabi_vfp/etc/rc.d/local_unbound - copied unchanged from r256779, head/etc/rc.d/local_unbound projects/arm_eabi_vfp/share/man/man4/altera_atse.4 - copied unchanged from r256779, head/share/man/man4/altera_atse.4 projects/arm_eabi_vfp/share/man/man9/VOP_ADVISE.9 - copied unchanged from r256779, head/share/man/man9/VOP_ADVISE.9 projects/arm_eabi_vfp/share/man/man9/VOP_ALLOCATE.9 - copied unchanged from r256779, head/share/man/man9/VOP_ALLOCATE.9 projects/arm_eabi_vfp/sys/dev/altera/atse/ - copied from r256779, head/sys/dev/altera/atse/ projects/arm_eabi_vfp/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu - copied unchanged from r256779, head/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu projects/arm_eabi_vfp/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu - copied unchanged from r256779, head/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu projects/arm_eabi_vfp/sys/dev/cxgbe/iw_cxgbe/ - copied from r256779, head/sys/dev/cxgbe/iw_cxgbe/ projects/arm_eabi_vfp/sys/dev/etherswitch/arswitch/arswitch_9340.c - copied unchanged from r256779, head/sys/dev/etherswitch/arswitch/arswitch_9340.c projects/arm_eabi_vfp/sys/dev/etherswitch/arswitch/arswitch_9340.h - copied unchanged from r256779, head/sys/dev/etherswitch/arswitch/arswitch_9340.h projects/arm_eabi_vfp/sys/dev/random/dummy_rng.c - copied unchanged from r256779, head/sys/dev/random/dummy_rng.c projects/arm_eabi_vfp/sys/dev/random/live_entropy_sources.c - copied unchanged from r256779, head/sys/dev/random/live_entropy_sources.c projects/arm_eabi_vfp/sys/dev/random/live_entropy_sources.h - copied unchanged from r256779, head/sys/dev/random/live_entropy_sources.h projects/arm_eabi_vfp/sys/dev/random/rwfile.c - copied unchanged from r256779, head/sys/dev/random/rwfile.c projects/arm_eabi_vfp/sys/dev/random/rwfile.h - copied unchanged from r256779, head/sys/dev/random/rwfile.h projects/arm_eabi_vfp/sys/modules/cxgbe/iw_cxgbe/ - copied from r256779, head/sys/modules/cxgbe/iw_cxgbe/ projects/arm_eabi_vfp/sys/modules/ibcore/ - copied from r256779, head/sys/modules/ibcore/ projects/arm_eabi_vfp/sys/modules/ipoib/ - copied from r256779, head/sys/modules/ipoib/ projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c - copied unchanged from r256779, head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/cm.c - copied unchanged from r256779, head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c - copied unchanged from r256779, head/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c - copied unchanged from r256779, head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/resource_tracker.c - copied unchanged from r256779, head/sys/ofed/drivers/net/mlx4/resource_tracker.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/sys_tune.c - copied unchanged from r256779, head/sys/ofed/drivers/net/mlx4/sys_tune.c projects/arm_eabi_vfp/sys/ofed/include/linux/atomic.h - copied unchanged from r256779, head/sys/ofed/include/linux/atomic.h projects/arm_eabi_vfp/sys/ofed/include/linux/clocksource.h - copied unchanged from r256779, head/sys/ofed/include/linux/clocksource.h projects/arm_eabi_vfp/sys/ofed/include/rdma/ib_pma.h - copied unchanged from r256779, head/sys/ofed/include/rdma/ib_pma.h projects/arm_eabi_vfp/sys/powerpc/pseries/phyp_llan.c - copied unchanged from r256779, head/sys/powerpc/pseries/phyp_llan.c projects/arm_eabi_vfp/sys/powerpc/pseries/phyp_vscsi.c - copied unchanged from r256779, head/sys/powerpc/pseries/phyp_vscsi.c projects/arm_eabi_vfp/tools/build/options/WITHOUT_LDNS_UTILS - copied unchanged from r256779, head/tools/build/options/WITHOUT_LDNS_UTILS projects/arm_eabi_vfp/tools/regression/lib/libutil/test-humanize_number.c - copied unchanged from r256779, head/tools/regression/lib/libutil/test-humanize_number.c projects/arm_eabi_vfp/tools/regression/lib/libutil/test-humanize_number.t - copied unchanged from r256779, head/tools/regression/lib/libutil/test-humanize_number.t projects/arm_eabi_vfp/usr.bin/drill/ - copied from r256779, head/usr.bin/drill/ projects/arm_eabi_vfp/usr.sbin/bhyve/ahci.h - copied unchanged from r256779, head/usr.sbin/bhyve/ahci.h projects/arm_eabi_vfp/usr.sbin/bhyve/block_if.c - copied unchanged from r256779, head/usr.sbin/bhyve/block_if.c projects/arm_eabi_vfp/usr.sbin/bhyve/block_if.h - copied unchanged from r256779, head/usr.sbin/bhyve/block_if.h projects/arm_eabi_vfp/usr.sbin/bhyve/pci_ahci.c - copied unchanged from r256779, head/usr.sbin/bhyve/pci_ahci.c projects/arm_eabi_vfp/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh - copied unchanged from r256779, head/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh projects/arm_eabi_vfp/usr.sbin/bsdconfig/examples/browse_packages_http.sh - copied unchanged from r256779, head/usr.sbin/bsdconfig/examples/browse_packages_http.sh projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/keymap.subr - copied unchanged from r256779, head/usr.sbin/bsdconfig/share/keymap.subr projects/arm_eabi_vfp/usr.sbin/bsdinstall/scripts/entropy - copied unchanged from r256779, head/usr.sbin/bsdinstall/scripts/entropy projects/arm_eabi_vfp/usr.sbin/bsdinstall/scripts/zfsboot - copied unchanged from r256779, head/usr.sbin/bsdinstall/scripts/zfsboot projects/arm_eabi_vfp/usr.sbin/unbound/local-setup/ - copied from r256779, head/usr.sbin/unbound/local-setup/ Deleted: projects/arm_eabi_vfp/contrib/bind9/ projects/arm_eabi_vfp/contrib/dialog/samples/copifuncs/ projects/arm_eabi_vfp/contrib/dialog/samples/install/ projects/arm_eabi_vfp/etc/atf/ projects/arm_eabi_vfp/etc/mtree/BIND.chroot.dist projects/arm_eabi_vfp/etc/mtree/BIND.include.dist projects/arm_eabi_vfp/gnu/usr.bin/binutils/ar/Makefile projects/arm_eabi_vfp/gnu/usr.bin/binutils/ar/ar.1 projects/arm_eabi_vfp/gnu/usr.bin/binutils/ranlib/Makefile projects/arm_eabi_vfp/gnu/usr.bin/binutils/ranlib/ranlib.1 projects/arm_eabi_vfp/lib/bind/ projects/arm_eabi_vfp/lib/libyaml/libbsdyml.3 projects/arm_eabi_vfp/share/atf/ projects/arm_eabi_vfp/share/doc/bind9/ projects/arm_eabi_vfp/share/examples/atf/ projects/arm_eabi_vfp/share/xml/ projects/arm_eabi_vfp/share/xsl/ projects/arm_eabi_vfp/sys/contrib/rdma/core_priv.h projects/arm_eabi_vfp/sys/contrib/rdma/ib_addr.h projects/arm_eabi_vfp/sys/contrib/rdma/ib_cache.h projects/arm_eabi_vfp/sys/contrib/rdma/ib_cm.h projects/arm_eabi_vfp/sys/contrib/rdma/ib_fmr_pool.h projects/arm_eabi_vfp/sys/contrib/rdma/ib_mad.h projects/arm_eabi_vfp/sys/contrib/rdma/ib_marshall.h projects/arm_eabi_vfp/sys/contrib/rdma/ib_pack.h projects/arm_eabi_vfp/sys/contrib/rdma/ib_sa.h projects/arm_eabi_vfp/sys/contrib/rdma/ib_smi.h projects/arm_eabi_vfp/sys/contrib/rdma/ib_umem.h projects/arm_eabi_vfp/sys/contrib/rdma/ib_user_cm.h projects/arm_eabi_vfp/sys/contrib/rdma/ib_user_mad.h projects/arm_eabi_vfp/sys/contrib/rdma/ib_user_sa.h projects/arm_eabi_vfp/sys/contrib/rdma/ib_user_verbs.h projects/arm_eabi_vfp/sys/contrib/rdma/ib_verbs.h projects/arm_eabi_vfp/sys/contrib/rdma/iw_cm.h projects/arm_eabi_vfp/sys/contrib/rdma/rdma_addr.c projects/arm_eabi_vfp/sys/contrib/rdma/rdma_cache.c projects/arm_eabi_vfp/sys/contrib/rdma/rdma_cm.h projects/arm_eabi_vfp/sys/contrib/rdma/rdma_cm_ib.h projects/arm_eabi_vfp/sys/contrib/rdma/rdma_cma.c projects/arm_eabi_vfp/sys/contrib/rdma/rdma_device.c projects/arm_eabi_vfp/sys/contrib/rdma/rdma_iwcm.c projects/arm_eabi_vfp/sys/contrib/rdma/rdma_user_cm.h projects/arm_eabi_vfp/sys/contrib/rdma/rdma_verbs.c projects/arm_eabi_vfp/sys/contrib/rdma/types.h projects/arm_eabi_vfp/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu projects/arm_eabi_vfp/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu projects/arm_eabi_vfp/sys/dev/random/pseudo_rng.c projects/arm_eabi_vfp/sys/kern/uipc_cow.c projects/arm_eabi_vfp/sys/modules/rdma/addr/ projects/arm_eabi_vfp/sys/modules/rdma/cma/ projects/arm_eabi_vfp/sys/modules/rdma/core/ projects/arm_eabi_vfp/sys/modules/rdma/iwcm/ projects/arm_eabi_vfp/tools/build/options/WITHOUT_BIND projects/arm_eabi_vfp/tools/build/options/WITHOUT_BIND_DNSSEC projects/arm_eabi_vfp/tools/build/options/WITHOUT_BIND_ETC projects/arm_eabi_vfp/tools/build/options/WITHOUT_BIND_LIBS_LWRES projects/arm_eabi_vfp/tools/build/options/WITHOUT_BIND_MTREE projects/arm_eabi_vfp/tools/build/options/WITHOUT_BIND_NAMED projects/arm_eabi_vfp/tools/build/options/WITHOUT_BIND_UTILS projects/arm_eabi_vfp/tools/build/options/WITH_BIND_IDN projects/arm_eabi_vfp/tools/build/options/WITH_BIND_LARGE_FILE projects/arm_eabi_vfp/tools/build/options/WITH_BIND_LIBS projects/arm_eabi_vfp/tools/build/options/WITH_BIND_SIGCHASE projects/arm_eabi_vfp/tools/build/options/WITH_BIND_XML projects/arm_eabi_vfp/tools/build/options/WITH_LDNS_UTILS projects/arm_eabi_vfp/usr.bin/atf/atf-config/ projects/arm_eabi_vfp/usr.bin/atf/atf-report/ projects/arm_eabi_vfp/usr.bin/atf/atf-run/ projects/arm_eabi_vfp/usr.bin/atf/atf-version/ projects/arm_eabi_vfp/usr.bin/dig/ projects/arm_eabi_vfp/usr.bin/nslookup/ projects/arm_eabi_vfp/usr.bin/nsupdate/ projects/arm_eabi_vfp/usr.sbin/arpaname/ projects/arm_eabi_vfp/usr.sbin/bsdconfig/examples/browse_packages.sh projects/arm_eabi_vfp/usr.sbin/ddns-confgen/ projects/arm_eabi_vfp/usr.sbin/dnssec-dsfromkey/ projects/arm_eabi_vfp/usr.sbin/dnssec-keyfromlabel/ projects/arm_eabi_vfp/usr.sbin/dnssec-keygen/ projects/arm_eabi_vfp/usr.sbin/dnssec-revoke/ projects/arm_eabi_vfp/usr.sbin/dnssec-settime/ projects/arm_eabi_vfp/usr.sbin/dnssec-signzone/ projects/arm_eabi_vfp/usr.sbin/dnssec-verify/ projects/arm_eabi_vfp/usr.sbin/genrandom/ projects/arm_eabi_vfp/usr.sbin/isc-hmac-fixup/ projects/arm_eabi_vfp/usr.sbin/named/ projects/arm_eabi_vfp/usr.sbin/named-checkconf/ projects/arm_eabi_vfp/usr.sbin/named-checkzone/ projects/arm_eabi_vfp/usr.sbin/named-journalprint/ projects/arm_eabi_vfp/usr.sbin/nsec3hash/ projects/arm_eabi_vfp/usr.sbin/rndc/ projects/arm_eabi_vfp/usr.sbin/rndc-confgen/ Modified: projects/arm_eabi_vfp/Makefile.inc1 projects/arm_eabi_vfp/ObsoleteFiles.inc projects/arm_eabi_vfp/UPDATING projects/arm_eabi_vfp/bin/Makefile projects/arm_eabi_vfp/bin/dd/dd.1 projects/arm_eabi_vfp/bin/pkill/pkill.c projects/arm_eabi_vfp/bin/sh/jobs.c projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/arm_eabi_vfp/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/arm_eabi_vfp/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/arm_eabi_vfp/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c projects/arm_eabi_vfp/cddl/lib/libdtrace/psinfo.d projects/arm_eabi_vfp/cddl/lib/libdtrace/tcp.d projects/arm_eabi_vfp/contrib/binutils/bfd/elflink.c projects/arm_eabi_vfp/contrib/binutils/bfd/elfxx-mips.c projects/arm_eabi_vfp/contrib/binutils/binutils/readelf.c projects/arm_eabi_vfp/contrib/binutils/gas/dwarf2dbg.c projects/arm_eabi_vfp/contrib/binutils/include/elf/common.h projects/arm_eabi_vfp/contrib/binutils/opcodes/i386-dis.c projects/arm_eabi_vfp/contrib/binutils/opcodes/i386-opc.h projects/arm_eabi_vfp/contrib/binutils/opcodes/i386-opc.tbl projects/arm_eabi_vfp/contrib/binutils/opcodes/i386-tbl.h projects/arm_eabi_vfp/contrib/bmake/make.1 projects/arm_eabi_vfp/contrib/bsnmp/lib/snmp.c projects/arm_eabi_vfp/contrib/bsnmp/lib/snmp.h projects/arm_eabi_vfp/contrib/bsnmp/lib/snmpagent.c projects/arm_eabi_vfp/contrib/dialog/CHANGES projects/arm_eabi_vfp/contrib/dialog/VERSION projects/arm_eabi_vfp/contrib/dialog/aclocal.m4 projects/arm_eabi_vfp/contrib/dialog/arrows.c projects/arm_eabi_vfp/contrib/dialog/buildlist.c projects/arm_eabi_vfp/contrib/dialog/checklist.c projects/arm_eabi_vfp/contrib/dialog/config.guess projects/arm_eabi_vfp/contrib/dialog/config.sub projects/arm_eabi_vfp/contrib/dialog/configure projects/arm_eabi_vfp/contrib/dialog/configure.in projects/arm_eabi_vfp/contrib/dialog/dialog.1 projects/arm_eabi_vfp/contrib/dialog/dialog.3 projects/arm_eabi_vfp/contrib/dialog/dialog.c projects/arm_eabi_vfp/contrib/dialog/dialog.h projects/arm_eabi_vfp/contrib/dialog/formbox.c projects/arm_eabi_vfp/contrib/dialog/guage.c projects/arm_eabi_vfp/contrib/dialog/inputstr.c projects/arm_eabi_vfp/contrib/dialog/makefile.in projects/arm_eabi_vfp/contrib/dialog/menubox.c projects/arm_eabi_vfp/contrib/dialog/mixedform.c projects/arm_eabi_vfp/contrib/dialog/package/debian/changelog projects/arm_eabi_vfp/contrib/dialog/package/debian/copyright projects/arm_eabi_vfp/contrib/dialog/package/dialog.spec projects/arm_eabi_vfp/contrib/dialog/po/lt.po projects/arm_eabi_vfp/contrib/dialog/samples/inputbox6-utf8 projects/arm_eabi_vfp/contrib/dialog/samples/report-tempfile projects/arm_eabi_vfp/contrib/dialog/treeview.c projects/arm_eabi_vfp/contrib/dialog/util.c projects/arm_eabi_vfp/contrib/ipfilter/ipf.h projects/arm_eabi_vfp/contrib/libc++/include/memory projects/arm_eabi_vfp/contrib/libcxxrt/libelftc_dem_gnu3.c projects/arm_eabi_vfp/contrib/libcxxrt/typeinfo.cc projects/arm_eabi_vfp/contrib/libcxxrt/unwind-itanium.h projects/arm_eabi_vfp/contrib/llvm/include/llvm/IR/CallingConv.h projects/arm_eabi_vfp/contrib/llvm/lib/AsmParser/LLLexer.cpp projects/arm_eabi_vfp/contrib/llvm/lib/AsmParser/LLParser.cpp projects/arm_eabi_vfp/contrib/llvm/lib/AsmParser/LLToken.h projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp projects/arm_eabi_vfp/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp projects/arm_eabi_vfp/contrib/llvm/lib/IR/AsmWriter.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/R600/AMDILISelDAGToDAG.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/X86/X86CallingConv.td projects/arm_eabi_vfp/contrib/llvm/lib/Target/X86/X86FastISel.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp projects/arm_eabi_vfp/contrib/llvm/lib/Target/X86/X86Subtarget.h projects/arm_eabi_vfp/contrib/llvm/tools/clang/include/clang-c/Index.h projects/arm_eabi_vfp/contrib/llvm/tools/clang/include/clang/AST/Type.h projects/arm_eabi_vfp/contrib/llvm/tools/clang/include/clang/Basic/Attr.td projects/arm_eabi_vfp/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/AST/DumpXML.cpp projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/AST/Type.cpp projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Basic/Targets.cpp projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp projects/arm_eabi_vfp/contrib/mtree/compare.c projects/arm_eabi_vfp/contrib/mtree/create.c projects/arm_eabi_vfp/contrib/mtree/getid.c projects/arm_eabi_vfp/contrib/mtree/spec.c projects/arm_eabi_vfp/contrib/unbound/config.h projects/arm_eabi_vfp/contrib/unbound/config.h.in projects/arm_eabi_vfp/contrib/unbound/configure projects/arm_eabi_vfp/contrib/unbound/configure.ac projects/arm_eabi_vfp/contrib/unbound/daemon/unbound.c projects/arm_eabi_vfp/contrib/unbound/doc/unbound-checkconf.8 projects/arm_eabi_vfp/contrib/unbound/doc/unbound-control.8 projects/arm_eabi_vfp/contrib/unbound/doc/unbound.8 projects/arm_eabi_vfp/contrib/unbound/doc/unbound.conf.5 projects/arm_eabi_vfp/contrib/unbound/freebsd-configure.sh projects/arm_eabi_vfp/contrib/unbound/util/configparser.h projects/arm_eabi_vfp/crypto/openssh/FREEBSD-upgrade projects/arm_eabi_vfp/crypto/openssh/config.h projects/arm_eabi_vfp/crypto/openssh/ssh-gss.h projects/arm_eabi_vfp/crypto/openssh/sshd.c projects/arm_eabi_vfp/etc/Makefile projects/arm_eabi_vfp/etc/defaults/periodic.conf projects/arm_eabi_vfp/etc/defaults/rc.conf projects/arm_eabi_vfp/etc/ftpusers projects/arm_eabi_vfp/etc/group projects/arm_eabi_vfp/etc/master.passwd projects/arm_eabi_vfp/etc/mtree/BSD.include.dist projects/arm_eabi_vfp/etc/mtree/BSD.root.dist projects/arm_eabi_vfp/etc/mtree/BSD.usr.dist projects/arm_eabi_vfp/etc/mtree/BSD.var.dist projects/arm_eabi_vfp/etc/mtree/Makefile projects/arm_eabi_vfp/etc/network.subr projects/arm_eabi_vfp/etc/periodic/daily/Makefile projects/arm_eabi_vfp/etc/portsnap.conf projects/arm_eabi_vfp/etc/rc projects/arm_eabi_vfp/etc/rc.d/Makefile projects/arm_eabi_vfp/etc/rc.d/NETWORKING projects/arm_eabi_vfp/etc/rc.d/initrandom projects/arm_eabi_vfp/etc/rc.d/jail projects/arm_eabi_vfp/etc/rc.d/netif projects/arm_eabi_vfp/etc/rc.d/sendmail projects/arm_eabi_vfp/etc/rc.d/sshd projects/arm_eabi_vfp/etc/rc.subr projects/arm_eabi_vfp/etc/sendmail/freebsd.mc projects/arm_eabi_vfp/games/fortune/datfiles/freebsd-tips projects/arm_eabi_vfp/gnu/lib/libdialog/dlg_config.h projects/arm_eabi_vfp/gnu/usr.bin/binutils/Makefile projects/arm_eabi_vfp/gnu/usr.bin/cc/cc_tools/freebsd-native.h projects/arm_eabi_vfp/gnu/usr.bin/groff/tmac/mdoc.local projects/arm_eabi_vfp/include/Makefile projects/arm_eabi_vfp/include/mk-osreldate.sh projects/arm_eabi_vfp/lib/Makefile projects/arm_eabi_vfp/lib/clang/clang.build.mk projects/arm_eabi_vfp/lib/csu/arm/crt1.c projects/arm_eabi_vfp/lib/csu/common/notes.h projects/arm_eabi_vfp/lib/libarchive/Makefile projects/arm_eabi_vfp/lib/libc/gen/getutxent.c projects/arm_eabi_vfp/lib/libc/sys/accept.2 projects/arm_eabi_vfp/lib/libcompiler_rt/Makefile projects/arm_eabi_vfp/lib/libcrypt/tests/Makefile projects/arm_eabi_vfp/lib/libcrypt/tests/crypt_tests.c projects/arm_eabi_vfp/lib/libedit/readline.c projects/arm_eabi_vfp/lib/libproc/_libproc.h projects/arm_eabi_vfp/lib/libprocstat/libprocstat.c projects/arm_eabi_vfp/lib/libstand/tftp.c projects/arm_eabi_vfp/lib/libutil/humanize_number.3 projects/arm_eabi_vfp/lib/libutil/humanize_number.c projects/arm_eabi_vfp/lib/libvmmapi/vmmapi.c projects/arm_eabi_vfp/lib/libvmmapi/vmmapi.h projects/arm_eabi_vfp/lib/libyaml/Makefile projects/arm_eabi_vfp/lib/libz/zopen.c projects/arm_eabi_vfp/libexec/rtld-elf/rtld.c projects/arm_eabi_vfp/libexec/rtld-elf/rtld.h projects/arm_eabi_vfp/release/Makefile projects/arm_eabi_vfp/release/picobsd/build/picobsd projects/arm_eabi_vfp/release/picobsd/floppy.tree/etc/rc1 projects/arm_eabi_vfp/release/picobsd/floppy.tree/etc/ssh/sshd_config projects/arm_eabi_vfp/release/release.sh projects/arm_eabi_vfp/sbin/bsdlabel/bsdlabel.8 projects/arm_eabi_vfp/sbin/camcontrol/camcontrol.c projects/arm_eabi_vfp/sbin/camcontrol/fwdownload.c projects/arm_eabi_vfp/sbin/camcontrol/modeedit.c projects/arm_eabi_vfp/sbin/ccdconfig/ccdconfig.8 projects/arm_eabi_vfp/sbin/fdisk/fdisk.8 projects/arm_eabi_vfp/sbin/gbde/gbde.8 projects/arm_eabi_vfp/sbin/geom/class/eli/geli.8 projects/arm_eabi_vfp/sbin/geom/class/shsec/gshsec.8 projects/arm_eabi_vfp/sbin/geom/class/virstor/gvirstor.8 projects/arm_eabi_vfp/sbin/gvinum/gvinum.8 projects/arm_eabi_vfp/sbin/gvinum/gvinum.c projects/arm_eabi_vfp/sbin/ifconfig/ifgroup.c projects/arm_eabi_vfp/sbin/iscontrol/fsm.c projects/arm_eabi_vfp/sbin/iscontrol/iscsi.conf.5 projects/arm_eabi_vfp/sbin/mount_msdosfs/mount_msdosfs.8 projects/arm_eabi_vfp/sbin/newfs/newfs.8 projects/arm_eabi_vfp/sbin/newfs_msdos/newfs_msdos.8 projects/arm_eabi_vfp/sbin/newfs_nandfs/newfs_nandfs.8 projects/arm_eabi_vfp/sbin/nos-tun/nos-tun.c projects/arm_eabi_vfp/sbin/nvmecontrol/perftest.c projects/arm_eabi_vfp/sbin/recoverdisk/recoverdisk.1 projects/arm_eabi_vfp/sbin/route/keywords projects/arm_eabi_vfp/sbin/route/route.8 projects/arm_eabi_vfp/sbin/route/route.c projects/arm_eabi_vfp/secure/lib/libssh/Makefile projects/arm_eabi_vfp/secure/usr.bin/ssh/Makefile projects/arm_eabi_vfp/secure/usr.sbin/sshd/Makefile projects/arm_eabi_vfp/share/Makefile projects/arm_eabi_vfp/share/doc/Makefile projects/arm_eabi_vfp/share/examples/Makefile projects/arm_eabi_vfp/share/examples/bhyve/vmrun.sh projects/arm_eabi_vfp/share/examples/kld/random_adaptor/random_adaptor_example.c (contents, props changed) projects/arm_eabi_vfp/share/man/man4/Makefile projects/arm_eabi_vfp/share/man/man4/altera_avgen.4 projects/arm_eabi_vfp/share/man/man4/bxe.4 projects/arm_eabi_vfp/share/man/man4/ddb.4 projects/arm_eabi_vfp/share/man/man4/geom_linux_lvm.4 projects/arm_eabi_vfp/share/man/man4/netmap.4 projects/arm_eabi_vfp/share/man/man4/random.4 projects/arm_eabi_vfp/share/man/man4/rsu.4 projects/arm_eabi_vfp/share/man/man4/urtwn.4 projects/arm_eabi_vfp/share/man/man5/Makefile projects/arm_eabi_vfp/share/man/man5/ext2fs.5 projects/arm_eabi_vfp/share/man/man5/msdosfs.5 projects/arm_eabi_vfp/share/man/man5/rc.conf.5 projects/arm_eabi_vfp/share/man/man5/reiserfs.5 projects/arm_eabi_vfp/share/man/man5/src.conf.5 projects/arm_eabi_vfp/share/man/man7/Makefile projects/arm_eabi_vfp/share/man/man8/picobsd.8 projects/arm_eabi_vfp/share/man/man8/rc.8 projects/arm_eabi_vfp/share/man/man8/rc.sendmail.8 projects/arm_eabi_vfp/share/man/man8/rc.subr.8 projects/arm_eabi_vfp/share/man/man9/Makefile projects/arm_eabi_vfp/share/man/man9/VOP_FSYNC.9 projects/arm_eabi_vfp/share/man/man9/firmware.9 projects/arm_eabi_vfp/share/man/man9/lock.9 projects/arm_eabi_vfp/share/man/man9/rtentry.9 projects/arm_eabi_vfp/share/man/man9/vm_page_grab.9 projects/arm_eabi_vfp/share/man/man9/vnode.9 projects/arm_eabi_vfp/share/misc/bsd-family-tree projects/arm_eabi_vfp/share/misc/committers-ports.dot projects/arm_eabi_vfp/share/misc/committers-src.dot projects/arm_eabi_vfp/share/mk/atf.test.mk projects/arm_eabi_vfp/share/mk/bsd.libnames.mk projects/arm_eabi_vfp/share/mk/bsd.own.mk projects/arm_eabi_vfp/share/mk/bsd.test.mk projects/arm_eabi_vfp/share/syscons/keymaps/INDEX.keymaps projects/arm_eabi_vfp/sys/amd64/amd64/machdep.c projects/arm_eabi_vfp/sys/amd64/amd64/pmap.c projects/arm_eabi_vfp/sys/amd64/amd64/trap.c projects/arm_eabi_vfp/sys/amd64/amd64/vm_machdep.c projects/arm_eabi_vfp/sys/amd64/conf/GENERIC projects/arm_eabi_vfp/sys/amd64/conf/NOTES projects/arm_eabi_vfp/sys/amd64/include/pcpu.h projects/arm_eabi_vfp/sys/amd64/include/pmap.h projects/arm_eabi_vfp/sys/amd64/include/vmm.h (contents, props changed) projects/arm_eabi_vfp/sys/amd64/include/vmm_dev.h (contents, props changed) projects/arm_eabi_vfp/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/arm_eabi_vfp/sys/amd64/vmm/amd/amdv.c projects/arm_eabi_vfp/sys/amd64/vmm/intel/ept.c projects/arm_eabi_vfp/sys/amd64/vmm/intel/ept.h projects/arm_eabi_vfp/sys/amd64/vmm/intel/vmcs.c projects/arm_eabi_vfp/sys/amd64/vmm/intel/vmcs.h projects/arm_eabi_vfp/sys/amd64/vmm/intel/vmx.c projects/arm_eabi_vfp/sys/amd64/vmm/intel/vmx.h projects/arm_eabi_vfp/sys/amd64/vmm/intel/vmx_controls.h projects/arm_eabi_vfp/sys/amd64/vmm/intel/vmx_genassym.c projects/arm_eabi_vfp/sys/amd64/vmm/intel/vmx_support.S projects/arm_eabi_vfp/sys/amd64/vmm/io/ppt.c projects/arm_eabi_vfp/sys/amd64/vmm/io/ppt.h projects/arm_eabi_vfp/sys/amd64/vmm/vmm.c projects/arm_eabi_vfp/sys/amd64/vmm/vmm_dev.c projects/arm_eabi_vfp/sys/amd64/vmm/vmm_instruction_emul.c projects/arm_eabi_vfp/sys/amd64/vmm/vmm_mem.c projects/arm_eabi_vfp/sys/amd64/vmm/vmm_mem.h projects/arm_eabi_vfp/sys/amd64/vmm/vmm_msr.c projects/arm_eabi_vfp/sys/amd64/vmm/x86.c projects/arm_eabi_vfp/sys/arm/arm/busdma_machdep-v6.c projects/arm_eabi_vfp/sys/arm/arm/cpufunc.c projects/arm_eabi_vfp/sys/arm/arm/cpufunc_asm_armv7.S projects/arm_eabi_vfp/sys/arm/arm/fusu.S projects/arm_eabi_vfp/sys/arm/arm/identcpu.c projects/arm_eabi_vfp/sys/arm/arm/locore.S projects/arm_eabi_vfp/sys/arm/arm/machdep.c projects/arm_eabi_vfp/sys/arm/arm/pl310.c projects/arm_eabi_vfp/sys/arm/arm/pmap-v6.c projects/arm_eabi_vfp/sys/arm/arm/vm_machdep.c projects/arm_eabi_vfp/sys/arm/broadcom/bcm2835/bcm2835_systimer.c projects/arm_eabi_vfp/sys/arm/freescale/imx/imx51_ccm.c projects/arm_eabi_vfp/sys/arm/include/armreg.h projects/arm_eabi_vfp/sys/arm/include/pmap.h projects/arm_eabi_vfp/sys/arm/mv/common.c projects/arm_eabi_vfp/sys/arm/mv/mv_localbus.c projects/arm_eabi_vfp/sys/arm/mv/mvreg.h projects/arm_eabi_vfp/sys/arm/s3c2xx0/uart_bus_s3c2410.c projects/arm_eabi_vfp/sys/arm/s3c2xx0/uart_cpu_s3c2410.c projects/arm_eabi_vfp/sys/arm/samsung/exynos/exynos5_machdep.c projects/arm_eabi_vfp/sys/arm/versatile/versatile_pci.c projects/arm_eabi_vfp/sys/arm/xscale/i80321/ep80219_machdep.c projects/arm_eabi_vfp/sys/arm/xscale/i80321/iq31244_machdep.c projects/arm_eabi_vfp/sys/arm/xscale/i8134x/crb_machdep.c projects/arm_eabi_vfp/sys/arm/xscale/ixp425/avila_machdep.c projects/arm_eabi_vfp/sys/arm/xscale/pxa/pxa_machdep.c projects/arm_eabi_vfp/sys/boot/arm/ixp425/boot2/Makefile projects/arm_eabi_vfp/sys/boot/common/loader.8 projects/arm_eabi_vfp/sys/boot/forth/loader.conf projects/arm_eabi_vfp/sys/boot/i386/btx/btx/btx.S projects/arm_eabi_vfp/sys/boot/i386/efi/Makefile projects/arm_eabi_vfp/sys/boot/powerpc/boot1.chrp/Makefile projects/arm_eabi_vfp/sys/boot/userboot/libstand/Makefile projects/arm_eabi_vfp/sys/boot/userboot/test/Makefile projects/arm_eabi_vfp/sys/boot/userboot/userboot/Makefile projects/arm_eabi_vfp/sys/cam/ata/ata_all.c projects/arm_eabi_vfp/sys/cam/ata/ata_all.h projects/arm_eabi_vfp/sys/cam/ata/ata_da.c projects/arm_eabi_vfp/sys/cam/ata/ata_pmp.c projects/arm_eabi_vfp/sys/cam/cam.h projects/arm_eabi_vfp/sys/cam/cam_ccb.h projects/arm_eabi_vfp/sys/cam/cam_compat.c projects/arm_eabi_vfp/sys/cam/cam_compat.h projects/arm_eabi_vfp/sys/cam/cam_periph.c projects/arm_eabi_vfp/sys/cam/cam_periph.h projects/arm_eabi_vfp/sys/cam/cam_xpt.c projects/arm_eabi_vfp/sys/cam/cam_xpt_periph.h projects/arm_eabi_vfp/sys/cam/ctl/ctl_frontend_iscsi.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_all.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_all.h projects/arm_eabi_vfp/sys/cam/scsi/scsi_cd.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_ch.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_da.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_enc.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_pass.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_pt.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_sa.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_sg.c projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/powerpc/sys/fasttrap_isa.h projects/arm_eabi_vfp/sys/cddl/dev/dtrace/dtrace_load.c projects/arm_eabi_vfp/sys/cddl/dev/dtrace/dtrace_sysctl.c projects/arm_eabi_vfp/sys/cddl/dev/dtrace/dtrace_unload.c projects/arm_eabi_vfp/sys/compat/freebsd32/freebsd32.h projects/arm_eabi_vfp/sys/compat/linux/linux_futex.c projects/arm_eabi_vfp/sys/compat/linux/linux_uid16.c projects/arm_eabi_vfp/sys/conf/NOTES projects/arm_eabi_vfp/sys/conf/files projects/arm_eabi_vfp/sys/conf/files.amd64 projects/arm_eabi_vfp/sys/conf/files.i386 projects/arm_eabi_vfp/sys/conf/files.powerpc projects/arm_eabi_vfp/sys/conf/kmod.mk projects/arm_eabi_vfp/sys/conf/newvers.sh projects/arm_eabi_vfp/sys/conf/options projects/arm_eabi_vfp/sys/conf/options.mips projects/arm_eabi_vfp/sys/contrib/dev/run/rt2870.fw.uu projects/arm_eabi_vfp/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c projects/arm_eabi_vfp/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c projects/arm_eabi_vfp/sys/contrib/rdma/krping/getopt.c projects/arm_eabi_vfp/sys/contrib/rdma/krping/krping.c projects/arm_eabi_vfp/sys/contrib/rdma/krping/krping.h projects/arm_eabi_vfp/sys/contrib/rdma/krping/krping_dev.c projects/arm_eabi_vfp/sys/dev/adb/adb_mouse.c projects/arm_eabi_vfp/sys/dev/altera/sdcard/altera_sdcard.c projects/arm_eabi_vfp/sys/dev/altera/sdcard/altera_sdcard_io.c projects/arm_eabi_vfp/sys/dev/asr/asr.c projects/arm_eabi_vfp/sys/dev/ata/ata-all.c projects/arm_eabi_vfp/sys/dev/ata/ata-card.c projects/arm_eabi_vfp/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/arm_eabi_vfp/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c projects/arm_eabi_vfp/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/arm_eabi_vfp/sys/dev/ath/if_ath.c projects/arm_eabi_vfp/sys/dev/ath/if_ath_tx.c projects/arm_eabi_vfp/sys/dev/bxe/bxe.c projects/arm_eabi_vfp/sys/dev/bxe/bxe_stats.c projects/arm_eabi_vfp/sys/dev/bxe/ecore_sp.h projects/arm_eabi_vfp/sys/dev/cfi/cfi_core.c projects/arm_eabi_vfp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c projects/arm_eabi_vfp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/arm_eabi_vfp/sys/dev/cxgbe/adapter.h projects/arm_eabi_vfp/sys/dev/cxgbe/common/common.h projects/arm_eabi_vfp/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/arm_eabi_vfp/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt projects/arm_eabi_vfp/sys/dev/cxgbe/firmware/t4fw_interface.h projects/arm_eabi_vfp/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/arm_eabi_vfp/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt projects/arm_eabi_vfp/sys/dev/cxgbe/t4_main.c projects/arm_eabi_vfp/sys/dev/cxgbe/t4_sge.c projects/arm_eabi_vfp/sys/dev/cxgbe/tom/t4_cpl_io.c projects/arm_eabi_vfp/sys/dev/drm2/radeon/radeon_drv.c projects/arm_eabi_vfp/sys/dev/e1000/e1000_80003es2lan.c projects/arm_eabi_vfp/sys/dev/e1000/e1000_80003es2lan.h projects/arm_eabi_vfp/sys/dev/e1000/e1000_82571.c projects/arm_eabi_vfp/sys/dev/e1000/e1000_82575.c projects/arm_eabi_vfp/sys/dev/e1000/e1000_82575.h projects/arm_eabi_vfp/sys/dev/e1000/e1000_api.c projects/arm_eabi_vfp/sys/dev/e1000/e1000_defines.h projects/arm_eabi_vfp/sys/dev/e1000/e1000_hw.h projects/arm_eabi_vfp/sys/dev/e1000/e1000_i210.c projects/arm_eabi_vfp/sys/dev/e1000/e1000_i210.h projects/arm_eabi_vfp/sys/dev/e1000/e1000_ich8lan.c projects/arm_eabi_vfp/sys/dev/e1000/e1000_ich8lan.h projects/arm_eabi_vfp/sys/dev/e1000/e1000_mac.c projects/arm_eabi_vfp/sys/dev/e1000/e1000_osdep.h projects/arm_eabi_vfp/sys/dev/e1000/e1000_phy.c projects/arm_eabi_vfp/sys/dev/e1000/e1000_phy.h projects/arm_eabi_vfp/sys/dev/e1000/e1000_regs.h projects/arm_eabi_vfp/sys/dev/e1000/e1000_vf.h projects/arm_eabi_vfp/sys/dev/e1000/if_igb.c projects/arm_eabi_vfp/sys/dev/e1000/if_igb.h projects/arm_eabi_vfp/sys/dev/etherswitch/arswitch/arswitch.c projects/arm_eabi_vfp/sys/dev/etherswitch/arswitch/arswitch_vlans.c projects/arm_eabi_vfp/sys/dev/etherswitch/arswitch/arswitchreg.h projects/arm_eabi_vfp/sys/dev/etherswitch/arswitch/arswitchvar.h projects/arm_eabi_vfp/sys/dev/firewire/sbp.c projects/arm_eabi_vfp/sys/dev/glxsb/glxsb.c projects/arm_eabi_vfp/sys/dev/hifn/hifn7751.c projects/arm_eabi_vfp/sys/dev/hpt27xx/hpt27xx_osm_bsd.c projects/arm_eabi_vfp/sys/dev/hpt27xx/os_bsd.h projects/arm_eabi_vfp/sys/dev/hptiop/hptiop.c projects/arm_eabi_vfp/sys/dev/hptiop/hptiop.h projects/arm_eabi_vfp/sys/dev/hptmv/entry.c projects/arm_eabi_vfp/sys/dev/hptmv/osbsd.h projects/arm_eabi_vfp/sys/dev/hptnr/hptnr_osm_bsd.c projects/arm_eabi_vfp/sys/dev/hptnr/os_bsd.h projects/arm_eabi_vfp/sys/dev/hptrr/hptrr_osm_bsd.c projects/arm_eabi_vfp/sys/dev/hptrr/os_bsd.h projects/arm_eabi_vfp/sys/dev/hyperv/include/hyperv.h projects/arm_eabi_vfp/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/arm_eabi_vfp/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/arm_eabi_vfp/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c projects/arm_eabi_vfp/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/arm_eabi_vfp/sys/dev/hyperv/storvsc/hv_vstorage.h projects/arm_eabi_vfp/sys/dev/hyperv/vmbus/hv_channel.c projects/arm_eabi_vfp/sys/dev/hyperv/vmbus/hv_hv.c projects/arm_eabi_vfp/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c projects/arm_eabi_vfp/sys/dev/hyperv/vmbus/hv_vmbus_priv.h projects/arm_eabi_vfp/sys/dev/iir/iir.c projects/arm_eabi_vfp/sys/dev/iir/iir.h projects/arm_eabi_vfp/sys/dev/isci/isci.c projects/arm_eabi_vfp/sys/dev/isci/isci_io_request.c projects/arm_eabi_vfp/sys/dev/isci/isci_sysctl.c projects/arm_eabi_vfp/sys/dev/isci/isci_task_request.c projects/arm_eabi_vfp/sys/dev/iscsi/icl.c projects/arm_eabi_vfp/sys/dev/iscsi/iscsi.c projects/arm_eabi_vfp/sys/dev/iscsi_initiator/iscsi.c projects/arm_eabi_vfp/sys/dev/isp/isp.c projects/arm_eabi_vfp/sys/dev/isp/isp_freebsd.c projects/arm_eabi_vfp/sys/dev/isp/isp_freebsd.h projects/arm_eabi_vfp/sys/dev/isp/ispvar.h projects/arm_eabi_vfp/sys/dev/ixgbe/ixgbe.c projects/arm_eabi_vfp/sys/dev/mfi/mfi_pci.c projects/arm_eabi_vfp/sys/dev/mfi/mfireg.h projects/arm_eabi_vfp/sys/dev/netmap/if_igb_netmap.h projects/arm_eabi_vfp/sys/dev/nfe/if_nfe.c projects/arm_eabi_vfp/sys/dev/nvd/nvd.c projects/arm_eabi_vfp/sys/dev/nvme/nvme.c projects/arm_eabi_vfp/sys/dev/nvme/nvme.h projects/arm_eabi_vfp/sys/dev/nvme/nvme_ctrlr.c projects/arm_eabi_vfp/sys/dev/nvme/nvme_ns.c projects/arm_eabi_vfp/sys/dev/nvme/nvme_private.h projects/arm_eabi_vfp/sys/dev/nvme/nvme_test.c projects/arm_eabi_vfp/sys/dev/random/harvest.c projects/arm_eabi_vfp/sys/dev/random/hash.h projects/arm_eabi_vfp/sys/dev/random/ivy.c projects/arm_eabi_vfp/sys/dev/random/nehemiah.c projects/arm_eabi_vfp/sys/dev/random/random_adaptors.c projects/arm_eabi_vfp/sys/dev/random/random_adaptors.h projects/arm_eabi_vfp/sys/dev/random/random_harvestq.c projects/arm_eabi_vfp/sys/dev/random/random_harvestq.h projects/arm_eabi_vfp/sys/dev/random/randomdev.c projects/arm_eabi_vfp/sys/dev/random/randomdev.h projects/arm_eabi_vfp/sys/dev/random/randomdev_soft.c projects/arm_eabi_vfp/sys/dev/random/randomdev_soft.h projects/arm_eabi_vfp/sys/dev/random/yarrow.c projects/arm_eabi_vfp/sys/dev/random/yarrow.h projects/arm_eabi_vfp/sys/dev/rndtest/rndtest.c projects/arm_eabi_vfp/sys/dev/safe/safe.c projects/arm_eabi_vfp/sys/dev/syscons/scmouse.c projects/arm_eabi_vfp/sys/dev/syscons/syscons.c projects/arm_eabi_vfp/sys/dev/tws/tws.c projects/arm_eabi_vfp/sys/dev/tws/tws_cam.c projects/arm_eabi_vfp/sys/dev/ubsec/ubsec.c projects/arm_eabi_vfp/sys/dev/usb/controller/musb_otg.c projects/arm_eabi_vfp/sys/dev/usb/controller/musb_otg.h projects/arm_eabi_vfp/sys/dev/usb/controller/xhci.c projects/arm_eabi_vfp/sys/dev/usb/usbdevs projects/arm_eabi_vfp/sys/dev/usb/wlan/if_run.c projects/arm_eabi_vfp/sys/dev/usb/wlan/if_runreg.h projects/arm_eabi_vfp/sys/dev/virtio/network/if_vtnet.c projects/arm_eabi_vfp/sys/dev/vmware/vmxnet3/if_vmx.c projects/arm_eabi_vfp/sys/dev/vmware/vmxnet3/if_vmxvar.h projects/arm_eabi_vfp/sys/dev/xen/blkfront/blkfront.c projects/arm_eabi_vfp/sys/dev/xen/control/control.c projects/arm_eabi_vfp/sys/dev/xen/timer/timer.c projects/arm_eabi_vfp/sys/fs/cd9660/cd9660_vfsops.c projects/arm_eabi_vfp/sys/fs/devfs/devfs_vnops.c projects/arm_eabi_vfp/sys/geom/geom_dev.c projects/arm_eabi_vfp/sys/geom/geom_disk.c projects/arm_eabi_vfp/sys/geom/geom_int.h projects/arm_eabi_vfp/sys/geom/geom_io.c projects/arm_eabi_vfp/sys/geom/geom_kern.c projects/arm_eabi_vfp/sys/geom/geom_slice.c projects/arm_eabi_vfp/sys/geom/geom_subr.c projects/arm_eabi_vfp/sys/geom/label/g_label.c projects/arm_eabi_vfp/sys/geom/part/g_part.c projects/arm_eabi_vfp/sys/geom/part/g_part_apm.c projects/arm_eabi_vfp/sys/geom/part/g_part_bsd.c projects/arm_eabi_vfp/sys/geom/part/g_part_ebr.c projects/arm_eabi_vfp/sys/geom/part/g_part_gpt.c projects/arm_eabi_vfp/sys/geom/part/g_part_mbr.c projects/arm_eabi_vfp/sys/geom/part/g_part_pc98.c projects/arm_eabi_vfp/sys/geom/part/g_part_vtoc8.c projects/arm_eabi_vfp/sys/geom/raid/g_raid.c projects/arm_eabi_vfp/sys/geom/raid/g_raid.h projects/arm_eabi_vfp/sys/geom/raid/tr_concat.c projects/arm_eabi_vfp/sys/geom/raid/tr_raid0.c projects/arm_eabi_vfp/sys/geom/raid/tr_raid1.c projects/arm_eabi_vfp/sys/geom/raid/tr_raid1e.c projects/arm_eabi_vfp/sys/geom/raid/tr_raid5.c projects/arm_eabi_vfp/sys/i386/conf/GENERIC projects/arm_eabi_vfp/sys/i386/conf/NOTES projects/arm_eabi_vfp/sys/i386/i386/vm_machdep.c projects/arm_eabi_vfp/sys/i386/ibcs2/ibcs2_sysvec.c projects/arm_eabi_vfp/sys/i386/include/pcpu.h projects/arm_eabi_vfp/sys/i386/include/xen/xen-os.h projects/arm_eabi_vfp/sys/i386/xen/mp_machdep.c projects/arm_eabi_vfp/sys/i386/xen/mptable.c projects/arm_eabi_vfp/sys/kern/kern_descrip.c projects/arm_eabi_vfp/sys/kern/kern_event.c projects/arm_eabi_vfp/sys/kern/kern_exec.c projects/arm_eabi_vfp/sys/kern/kern_intr.c projects/arm_eabi_vfp/sys/kern/kern_lock.c projects/arm_eabi_vfp/sys/kern/kern_malloc.c projects/arm_eabi_vfp/sys/kern/kern_mbuf.c projects/arm_eabi_vfp/sys/kern/kern_rwlock.c projects/arm_eabi_vfp/sys/kern/kern_sx.c projects/arm_eabi_vfp/sys/kern/kern_synch.c projects/arm_eabi_vfp/sys/kern/kern_timeout.c projects/arm_eabi_vfp/sys/kern/makesyscalls.sh projects/arm_eabi_vfp/sys/kern/subr_bus.c projects/arm_eabi_vfp/sys/kern/subr_devstat.c projects/arm_eabi_vfp/sys/kern/subr_sbuf.c projects/arm_eabi_vfp/sys/kern/subr_taskqueue.c projects/arm_eabi_vfp/sys/kern/sys_generic.c projects/arm_eabi_vfp/sys/kern/uipc_sockbuf.c projects/arm_eabi_vfp/sys/kern/uipc_syscalls.c projects/arm_eabi_vfp/sys/kern/vfs_bio.c projects/arm_eabi_vfp/sys/kern/vfs_mount.c projects/arm_eabi_vfp/sys/kern/vfs_subr.c projects/arm_eabi_vfp/sys/libkern/arm/aeabi_unwind.c projects/arm_eabi_vfp/sys/libkern/ashldi3.c projects/arm_eabi_vfp/sys/mips/atheros/apb.c projects/arm_eabi_vfp/sys/mips/atheros/ar71xx_chip.c projects/arm_eabi_vfp/sys/mips/atheros/ar71xx_cpudef.h projects/arm_eabi_vfp/sys/mips/atheros/ar71xx_machdep.c projects/arm_eabi_vfp/sys/mips/atheros/ar71xx_spi.c projects/arm_eabi_vfp/sys/mips/atheros/ar71xxreg.h projects/arm_eabi_vfp/sys/mips/atheros/ar724x_chip.c projects/arm_eabi_vfp/sys/mips/atheros/ar91xx_chip.c projects/arm_eabi_vfp/sys/mips/atheros/ar933x_chip.c projects/arm_eabi_vfp/sys/mips/atheros/ar933xreg.h projects/arm_eabi_vfp/sys/mips/atheros/ar934x_chip.c projects/arm_eabi_vfp/sys/mips/atheros/ar934xreg.h projects/arm_eabi_vfp/sys/mips/atheros/if_arge.c projects/arm_eabi_vfp/sys/mips/atheros/if_argevar.h projects/arm_eabi_vfp/sys/mips/beri/beri_machdep.c projects/arm_eabi_vfp/sys/mips/beri/files.beri projects/arm_eabi_vfp/sys/mips/cavium/octeon_rnd.c projects/arm_eabi_vfp/sys/mips/conf/AR934X_BASE projects/arm_eabi_vfp/sys/mips/conf/DB120 projects/arm_eabi_vfp/sys/mips/conf/DB120.hints projects/arm_eabi_vfp/sys/mips/conf/MALTA projects/arm_eabi_vfp/sys/mips/include/asm.h projects/arm_eabi_vfp/sys/mips/include/cpuregs.h projects/arm_eabi_vfp/sys/mips/include/pcb.h projects/arm_eabi_vfp/sys/mips/mips/bcopy.S projects/arm_eabi_vfp/sys/mips/mips/bus_space_generic.c projects/arm_eabi_vfp/sys/mips/mips/elf_trampoline.c projects/arm_eabi_vfp/sys/mips/mips/exception.S projects/arm_eabi_vfp/sys/mips/mips/fp.S projects/arm_eabi_vfp/sys/mips/mips/support.S projects/arm_eabi_vfp/sys/mips/mips/swtch.S projects/arm_eabi_vfp/sys/mips/mips/tlb.c projects/arm_eabi_vfp/sys/mips/mips/vm_machdep.c projects/arm_eabi_vfp/sys/mips/nlm/dev/sec/nlmrsa.c projects/arm_eabi_vfp/sys/mips/nlm/dev/sec/nlmrsalib.h projects/arm_eabi_vfp/sys/modules/Makefile projects/arm_eabi_vfp/sys/modules/cxgb/Makefile projects/arm_eabi_vfp/sys/modules/cxgbe/Makefile projects/arm_eabi_vfp/sys/modules/cxgbe/t4_firmware/Makefile projects/arm_eabi_vfp/sys/modules/cxgbe/t5_firmware/Makefile projects/arm_eabi_vfp/sys/modules/dtrace/Makefile projects/arm_eabi_vfp/sys/modules/dtrace/fasttrap/Makefile projects/arm_eabi_vfp/sys/modules/hyperv/netvsc/Makefile projects/arm_eabi_vfp/sys/modules/hyperv/stordisengage/Makefile projects/arm_eabi_vfp/sys/modules/hyperv/storvsc/Makefile projects/arm_eabi_vfp/sys/modules/hyperv/utilities/Makefile projects/arm_eabi_vfp/sys/modules/hyperv/vmbus/Makefile projects/arm_eabi_vfp/sys/modules/mlx4/Makefile projects/arm_eabi_vfp/sys/modules/mlx4ib/Makefile projects/arm_eabi_vfp/sys/modules/random/Makefile projects/arm_eabi_vfp/sys/modules/rdma/Makefile projects/arm_eabi_vfp/sys/modules/sfxge/Makefile projects/arm_eabi_vfp/sys/net/flowtable.c projects/arm_eabi_vfp/sys/net/ieee8023ad_lacp.c projects/arm_eabi_vfp/sys/net/if.c projects/arm_eabi_vfp/sys/net/if.h projects/arm_eabi_vfp/sys/net/if_enc.c projects/arm_eabi_vfp/sys/net/if_ethersubr.c projects/arm_eabi_vfp/sys/net/if_lagg.c projects/arm_eabi_vfp/sys/net/if_tap.c projects/arm_eabi_vfp/sys/net/if_tun.c projects/arm_eabi_vfp/sys/net/if_var.h projects/arm_eabi_vfp/sys/net/radix.c projects/arm_eabi_vfp/sys/net/radix.h projects/arm_eabi_vfp/sys/net/route.c projects/arm_eabi_vfp/sys/net/rtsock.c projects/arm_eabi_vfp/sys/net80211/ieee80211_freebsd.c projects/arm_eabi_vfp/sys/netatalk/at_control.c projects/arm_eabi_vfp/sys/netgraph/ng_base.c projects/arm_eabi_vfp/sys/netgraph/ng_iface.c projects/arm_eabi_vfp/sys/netinet/in.c projects/arm_eabi_vfp/sys/netinet/in.h projects/arm_eabi_vfp/sys/netinet/in_kdtrace.c projects/arm_eabi_vfp/sys/netinet/in_var.h projects/arm_eabi_vfp/sys/netinet/ip_input.c projects/arm_eabi_vfp/sys/netinet/ip_output.c projects/arm_eabi_vfp/sys/netinet/sctp_constants.h projects/arm_eabi_vfp/sys/netinet/sctp_usrreq.c projects/arm_eabi_vfp/sys/netinet/tcp_input.c projects/arm_eabi_vfp/sys/netinet6/frag6.c projects/arm_eabi_vfp/sys/netinet6/in6.c projects/arm_eabi_vfp/sys/netinet6/in6_ifattach.c projects/arm_eabi_vfp/sys/netinet6/in6_var.h projects/arm_eabi_vfp/sys/netinet6/ip6_input.c projects/arm_eabi_vfp/sys/netinet6/ip6_mroute.c projects/arm_eabi_vfp/sys/netinet6/ip6_output.c projects/arm_eabi_vfp/sys/netipx/ipx.c projects/arm_eabi_vfp/sys/netipx/ipx_if.h projects/arm_eabi_vfp/sys/netpfil/ipfw/ip_fw_log.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/core/addr.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/core/cma.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/core/core_priv.h projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/core/device.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/core/sa_query.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/core/sysfs.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/core/ucm.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/core/umem.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/core/verbs.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/Kconfig projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/Makefile projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/cq.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/srq.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/user.h projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mlx4/wc.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/Makefile projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/alloc.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/catas.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/cmd.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/cq.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/en_cq.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/en_main.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/en_netdev.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/en_port.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/en_port.h projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/en_rx.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/en_tx.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/eq.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/fw.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/fw.h projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/icm.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/icm.h projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/intf.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/main.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/mcg.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/mlx4.h projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/mr.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/pd.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/port.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/profile.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/qp.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/reset.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/sense.c projects/arm_eabi_vfp/sys/ofed/drivers/net/mlx4/srq.c projects/arm_eabi_vfp/sys/ofed/include/asm/atomic.h projects/arm_eabi_vfp/sys/ofed/include/asm/byteorder.h projects/arm_eabi_vfp/sys/ofed/include/linux/bitops.h projects/arm_eabi_vfp/sys/ofed/include/linux/compat.h projects/arm_eabi_vfp/sys/ofed/include/linux/device.h projects/arm_eabi_vfp/sys/ofed/include/linux/dma-mapping.h projects/arm_eabi_vfp/sys/ofed/include/linux/gfp.h projects/arm_eabi_vfp/sys/ofed/include/linux/idr.h projects/arm_eabi_vfp/sys/ofed/include/linux/if_ether.h projects/arm_eabi_vfp/sys/ofed/include/linux/in6.h projects/arm_eabi_vfp/sys/ofed/include/linux/kernel.h projects/arm_eabi_vfp/sys/ofed/include/linux/linux_compat.c projects/arm_eabi_vfp/sys/ofed/include/linux/list.h projects/arm_eabi_vfp/sys/ofed/include/linux/log2.h projects/arm_eabi_vfp/sys/ofed/include/linux/mlx4/cmd.h projects/arm_eabi_vfp/sys/ofed/include/linux/mlx4/cq.h projects/arm_eabi_vfp/sys/ofed/include/linux/mlx4/device.h projects/arm_eabi_vfp/sys/ofed/include/linux/mlx4/driver.h projects/arm_eabi_vfp/sys/ofed/include/linux/mlx4/qp.h projects/arm_eabi_vfp/sys/ofed/include/linux/mlx4/srq.h projects/arm_eabi_vfp/sys/ofed/include/linux/moduleparam.h projects/arm_eabi_vfp/sys/ofed/include/linux/pci.h projects/arm_eabi_vfp/sys/ofed/include/linux/sysfs.h projects/arm_eabi_vfp/sys/ofed/include/linux/types.h projects/arm_eabi_vfp/sys/ofed/include/linux/workqueue.h projects/arm_eabi_vfp/sys/ofed/include/rdma/ib_cm.h projects/arm_eabi_vfp/sys/ofed/include/rdma/ib_mad.h projects/arm_eabi_vfp/sys/ofed/include/rdma/ib_sa.h projects/arm_eabi_vfp/sys/ofed/include/rdma/ib_umem.h projects/arm_eabi_vfp/sys/ofed/include/rdma/ib_user_verbs.h projects/arm_eabi_vfp/sys/ofed/include/rdma/ib_verbs.h projects/arm_eabi_vfp/sys/powerpc/aim/interrupt.c projects/arm_eabi_vfp/sys/powerpc/aim/trap.c projects/arm_eabi_vfp/sys/powerpc/aim/vm_machdep.c projects/arm_eabi_vfp/sys/powerpc/booke/vm_machdep.c projects/arm_eabi_vfp/sys/powerpc/conf/GENERIC64 projects/arm_eabi_vfp/sys/powerpc/include/ofw_machdep.h projects/arm_eabi_vfp/sys/powerpc/include/proc.h projects/arm_eabi_vfp/sys/powerpc/ofw/ofw_machdep.c projects/arm_eabi_vfp/sys/powerpc/ofw/ofw_syscons.c projects/arm_eabi_vfp/sys/powerpc/ofw/ofw_syscons.h projects/arm_eabi_vfp/sys/powerpc/powermac/ata_kauai.c projects/arm_eabi_vfp/sys/powerpc/powermac/ata_macio.c projects/arm_eabi_vfp/sys/powerpc/powermac/platform_powermac.c projects/arm_eabi_vfp/sys/powerpc/powerpc/mmu_if.m projects/arm_eabi_vfp/sys/powerpc/ps3/ps3cdrom.c projects/arm_eabi_vfp/sys/powerpc/pseries/mmu_phyp.c projects/arm_eabi_vfp/sys/powerpc/pseries/phyp-hvcall.S projects/arm_eabi_vfp/sys/powerpc/pseries/phyp_console.c projects/arm_eabi_vfp/sys/powerpc/pseries/platform_chrp.c projects/arm_eabi_vfp/sys/powerpc/pseries/vdevice.c projects/arm_eabi_vfp/sys/security/mac/mac_framework.c projects/arm_eabi_vfp/sys/security/mac/mac_internal.h projects/arm_eabi_vfp/sys/security/mac/mac_posix_shm.c projects/arm_eabi_vfp/sys/security/mac/mac_vfs.c projects/arm_eabi_vfp/sys/sparc64/include/proc.h projects/arm_eabi_vfp/sys/sparc64/sparc64/vm_machdep.c projects/arm_eabi_vfp/sys/sys/counter.h projects/arm_eabi_vfp/sys/sys/devicestat.h projects/arm_eabi_vfp/sys/sys/elf_common.h projects/arm_eabi_vfp/sys/sys/lockmgr.h projects/arm_eabi_vfp/sys/sys/param.h projects/arm_eabi_vfp/sys/sys/random.h projects/arm_eabi_vfp/sys/sys/sf_buf.h projects/arm_eabi_vfp/sys/sys/sockbuf.h projects/arm_eabi_vfp/sys/sys/systm.h projects/arm_eabi_vfp/sys/ufs/ufs/dinode.h projects/arm_eabi_vfp/sys/vm/vm_map.c projects/arm_eabi_vfp/sys/vm/vm_phys.c projects/arm_eabi_vfp/sys/x86/acpica/madt.c projects/arm_eabi_vfp/sys/x86/include/stdarg.h projects/arm_eabi_vfp/sys/x86/xen/hvm.c projects/arm_eabi_vfp/sys/x86/xen/xen_intr.c projects/arm_eabi_vfp/sys/xen/xen-os.h projects/arm_eabi_vfp/tools/build/mk/OptionalObsoleteFiles.inc projects/arm_eabi_vfp/tools/build/options/WITHOUT_BINUTILS projects/arm_eabi_vfp/tools/build/options/makeman projects/arm_eabi_vfp/tools/make_libdeps.sh projects/arm_eabi_vfp/tools/regression/lib/libutil/Makefile projects/arm_eabi_vfp/usr.bin/Makefile projects/arm_eabi_vfp/usr.bin/atf/Makefile projects/arm_eabi_vfp/usr.bin/atf/Makefile.inc projects/arm_eabi_vfp/usr.bin/calendar/calendar.1 projects/arm_eabi_vfp/usr.bin/calendar/calendars/calendar.dutch projects/arm_eabi_vfp/usr.bin/calendar/calendars/calendar.freebsd projects/arm_eabi_vfp/usr.bin/host/Makefile projects/arm_eabi_vfp/usr.bin/kdump/kdump.c projects/arm_eabi_vfp/usr.bin/netstat/if.c projects/arm_eabi_vfp/usr.bin/netstat/main.c projects/arm_eabi_vfp/usr.bin/netstat/mbuf.c projects/arm_eabi_vfp/usr.bin/netstat/netstat.h projects/arm_eabi_vfp/usr.bin/netstat/route.c projects/arm_eabi_vfp/usr.bin/patch/patch.c projects/arm_eabi_vfp/usr.bin/patch/util.c projects/arm_eabi_vfp/usr.bin/rpcinfo/rpcinfo.c projects/arm_eabi_vfp/usr.bin/svn/lib/libapr/apr_private.h projects/arm_eabi_vfp/usr.bin/svn/svn_private_config.h projects/arm_eabi_vfp/usr.bin/systat/netcmds.c projects/arm_eabi_vfp/usr.bin/uname/uname.1 projects/arm_eabi_vfp/usr.bin/uname/uname.c projects/arm_eabi_vfp/usr.sbin/Makefile projects/arm_eabi_vfp/usr.sbin/arp/arp.c projects/arm_eabi_vfp/usr.sbin/bhyve/Makefile projects/arm_eabi_vfp/usr.sbin/bhyve/bhyverun.c projects/arm_eabi_vfp/usr.sbin/bhyve/bhyverun.h projects/arm_eabi_vfp/usr.sbin/bhyve/dbgport.h projects/arm_eabi_vfp/usr.sbin/bhyve/mptbl.c projects/arm_eabi_vfp/usr.sbin/bhyve/pci_emul.c projects/arm_eabi_vfp/usr.sbin/bhyve/pci_hostbridge.c projects/arm_eabi_vfp/usr.sbin/bhyve/pci_virtio_block.c projects/arm_eabi_vfp/usr.sbin/bhyve/pci_virtio_net.c projects/arm_eabi_vfp/usr.sbin/bhyve/pit_8254.c projects/arm_eabi_vfp/usr.sbin/bhyve/rtc.c projects/arm_eabi_vfp/usr.sbin/bhyve/spinup_ap.c projects/arm_eabi_vfp/usr.sbin/bhyvectl/Makefile projects/arm_eabi_vfp/usr.sbin/bhyvectl/bhyvectl.c projects/arm_eabi_vfp/usr.sbin/bhyveload/Makefile projects/arm_eabi_vfp/usr.sbin/bhyveload/bhyveload.8 projects/arm_eabi_vfp/usr.sbin/bhyveload/bhyveload.c projects/arm_eabi_vfp/usr.sbin/boot0cfg/boot0cfg.8 projects/arm_eabi_vfp/usr.sbin/bootparamd/bootparamd/main.c projects/arm_eabi_vfp/usr.sbin/bootparamd/callbootd/callbootd.c projects/arm_eabi_vfp/usr.sbin/bsdconfig/bsdconfig projects/arm_eabi_vfp/usr.sbin/bsdconfig/console/ttys projects/arm_eabi_vfp/usr.sbin/bsdconfig/examples/Makefile projects/arm_eabi_vfp/usr.sbin/bsdconfig/include/messages.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/mouse/enable projects/arm_eabi_vfp/usr.sbin/bsdconfig/networking/devices projects/arm_eabi_vfp/usr.sbin/bsdconfig/networking/share/device.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/networking/share/hostname.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/networking/share/media.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/networking/share/netmask.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/networking/share/resolv.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/networking/share/routing.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/password/share/password.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/security/kern_securelevel projects/arm_eabi_vfp/usr.sbin/bsdconfig/security/security projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/Makefile projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/common.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/device.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/dialog.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/media/any.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/media/cdrom.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/media/common.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/media/dos.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/media/floppy.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/media/ftp.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/media/http.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/media/nfs.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/media/options.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/media/tcpip.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/media/ufs.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/media/usb.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/mustberoot.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/packages/packages.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/strings.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/share/variable.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/startup/misc projects/arm_eabi_vfp/usr.sbin/bsdconfig/startup/rcconf projects/arm_eabi_vfp/usr.sbin/bsdconfig/startup/rcdelete projects/arm_eabi_vfp/usr.sbin/bsdconfig/startup/rcvar projects/arm_eabi_vfp/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/startup/share/rcedit.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/timezone/timezone projects/arm_eabi_vfp/usr.sbin/bsdconfig/usermgmt/groupdel projects/arm_eabi_vfp/usr.sbin/bsdconfig/usermgmt/groupedit projects/arm_eabi_vfp/usr.sbin/bsdconfig/usermgmt/groupinput projects/arm_eabi_vfp/usr.sbin/bsdconfig/usermgmt/share/group_input.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/usermgmt/share/user_input.subr projects/arm_eabi_vfp/usr.sbin/bsdconfig/usermgmt/userdel projects/arm_eabi_vfp/usr.sbin/bsdconfig/usermgmt/useredit projects/arm_eabi_vfp/usr.sbin/bsdconfig/usermgmt/userinput projects/arm_eabi_vfp/usr.sbin/bsdconfig/usermgmt/usermgmt projects/arm_eabi_vfp/usr.sbin/bsdinstall/bsdinstall projects/arm_eabi_vfp/usr.sbin/bsdinstall/bsdinstall.8 projects/arm_eabi_vfp/usr.sbin/bsdinstall/partedit/gpart_ops.c projects/arm_eabi_vfp/usr.sbin/bsdinstall/partedit/partedit_powerpc.c projects/arm_eabi_vfp/usr.sbin/bsdinstall/scripts/Makefile projects/arm_eabi_vfp/usr.sbin/bsdinstall/scripts/auto projects/arm_eabi_vfp/usr.sbin/bsdinstall/scripts/config projects/arm_eabi_vfp/usr.sbin/bsdinstall/scripts/jail projects/arm_eabi_vfp/usr.sbin/bsdinstall/scripts/keymap projects/arm_eabi_vfp/usr.sbin/bsdinstall/scripts/mirrorselect projects/arm_eabi_vfp/usr.sbin/bsdinstall/scripts/netconfig projects/arm_eabi_vfp/usr.sbin/bsdinstall/scripts/script projects/arm_eabi_vfp/usr.sbin/bsdinstall/scripts/services projects/arm_eabi_vfp/usr.sbin/ctladm/ctladm.c projects/arm_eabi_vfp/usr.sbin/ctld/kernel.c projects/arm_eabi_vfp/usr.sbin/ctld/login.c projects/arm_eabi_vfp/usr.sbin/freebsd-update/freebsd-update.sh projects/arm_eabi_vfp/usr.sbin/ifmcstat/ifmcstat.c projects/arm_eabi_vfp/usr.sbin/iscsid/discovery.c projects/arm_eabi_vfp/usr.sbin/jail/command.c projects/arm_eabi_vfp/usr.sbin/jail/config.c projects/arm_eabi_vfp/usr.sbin/jail/jail.8 projects/arm_eabi_vfp/usr.sbin/jail/jail.c projects/arm_eabi_vfp/usr.sbin/jail/jailp.h projects/arm_eabi_vfp/usr.sbin/kldxref/kldxref.c projects/arm_eabi_vfp/usr.sbin/ntp/config.h projects/arm_eabi_vfp/usr.sbin/ntp/libparse/Makefile projects/arm_eabi_vfp/usr.sbin/pkg/Makefile projects/arm_eabi_vfp/usr.sbin/pkg/config.c projects/arm_eabi_vfp/usr.sbin/pkg/pkg.c projects/arm_eabi_vfp/usr.sbin/ppp/mppe.c projects/arm_eabi_vfp/usr.sbin/unbound/Makefile projects/arm_eabi_vfp/usr.sbin/ypset/ypset.c Directory Properties: projects/arm_eabi_vfp/ (props changed) projects/arm_eabi_vfp/cddl/ (props changed) projects/arm_eabi_vfp/cddl/contrib/opensolaris/ (props changed) projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/arm_eabi_vfp/contrib/binutils/ (props changed) projects/arm_eabi_vfp/contrib/bmake/ (props changed) projects/arm_eabi_vfp/contrib/dialog/ (props changed) projects/arm_eabi_vfp/contrib/ipfilter/ (props changed) projects/arm_eabi_vfp/contrib/ldns/ (props changed) projects/arm_eabi_vfp/contrib/libc++/ (props changed) projects/arm_eabi_vfp/contrib/libcxxrt/ (props changed) projects/arm_eabi_vfp/contrib/llvm/ (props changed) projects/arm_eabi_vfp/contrib/llvm/tools/clang/ (props changed) projects/arm_eabi_vfp/contrib/mtree/ (props changed) projects/arm_eabi_vfp/contrib/unbound/ (props changed) projects/arm_eabi_vfp/crypto/openssh/ (props changed) projects/arm_eabi_vfp/gnu/lib/ (props changed) projects/arm_eabi_vfp/gnu/usr.bin/binutils/ (props changed) projects/arm_eabi_vfp/gnu/usr.bin/cc/cc_tools/ (props changed) projects/arm_eabi_vfp/lib/libc/ (props changed) projects/arm_eabi_vfp/lib/libutil/ (props changed) projects/arm_eabi_vfp/lib/libvmmapi/ (props changed) projects/arm_eabi_vfp/lib/libz/ (props changed) projects/arm_eabi_vfp/sbin/ (props changed) projects/arm_eabi_vfp/share/man/man4/ (props changed) projects/arm_eabi_vfp/sys/ (props changed) projects/arm_eabi_vfp/sys/amd64/vmm/ (props changed) projects/arm_eabi_vfp/sys/boot/ (props changed) projects/arm_eabi_vfp/sys/boot/i386/efi/ (props changed) projects/arm_eabi_vfp/sys/boot/powerpc/boot1.chrp/ (props changed) projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/ (props changed) projects/arm_eabi_vfp/sys/conf/ (props changed) projects/arm_eabi_vfp/sys/contrib/ipfilter/ (props changed) projects/arm_eabi_vfp/sys/dev/hyperv/ (props changed) projects/arm_eabi_vfp/sys/modules/hyperv/ (props changed) projects/arm_eabi_vfp/usr.bin/calendar/ (props changed) projects/arm_eabi_vfp/usr.sbin/bhyve/ (props changed) projects/arm_eabi_vfp/usr.sbin/bhyvectl/ (props changed) projects/arm_eabi_vfp/usr.sbin/bhyveload/ (props changed) projects/arm_eabi_vfp/usr.sbin/bsdinstall/scripts/docsinstall (props changed) projects/arm_eabi_vfp/usr.sbin/jail/ (props changed) Modified: projects/arm_eabi_vfp/Makefile.inc1 ============================================================================== --- projects/arm_eabi_vfp/Makefile.inc1 Sun Oct 20 11:55:39 2013 (r256783) +++ projects/arm_eabi_vfp/Makefile.inc1 Sun Oct 20 12:50:13 2013 (r256784) @@ -331,7 +331,7 @@ TARGET_ABI= gnueabihf .else TARGET_ABI= unknown .endif -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XFLAGS+= -target ${TARGET_TRIPLE} .endif .endif @@ -397,7 +397,7 @@ LIB32WMAKEFLAGS+= \ -DNO_LINT LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \ - -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML + -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \ ${IMAKE_INSTALL} .endif @@ -487,10 +487,6 @@ _worldtmp: mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${WORLDTMP}/usr/lib >/dev/null .endif -.if ${MK_BIND_LIBS} != "no" - mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \ - -p ${WORLDTMP}/usr/include >/dev/null -.endif .for _mtree in ${LOCAL_MTREE} mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null .endfor @@ -1091,9 +1087,11 @@ distributekernel distributekernel.debug: KERNEL=${INSTKERNNAME}.${_kernel} \ DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \ ${.TARGET:S/distributekernel/install/} +.if defined(NO_ROOT) sed -e 's|^./kernel|.|' \ ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \ ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta +.endif .endfor packagekernel: @@ -1742,7 +1740,7 @@ check-old-libs: delete-old-dirs: @echo ">>> Removing old directories" @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_DIRS | xargs -n1 | \ + -V OLD_DIRS | xargs -n1 | sort -r | \ while read dir; do \ if [ -d "${DESTDIR}/$${dir}" ]; then \ rmdir -v "${DESTDIR}/$${dir}" || true; \ @@ -1834,7 +1832,7 @@ NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOU CPUTYPE=${XDEV_CPUTYPE} XDDIR=${XDEV_ARCH}-freebsd -XDTP=/usr/${XDDIR} +XDTP=usr/${XDDIR} CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ @@ -1847,8 +1845,8 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN} -CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN} -XDDESTDIR=${DESTDIR}${XDTP} +CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN} +XDDESTDIR=${DESTDIR}/${XDTP} .if !defined(OSREL) OSREL!= uname -r | sed -e 's/[-(].*//' .endif @@ -1928,6 +1926,7 @@ _xi-libraries: _xi-links: ${_+_}cd ${XDDESTDIR}/usr/bin; \ + mkdir -p ../../../../usr/bin; \ for i in *; do \ ln -sf ../../${XDTP}/usr/bin/$$i \ ../../../../usr/bin/${XDDIR}-$$i; \ Modified: projects/arm_eabi_vfp/ObsoleteFiles.inc ============================================================================== --- projects/arm_eabi_vfp/ObsoleteFiles.inc Sun Oct 20 11:55:39 2013 (r256783) +++ projects/arm_eabi_vfp/ObsoleteFiles.inc Sun Oct 20 12:50:13 2013 (r256784) @@ -38,6 +38,273 @@ # xargs -n1 | sort | uniq -d; # done +# 20131014: libbsdyml becomes private +OLD_FILES+=usr/lib/libbsdyml.a +OLD_FILES+=usr/lib/libbsdyml.so +OLD_LIBS+=usr/lib/libbsdyml.so.0 +OLD_FILES+=usr/lib/libbsdyml_p.a +OLD_FILES+=usr/lib32/libbsdyml.a +OLD_FILES+=usr/lib32/libbsdyml.so +OLD_LIBS+=usr/lib32/libbsdyml.so.0 +OLD_FILES+=usr/lib32/libbsdyml_p.a +OLD_FILES+=usr/share/man/man3/libbsdyml.3.gz +OLD_FILES+=usr/include/bsdyml.h +# 20131013: Removal of the ATF tools +OLD_FILES+=etc/atf/FreeBSD.conf +OLD_FILES+=etc/atf/atf-run.hooks +OLD_FILES+=etc/atf/common.conf +OLD_FILES+=usr/bin/atf-config +OLD_FILES+=usr/bin/atf-report +OLD_FILES+=usr/bin/atf-run +OLD_FILES+=usr/bin/atf-version +OLD_FILES+=usr/share/atf/atf-run.hooks +OLD_FILES+=usr/share/examples/atf/atf-run.hooks +OLD_FILES+=usr/share/examples/atf/tests-results.css +OLD_FILES+=usr/share/man/man1/atf-config.1.gz +OLD_FILES+=usr/share/man/man1/atf-report.1.gz +OLD_FILES+=usr/share/man/man1/atf-run.1.gz +OLD_FILES+=usr/share/man/man1/atf-version.1.gz +OLD_FILES+=usr/share/man/man5/atf-formats.5.gz +OLD_FILES+=usr/share/man/man7/atf.7.gz +OLD_FILES+=usr/share/xml/atf/tests-results.dtd +OLD_FILES+=usr/share/xsl/atf/tests-results.xsl +# 20131009: freebsd-version moved from /libexec to /bin +OLD_FILES+=libexec/freebsd-version +# 20131001: ar and ranlib from binutils not used +OLD_FILES+=usr/bin/gnu-ar +OLD_FILES+=usr/bin/gnu-ranlib +OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz +OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz +# 20130930: BIND removed from base +OLD_FILES+=etc/namedb +OLD_FILES+=etc/periodic/daily/470.status-named +OLD_FILES+=usr/bin/dig +OLD_FILES+=usr/bin/nslookup +OLD_FILES+=usr/bin/nsupdate +OLD_DIRS+=usr/include/lwres +OLD_FILES+=usr/include/lwres/context.h +OLD_FILES+=usr/include/lwres/int.h +OLD_FILES+=usr/include/lwres/ipv6.h +OLD_FILES+=usr/include/lwres/lang.h +OLD_FILES+=usr/include/lwres/list.h +OLD_FILES+=usr/include/lwres/lwbuffer.h +OLD_FILES+=usr/include/lwres/lwpacket.h +OLD_FILES+=usr/include/lwres/lwres.h +OLD_FILES+=usr/include/lwres/net.h +OLD_FILES+=usr/include/lwres/netdb.h +OLD_FILES+=usr/include/lwres/platform.h +OLD_FILES+=usr/include/lwres/result.h +OLD_FILES+=usr/include/lwres/version.h +OLD_FILES+=usr/lib/liblwres.a +OLD_FILES+=usr/lib/liblwres.so +OLD_LIBS+=usr/lib/liblwres.so.90 +OLD_FILES+=usr/lib/liblwres_p.a +OLD_FILES+=usr/sbin/arpaname +OLD_FILES+=usr/sbin/ddns-confgen +OLD_FILES+=usr/sbin/dnssec-dsfromkey +OLD_FILES+=usr/sbin/dnssec-keyfromlabel +OLD_FILES+=usr/sbin/dnssec-keygen +OLD_FILES+=usr/sbin/dnssec-revoke +OLD_FILES+=usr/sbin/dnssec-settime +OLD_FILES+=usr/sbin/dnssec-signzone +OLD_FILES+=usr/sbin/dnssec-verify +OLD_FILES+=usr/sbin/genrandom +OLD_FILES+=usr/sbin/isc-hmac-fixup +OLD_FILES+=usr/sbin/lwresd +OLD_FILES+=usr/sbin/named +OLD_FILES+=usr/sbin/named-checkconf +OLD_FILES+=usr/sbin/named-checkzone +OLD_FILES+=usr/sbin/named-compilezone +OLD_FILES+=usr/sbin/named-journalprint +OLD_FILES+=usr/sbin/named.reconfig +OLD_FILES+=usr/sbin/named.reload +OLD_FILES+=usr/sbin/nsec3hash +OLD_FILES+=usr/sbin/rndc +OLD_FILES+=usr/sbin/rndc-confgen +OLD_DIRS+=usr/share/doc/bind9 +OLD_FILES+=usr/share/doc/bind9/CHANGES +OLD_FILES+=usr/share/doc/bind9/COPYRIGHT +OLD_FILES+=usr/share/doc/bind9/FAQ +OLD_FILES+=usr/share/doc/bind9/HISTORY +OLD_FILES+=usr/share/doc/bind9/README +OLD_DIRS+=usr/share/doc/bind9/arm +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch01.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch02.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch03.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch04.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch05.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch06.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch07.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch08.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch09.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch10.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.html +OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.pdf +OLD_FILES+=usr/share/doc/bind9/arm/man.arpaname.html +OLD_FILES+=usr/share/doc/bind9/arm/man.ddns-confgen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dig.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-dsfromkey.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keyfromlabel.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keygen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-revoke.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-settime.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-signzone.html +OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-verify.html +OLD_FILES+=usr/share/doc/bind9/arm/man.genrandom.html +OLD_FILES+=usr/share/doc/bind9/arm/man.host.html +OLD_FILES+=usr/share/doc/bind9/arm/man.isc-hmac-fixup.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkconf.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkzone.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named-journalprint.html +OLD_FILES+=usr/share/doc/bind9/arm/man.named.html +OLD_FILES+=usr/share/doc/bind9/arm/man.nsec3hash.html +OLD_FILES+=usr/share/doc/bind9/arm/man.nsupdate.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc-confgen.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.conf.html +OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.html +OLD_DIRS+=usr/share/doc/bind9/misc +OLD_FILES+=usr/share/doc/bind9/misc/dnssec +OLD_FILES+=usr/share/doc/bind9/misc/format-options.pl +OLD_FILES+=usr/share/doc/bind9/misc/ipv6 +OLD_FILES+=usr/share/doc/bind9/misc/migration +OLD_FILES+=usr/share/doc/bind9/misc/migration-4to9 +OLD_FILES+=usr/share/doc/bind9/misc/options +OLD_FILES+=usr/share/doc/bind9/misc/rfc-compliance +OLD_FILES+=usr/share/doc/bind9/misc/roadmap +OLD_FILES+=usr/share/doc/bind9/misc/sdb +OLD_FILES+=usr/share/doc/bind9/misc/sort-options.pl +OLD_FILES+=usr/share/man/man1/arpaname.1.gz +OLD_FILES+=usr/share/man/man1/dig.1.gz +OLD_FILES+=usr/share/man/man1/nslookup.1.gz +OLD_FILES+=usr/share/man/man1/nsupdate.1.gz +OLD_FILES+=usr/share/man/man3/lwres.3.gz +OLD_FILES+=usr/share/man/man3/lwres_addr_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_add.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_back.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_clear.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_first.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_forward.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint16.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint32.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint8.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_init.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_invalidate.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint16.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint32.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint8.3.gz +OLD_FILES+=usr/share/man/man3/lwres_buffer_subtract.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_clear.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_get.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_init.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_conf_print.3.gz +OLD_FILES+=usr/share/man/man3/lwres_config.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_allocmem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_create.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_destroy.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_freemem.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_initserial.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_nextserial.3.gz +OLD_FILES+=usr/share/man/man3/lwres_context_sendrecv.3.gz +OLD_FILES+=usr/share/man/man3/lwres_endhostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_endhostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_freeaddrinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_freehostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabn.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gai_strerror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getaddrinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getaddrsbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname2.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostbyname_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gethostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnode.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnodebyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getipnodebyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getnamebyaddr.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getnameinfo.3.gz +OLD_FILES+=usr/share/man/man3/lwres_getrrsetbyname.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnba.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_herror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_hstrerror.3.gz +OLD_FILES+=usr/share/man/man3/lwres_inetntop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_lwpacket_parseheader.3.gz +OLD_FILES+=usr/share/man/man3/lwres_lwpacket_renderheader.3.gz +OLD_FILES+=usr/share/man/man3/lwres_net_ntop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noop.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_nooprequest_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_free.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_parse.3.gz +OLD_FILES+=usr/share/man/man3/lwres_noopresponse_render.3.gz +OLD_FILES+=usr/share/man/man3/lwres_packet.3.gz +OLD_FILES+=usr/share/man/man3/lwres_resutil.3.gz +OLD_FILES+=usr/share/man/man3/lwres_sethostent.3.gz +OLD_FILES+=usr/share/man/man3/lwres_sethostent_r.3.gz +OLD_FILES+=usr/share/man/man3/lwres_string_parse.3.gz +OLD_FILES+=usr/share/man/man5/named.conf.5.gz +OLD_FILES+=usr/share/man/man5/rndc.conf.5.gz +OLD_FILES+=usr/share/man/man8/ddns-confgen.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-dsfromkey.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-keyfromlabel.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz +OLD_FILES+=usr/share/man/man8/genrandom.8.gz +OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz +OLD_FILES+=usr/share/man/man8/lwresd.8.gz +OLD_FILES+=usr/share/man/man8/named-checkconf.8.gz +OLD_FILES+=usr/share/man/man8/named-checkzone.8.gz +OLD_FILES+=usr/share/man/man8/named-compilezone.8.gz +OLD_FILES+=usr/share/man/man8/named-journalprint.8.gz +OLD_FILES+=usr/share/man/man8/named.8.gz +OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz +OLD_FILES+=usr/share/man/man8/named.reload.8.gz +OLD_FILES+=usr/share/man/man8/nsec3hash.8.gz +OLD_FILES+=usr/share/man/man8/rndc-confgen.8.gz +OLD_FILES+=usr/share/man/man8/rndc.8.gz +OLD_DIRS+=var/named/dev +OLD_DIRS+=var/named/etc +OLD_DIRS+=var/named/etc/namedb +OLD_FILES+=var/named/etc/namedb/PROTO.localhost-v6.rev +OLD_FILES+=var/named/etc/namedb/PROTO.localhost.rev +OLD_DIRS+=var/named/etc/namedb/dynamic +OLD_FILES+=var/named/etc/namedb/make-localhost +OLD_DIRS+=var/named/etc/namedb/master +OLD_FILES+=var/named/etc/namedb/master/empty.db +OLD_FILES+=var/named/etc/namedb/master/localhost-forward.db +OLD_FILES+=var/named/etc/namedb/master/localhost-reverse.db +#OLD_FILES+=var/named/etc/namedb/named.conf # intentionally left out +OLD_FILES+=var/named/etc/namedb/named.root +OLD_DIRS+=var/named/etc/namedb/slave +OLD_DIRS+=var/named/var +OLD_DIRS+=var/named/var/dump +OLD_DIRS+=var/named/var/log +OLD_DIRS+=var/named/var/run +OLD_DIRS+=var/named/var/run/named +OLD_DIRS+=var/named/var/stats +OLD_DIRS+=var/run/named # 20130908: libssh becomes private OLD_FILES+=usr/lib/libssh.a OLD_FILES+=usr/lib/libssh.so @@ -5857,6 +6124,13 @@ OLD_LIBS+=usr/lib/libkse.so.1 OLD_LIBS+=usr/lib/liblwres.so.3 OLD_LIBS+=usr/lib/pam_ftp.so.2 +# 20131013: Removal of the ATF tools +OLD_DIRS+=etc/atf +OLD_DIRS+=usr/share/examples/atf +OLD_DIRS+=usr/share/xml/atf +OLD_DIRS+=usr/share/xml +OLD_DIRS+=usr/share/xsl/atf +OLD_DIRS+=usr/share/xsl # 20040925: bind9 import OLD_DIRS+=usr/share/doc/bind/html OLD_DIRS+=usr/share/doc/bind/misc Modified: projects/arm_eabi_vfp/UPDATING ============================================================================== --- projects/arm_eabi_vfp/UPDATING Sun Oct 20 11:55:39 2013 (r256783) +++ projects/arm_eabi_vfp/UPDATING Sun Oct 20 12:50:13 2013 (r256784) @@ -16,8 +16,8 @@ from older versions of FreeBSD, try WITH 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 +NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW: + FreeBSD 11.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They also substantially impact @@ -31,6 +31,40 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131014: + libbsdyml has been renamed to libyaml and moved to /usr/lib/private. + This will break ports-mgmt/pkg. Rebuild the port, or upgrade to pkg + 1.1.4_8 and verify bsdyml not linked in, before running "make + delete-old-libs": + # make -C /usr/ports/ports-mgmt/pkg build deinstall install clean + or + # pkg install pkg; ldd /usr/local/sbin/pkg | grep bsdyml + +20131010: + The rc.d/jail script has been updated to support jail(8) + configuration file. The "jail__*" rc.conf(5) variables + for per-jail configuration are automatically converted to + /var/run/jail..conf before the jail(8) utility is invoked. + This is transparently backward compatible. See below about some + incompatibilities and rc.conf(5) manual page for more details. + + These variables are now deprecated in favor of jail(8) configuration + file. One can use "rc.d/jail config " command to generate + a jail(8) configuration file in /var/run/jail..conf without + running the jail(8) utility. The default pathname of the + configuration file is /etc/jail.conf and can be specified by + using $jail_conf or $jail__conf variables. + + Please note that jail_devfs_ruleset accepts an integer at + this moment. Please consider to rewrite the ruleset name + with an integer. + +20130930: + BIND has been removed from the base system. If all you need + is a local resolver, simply enable and start the local_unbound + service instead. Otherwise, several versions of BIND are + available in the ports tree. + 20130916: With the addition of unbound(8), a new unbound user is now required during installworld. "mergemaster -p" can be used to @@ -67,19 +101,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 has been updated to use this support. A new gcc is required to build the aesni module on both i386 and amd64. -20130827: - Thomas Dickey (vendor author thereof) reports that dialog(1) since - 2011/10/18 has a bug in handling --hline. Testers and I noticed the - --hline is not ignored but displayed as a NULL string, regardless of - value. This will cause confusion in some bsdconfig dialogs where the - --hline is used to inform users which keybindings to use. This will - likewise affect any other persons relying on --hline. It also looks - rather strange seeing "[]" at the bottom of dialog(1) widgets when - passing --hline "anything". Thomas said he will have a look in a few - weeks. NOTE: The "[]" brackets appear with the left-edge where it - would normally appear given the width of text to display, but the - displayed text is not there (part of the bug). - 20130821: The PADLOCK_RNG and RDRAND_RNG kernel options are now devices. Thus "device padlock_rng" and "device rdrand_rng" should be Modified: projects/arm_eabi_vfp/bin/Makefile ============================================================================== --- projects/arm_eabi_vfp/bin/Makefile Sun Oct 20 11:55:39 2013 (r256783) +++ projects/arm_eabi_vfp/bin/Makefile Sun Oct 20 12:50:13 2013 (r256784) @@ -15,6 +15,7 @@ SUBDIR= cat \ echo \ ed \ expr \ + freebsd-version \ getfacl \ hostname \ kenv \ Modified: projects/arm_eabi_vfp/bin/dd/dd.1 ============================================================================== --- projects/arm_eabi_vfp/bin/dd/dd.1 Sun Oct 20 11:55:39 2013 (r256783) +++ projects/arm_eabi_vfp/bin/dd/dd.1 Sun Oct 20 12:50:13 2013 (r256784) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd January 23, 2009 +.Dd October 1, 2013 .Dt DD 1 .Os .Sh NAME @@ -378,12 +378,12 @@ will exit. .Sh EXAMPLES Check that a disk drive contains no bad blocks: .Pp -.Dl "dd if=/dev/ad0 of=/dev/null bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/null bs=1m" .Pp Do a refresh of a disk drive, in order to prevent presently recoverable read errors from progressing into unrecoverable read errors: .Pp -.Dl "dd if=/dev/ad0 of=/dev/ad0 bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/ada0 bs=1m" .Pp Remove parity bit from a file: .Pp Modified: projects/arm_eabi_vfp/bin/pkill/pkill.c ============================================================================== --- projects/arm_eabi_vfp/bin/pkill/pkill.c Sun Oct 20 11:55:39 2013 (r256783) +++ projects/arm_eabi_vfp/bin/pkill/pkill.c Sun Oct 20 12:50:13 2013 (r256784) @@ -481,7 +481,6 @@ main(int argc, char **argv) * We skip P_SYSTEM processes to match ps(1) output. */ if ((kp->ki_flag & P_SYSTEM) == 0 && - kp->ki_loginclass != NULL && strcmp(kp->ki_loginclass, li->li_name) == 0) break; } Modified: projects/arm_eabi_vfp/bin/sh/jobs.c ============================================================================== --- projects/arm_eabi_vfp/bin/sh/jobs.c Sun Oct 20 11:55:39 2013 (r256783) +++ projects/arm_eabi_vfp/bin/sh/jobs.c Sun Oct 20 12:50:13 2013 (r256784) @@ -978,7 +978,6 @@ int waitforjob(struct job *jp, int *origstatus) { #if JOBS - pid_t mypgrp = getpgrp(); int propagate_int = jp->jobctl && jp->foreground; #endif int status; @@ -992,7 +991,7 @@ waitforjob(struct job *jp, int *origstat dotrap(); #if JOBS if (jp->jobctl) { - if (tcsetpgrp(ttyfd, mypgrp) < 0) + if (tcsetpgrp(ttyfd, rootpid) < 0) error("tcsetpgrp failed, errno=%d\n", errno); } if (jp->state == JOBSTOPPED) Modified: projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ============================================================================== --- projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Sun Oct 20 11:55:39 2013 (r256783) +++ projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Sun Oct 20 12:50:13 2013 (r256784) @@ -2,7 +2,7 @@ .\" CDDL HEADER START .\" .\" The contents of this file are subject to the terms of the -.\" Common Development and Distribution License (the "License"). +.\" 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 @@ -18,653 +18,660 @@ .\" .\" CDDL HEADER END .\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved. -.TH dtrace 1M "5 Sep 2006" "SunOS 5.11" "System Administration Commands" -.SH NAME -dtrace \- DTrace dynamic tracing compiler and tracing utility -.SH SYNOPSIS -.LP -.nf -\fBdtrace\fR [\fB-32\fR | \fB-64\fR] [\fB-aACeFGHhlqSvVwZ\fR] [\fB-b\fR \fIbufsz\fR] [\fB-c\fR \fIcmd\fR] - [\fB-D\fR \fIname\fR [\fI=value\fR]] [\fB-I\fR \fIpath\fR] [\fB-L\fR \fIpath\fR] [\fB-o\fR \fIoutput\fR] - [\fB-s\fR \fIscript\fR] [\fB-U\fR \fIname\fR] [\fB-x\fR \fIarg\fR [\fI=val\fR]] - [\fB-X\fR a | c | s | t] [\fB-p\fR \fIpid\fR] - [\fB-P\fR \fIprovider\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-m\fR [\fIprovider:\fR] \fImodule\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-f\fR [[\fIprovider:\fR] \fImodule:\fR] \fIfunction\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-i\fR \fIprobe-id\fR [[\fIpredicate\fR] \fIaction\fR]] -.fi - -.SH DESCRIPTION -.sp -.LP -DTrace is a comprehensive dynamic tracing framework for the Solaris Operating System. DTrace provides a powerful infrastructure that permits administrators, developers, and service personnel to concisely answer arbitrary questions about the behavior of the operating system and user programs. -.sp -.LP -The \fISolaris Dynamic Tracing Guide\fR describes how to use DTrace to observe, debug, and tune system behavior. Refer to this book for a detailed description of DTrace features, including the bundled DTrace observability -tools, instrumentation providers, and the D programming language. -.sp -.LP -The \fBdtrace\fR command provides a generic interface to the essential services provided by the DTrace facility, including: -.RS +4 -.TP -.ie t \(bu -.el o +.\" +.\" $FreeBSD$ +.\" +.Dd October 5, 2013 +.Dt DTRACE 1 +.Os +.Sh NAME +.Nm dtrace +.Nd dynamic tracing compiler and tracing utility +.Sh SYNOPSIS +.Nm +.Op Fl 32 | Fl 64 +.Op Fl aACeFGhHlqSvVwZ +.Op Fl b Ar bufsz +.Op Fl c Ar cmd +.Op Fl D Ar name Op Ns = Ns value +.Op Fl I Ar path +.Op Fl L Ar path +.Op Fl o Ar output +.Op Fl s Ar script +.Op Fl U Ar name +.Op Fl x Ar arg Op Ns = Ns value +.Op Fl X Cm a | c | s | t +.Op Fl p Ar pid +.Op Fl P Ar provider Oo Oo Ar predicate Oc Ar action Oc +.Op Fl m Oo Ar provider : Oc Ar module Oo Oo Ar predicate Oc Ar action Oc +.Op Fl f Oo Oo Ar provider : Oc Ar module : Oc Ar function Oo Oo Ar predicate \ + Oc Ar action Oc +.Op Fl n Oo Oo Oo Ar provider : Oc Ar module : Oc Ar function : Oc Ar name \ + Oo Oo Ar predicate Oc Ar action Oc +.Op Fl i Ar probe-id Oo Oo Ar predicate Oc Ar action Oc +.Sh DESCRIPTION +DTrace is a comprehensive dynamic tracing framework ported from Solaris. +DTrace provides a powerful infrastructure that permits administrators, +developers, and service personnel to concisely answer arbitrary questions about +the behavior of the operating system and user programs. +.Pp +The +.Nm +command provides a generic interface to the essential services provided by the +DTrace facility, including: +.Bl -bullet -offset indent +.It Options that list the set of probes and providers currently published by DTrace -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that enable probes directly using any of the probe description specifiers (provider, module, function, name) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that run the D compiler and compile one or more D program files or programs written directly on the command line -.RE -.RS +4 -.TP -.ie t \(bu -.el o +.It +Options that enable probes directly using any of the probe description +specifiers (provider, module, function, name) +.It +Options that run the D compiler and compile one or more D program files or +programs written directly on the command line +.It Options that generate anonymous tracing programs -.RE -.RS +4 -.TP -.ie t \(bu -.el o +.It Options that generate program stability reports -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that modify DTrace tracing and buffering behavior and enable additional D compiler features -.RE -.sp -.LP -You can use \fBdtrace\fR to create D scripts by using it in a \fB#!\fR declaration to create an interpreter file. You can also use \fBdtrace\fR to attempt to compile D programs and determine their properties without actually enabling tracing using the \fB-e\fR option. See \fBOPTIONS\fR. See the \fISolaris Dynamic Tracing Guide\fR for detailed examples of how to use the \fBdtrace\fR utility to perform these tasks. -.SH OPTIONS -.sp -.LP -The arguments accepted by the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, and \fB-i\fR options can include an optional D language \fIpredicate\fR enclosed in slashes \fB//\fR and optional D language \fIaction\fR statement list enclosed in braces \fB{}\fR. D program code specified on the command line must be appropriately quoted to avoid intepretation of meta-characters by the shell. -.sp -.LP +.It +Options that modify DTrace tracing and buffering behavior and enable +additional D compiler features +.El +.Pp +You can use +.Nm +to create D scripts by using it in a shebang declaration to create an +interpreter file. +You can also use +.Nm +to attempt to compile D programs and determine their properties without +actually enabling traces using the +.Fl e +option. +.Sh OPTIONS +The arguments accepted by the +.Fl P , +.Fl m , +.Fl f , +.Fl n , +and +.Fl i +options can include an optional D language +.Ar predicate +enclosed in slashes and an optional D language +.Ar action +statement list enclosed in braces. +D program code specified on the command line must be appropriately quoted to +avoid interpretation of meta-characters by the shell. +.Pp The following options are supported: -.sp -.ne 2 -.mk -.na -\fB\fB-32\fR | \fB-64\fR\fR -.ad -.sp .6 -.RS 4n -The D compiler produces programs using the native data model of the operating system kernel. You can use the \fBisainfo\fR \fB-b\fR command to determine the current operating system data model. If the \fB-32\fR option is specified, \fBdtrace\fR forces -the D compiler to compile a D program using the 32-bit data model. If the \fB-64\fR option is specified, \fBdtrace\fR forces the D compiler to compile a D program using the 64-bit data model. These options are typically not required as \fBdtrace\fR selects the -native data model as the default. The data model affects the sizes of integer types and other language properties. D programs compiled for either data model can be executed on both 32-bit and 64-bit kernels. The \fB-32\fR and \fB-64\fR options also determine the ELF file format -(ELF32 or ELF64) produced by the \fB-G\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-a\fR\fR -.ad -.sp .6 -.RS 4n -Claim anonymous tracing state and display the traced data. You can combine the \fB-a\fR option with the \fB-e\fR option to force \fBdtrace\fR to exit immediately after consuming the anonymous tracing state rather than continuing to wait for new -data. See the \fISolaris Dynamic Tracing Guide\fR for more information about anonymous tracing. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-A\fR\fR -.ad -.sp .6 -.RS 4n -Generate \fBdriver.conf\fR(4) directives for anonymous tracing. This option constructs a set of \fBdtrace\fR(7D) configuration file directives to enable the specified probes for anonymous tracing and then exits. By default, \fBdtrace\fR attempts to store the directives to the file \fB/kernel/drv/dtrace.conf\fR. You can modify this behavior if you use the \fB-o\fR option to specify an alternate output file. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-b\fR \fIbufsz\fR\fR -.ad -.sp .6 -.RS 4n -Set principal trace buffer size (\fIbufsz\fR). The trace buffer size can include any of the size suffixes \fBk\fR, \fBm\fR, \fBg\fR, or \fBt\fR. If the buffer space cannot be allocated, \fBdtrace\fR attempts -to reduce the buffer size or exit depending on the setting of the \fBbufresize\fR property. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-c\fR \fIcmd\fR\fR -.ad -.sp .6 -.RS 4n -Run the specified command \fIcmd\fR and exit upon its completion. If more than one \fB-c\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status for each child process as it -terminates. The process-ID of the first command is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for more information -on macro variables. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-C\fR\fR -.ad -.sp .6 -.RS 4n -Run the C preprocessor \fBcpp\fR(1) over D programs before compiling them. You can pass options to the C preprocessor using the \fB-D\fR, \fB-U\fR, \fB-I\fR, and \fB-H\fR options. You can select the degree of C standard conformance if you use the \fB-X\fR option. For a description of the set of tokens defined by the D compiler when invoking the C preprocessor, see \fB-X\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-D\fR \fIname\fR \fB[=\fR\fIvalue\fR\fB]\fR\fR -.ad -.sp .6 -.RS 4n -Define \fIname\fR when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). If you specify the equals sign (\fB=\fR) -and additional \fIvalue\fR, the name is assigned the corresponding value. This option passes the \fB-D\fR option to each \fBcpp\fR invocation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-e\fR\fR -.ad -.sp .6 -.RS 4n -Exit after compiling any requests and consuming anonymous tracing state (\fB-a\fR option) but prior to enabling any probes. You can combine this option with the \fB-a\fR option to print anonymous tracing data and exit. You can also combine this option with D -compiler options. This combination verifies that the programs compile without actually executing them and enabling the corresponding instrumentation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-f\fR\fB[[\fR\fIprovider\fR\fB:]\fR\fImodule\fR\fB:]\fR\fIfunction\fR\fB[[\fR\fIpredicate\fR\fB]\fR\fIaction\fR\fB]]\fR\fR -.ad -.sp .6 -.RS 4n -Specify function name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function\fR, \fImodule:function\fR, or \fIfunction\fR. -Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIfunction\fR are specified in the description, all probes with the corresponding \fIfunction\fR are matched. -The \fB-f\fR argument can be suffixed with an optional D probe clause. You can specify more than one \fB-f\fR option on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-F\fR\fR -.ad -.sp .6 -.RS 4n -Coalesce trace output by identifying function entry and return. Function entry probe reports are indented and their output is prefixed with \fB->\fR. Function return probe reports are unindented and their output is prefixed with \fB<-\fR\&. System call -entry probe reports are indented and their output is prefixed with \fB=>\fR. System call return probe reports are unindented and their output is prefixed with \fB<=\fR\&. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-G\fR\fR -.ad -.sp .6 -.RS 4n -Generate an ELF file containing an embedded DTrace program. The DTrace probes specified in the program are saved inside of a relocatable ELF object which can be linked into another program. If the \fB-o\fR option is present, the ELF file is saved using the pathname specified -as the argument for this operand. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fB\fIfilename\fR.d\fR, then the ELF file is saved using the name \fB\fIfilename\fR.o\fR. -Otherwise the ELF file is saved using the name \fBd.out\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-H\fR\fR -.ad -.sp .6 -.RS 4n -Print the pathnames of included files when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). This option passes the \fB-H\fR option -to each \fBcpp\fR invocation, causing it to display the list of pathnames, one for each line, to \fBstderr\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-h\fR\fR -.ad -.sp .6 -.RS 4n -Generate a header file containing macros that correspond to probes in the specified provider definitions. This option should be used to generate a header file that is included by other source files for later use with the \fB-G\fR option. If the \fB-o\fR option -is present, the header file is saved using the pathname specified as the argument for that option. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fIfilename\fR\fB\&.d\fR, then the header file is saved -using the name \fIfilename\fR\fB\&.h\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-i\fR \fIprobe-id\fR\fB[[\fR\fIpredicate\fR] \fIaction\fR\fB]\fR\fR -.ad -.sp .6 -.RS 4n -Specify probe identifier (\fIprobe-id\fR) to trace or list (\fB-l\fR option). You can specify probe IDs using decimal integers as shown by \fBdtrace\fR \fB-l\fR. The \fB-i\fR argument can be suffixed with an optional -D probe clause. You can specify more than one \fB-i\fR option at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-I\fR \fIpath\fR\fR -.ad -.sp .6 -.RS 4n -Add the specified directory \fIpath\fR to the search path for \fB#include\fR files when invoking \fBcpp\fR(1) (enabled -using the \fB-C\fR option). This option passes the \fB-I\fR option to each \fBcpp\fR invocation. The specified \fIpath\fR is inserted into the search path ahead of the default directory list. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-L\fR \fIpath\fR\fR -.ad -.sp .6 -.RS 4n -Add the specified directory \fIpath\fR to the search path for DTrace libraries. DTrace libraries are used to contain common definitions that can be used when writing D programs. The specified \fIpath\fR is added after the default library -search path. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-l\fR\fR -.ad -.sp .6 -.RS 4n -List probes instead of enabling them. If the \fB-l\fR option is specified, \fBdtrace\fR produces a report of the probes matching the descriptions given using the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, \fB-i\fR, -and \fB-s\fR options. If none of these options are specified, this option lists all probes. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-m\fR [[\fIprovider:\fR] \fImodule:\fR [[\fIpredicate\fR] \fIaction\fR]]\fR -.ad -.sp .6 -.RS 4n -Specify module name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module\fR or \fImodule\fR. Unspecified probe description fields are left blank and match -any probes regardless of the values in those fields. If no qualifiers other than \fImodule\fR are specified in the description, all probes with a corresponding \fImodule\fR are matched. The \fB-m\fR argument can be suffixed with an optional D -probe clause. More than one \fB-m\fR option can be specified on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]\fR -.ad -.sp .6 -.RS 4n -Specify probe name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function:name\fR, \fImodule:function:name\fR, \fIfunction:name\fR, -or \fIname\fR. Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIname\fR are specified in the description, all probes with a corresponding \fIname\fR are -matched. The \fB-n\fR argument can be suffixed with an optional D probe clause. More than one \fB-n\fR option can be specified on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-o\fR \fIoutput\fR\fR -.ad -.sp .6 -.RS 4n -Specify the \fIoutput\fR file for the \fB-A\fR , \fB-G\fR, and \fB-l\fR options, or for the traced data itself. If the \fB-A\fR option is present and \fB-o\fR is not present, the default output file is \fB/kernel/drv/dtrace.conf\fR. If the \fB-G\fR option is present and the \fB-s\fR option's argument is of the form \fB\fIfilename\fR.d\fR and \fB-o\fR is not present, the default output file is \fB\fIfilename\fR.o\fR. -Otherwise the default output file is \fBd.out\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-p\fR \fIpid\fR\fR -.ad -.sp .6 -.RS 4n -Grab the specified process-ID \fIpid\fR, cache its symbol tables, and exit upon its completion. If more than one \fB-p\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status -for each process as it terminates. The first process-ID is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for -more information on macro variables. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-P\fR \fIprovider\fR \fB[[\fR\fIpredicate\fR\fB]\fR \fIaction\fR]\fR -.ad -.sp .6 -.RS 4n -Specify provider name to trace or list (\fB-l\fR option). The remaining probe description fields module, function, and name are left blank and match any probes regardless of the values in those fields. The \fB-P\fR argument can be suffixed with an optional D -probe clause. You can specify more than one \fB-P\fR option on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-q\fR\fR -.ad -.sp .6 -.RS 4n -Set quiet mode. \fBdtrace\fR suppresses messages such as the number of probes matched by the specified options and D programs and does not print column headers, the CPU ID, the probe ID, or insert newlines into the output. Only data traced and formatted by D program -statements such as \fBtrace()\fR and \fBprintf()\fR is displayed to \fBstdout\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-s\fR\fR -.ad -.sp .6 -.RS 4n -Compile the specified D program source file. If the \fB-e\fR option is present, the program is compiled but instrumentation is not enabled. If the \fB-l\fR option is present, the program is compiled and the set of probes matched by it is listed, but instrumentation -is not enabled. If none of \fB-e\fR, \fB-l\fR, \fB-G\fR, or \fB-A\fR are present, the instrumentation specified by the D program is enabled and tracing begins. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-S\fR\fR -.ad -.sp .6 -.RS 4n -Show D compiler intermediate code. The D compiler produces a report of the intermediate code generated for each D program to \fBstderr\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-U\fR \fIname\fR\fR -.ad -.sp .6 -.RS 4n -Undefine the specified \fIname\fR when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). This option passes the \fB-U\fR option to each \fBcpp\fR invocation. -.RE - -.sp -.ne 2 -.mk *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sun Oct 20 12:55:23 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9FC25A01; Sun, 20 Oct 2013 12:55:23 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8D58D274F; Sun, 20 Oct 2013 12:55:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9KCtNRX007685; Sun, 20 Oct 2013 12:55:23 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9KCtNUl007684; Sun, 20 Oct 2013 12:55:23 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201310201255.r9KCtNUl007684@svn.freebsd.org> From: Andrew Turner Date: Sun, 20 Oct 2013 12:55:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256785 - projects/arm_eabi_vfp/sys/arm/arm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Oct 2013 12:55:23 -0000 Author: andrew Date: Sun Oct 20 12:55:23 2013 New Revision: 256785 URL: http://svnweb.freebsd.org/changeset/base/256785 Log: Remove debugging left in Modified: projects/arm_eabi_vfp/sys/arm/arm/locore.S Modified: projects/arm_eabi_vfp/sys/arm/arm/locore.S ============================================================================== --- projects/arm_eabi_vfp/sys/arm/arm/locore.S Sun Oct 20 12:50:13 2013 (r256784) +++ projects/arm_eabi_vfp/sys/arm/arm/locore.S Sun Oct 20 12:55:23 2013 (r256785) @@ -63,11 +63,6 @@ __FBSDID("$FreeBSD$"); .globl physaddr .set physaddr,PHYSADDR -#define PUTCHAR(ch) \ - ldr r0, =0x2000000; \ - ldr r1, =ch; \ - str r1, [r0] - /* * On entry for FreeBSD boot ABI: * r0 - metadata pointer or 0 (boothowto on AT91's boot2) @@ -84,8 +79,6 @@ ENTRY_NP(btext) ASENTRY_NP(_start) STOP_UNWINDING /* Can't unwind into the bootloader! */ - PUTCHAR('A'); - mov r9, r0 /* 0 or boot mode from boot2 */ mov r8, r1 /* Save Machine type */ mov ip, r2 /* Save meta data */ From owner-svn-src-projects@FreeBSD.ORG Sun Oct 20 14:52:14 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F12B7DB7; Sun, 20 Oct 2013 14:52:14 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C57D02C64; Sun, 20 Oct 2013 14:52:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9KEqEdp070246; Sun, 20 Oct 2013 14:52:14 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9KEqEN7070245; Sun, 20 Oct 2013 14:52:14 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201310201452.r9KEqEN7070245@svn.freebsd.org> From: Andrew Turner Date: Sun, 20 Oct 2013 14:52:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256789 - projects/arm_eabi_vfp/lib/libc/arm/aeabi X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Oct 2013 14:52:15 -0000 Author: andrew Date: Sun Oct 20 14:52:14 2013 New Revision: 256789 URL: http://svnweb.freebsd.org/changeset/base/256789 Log: The ARM EABI Run-time ABI defines the __aeabi_* floating-point functions to pass their values in the integer registers. Update the hard-float version of the functions to do this. Modified: projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_vfp.h Modified: projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_vfp.h ============================================================================== --- projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_vfp.h Sun Oct 20 14:01:09 2013 (r256788) +++ projects/arm_eabi_vfp/lib/libc/arm/aeabi/aeabi_vfp.h Sun Oct 20 14:52:14 2013 (r256789) @@ -29,14 +29,18 @@ #define AEABI_VFP_H /* - * ASM helper macros. These allow the functions to be changed when - * building for a hard-float version of the ABI. + * ASM helper macros. These allow the functions to be changed depending on + * the endian-ness we are building for. */ +/* Allow the name of the function to be changed depending on the ABI */ #ifndef __ARM_PCS_VFP -/* Define a standard name for the function */ #define AEABI_ENTRY(x) ENTRY(__aeabi_ ## x ## _softfp) #define AEABI_END(x) END(__aeabi_ ## x ## _softfp) +#else +#define AEABI_ENTRY(x) ENTRY(__aeabi_ ## x) +#define AEABI_END(x) END(__aeabi_ ## x) +#endif /* * These should be used when a function either takes, or returns a floating @@ -54,21 +58,6 @@ #define LOAD_SREGS(vreg0, vreg1, reg0, reg1) vmov vreg0, vreg1, reg0, reg1 #define LOAD_SREG(vreg, reg) vmov vreg, reg #define UNLOAD_SREG(reg, vreg) vmov reg, vreg -#else -#define AEABI_ENTRY(x) ENTRY(__aeabi_ ## x) -#define AEABI_END(x) END(__aeabi_ ## x) - -/* - * On ARM Hard-Float we don't need these as the data - * is already in the VFP registers. - */ -#define LOAD_DREG(vreg, reg0, reg1) -#define UNLOAD_DREG(reg0, reg1, vreg) - -#define LOAD_SREGS(vreg0, vreg1, reg0, reg1) -#define LOAD_SREG(vreg, reg) -#define UNLOAD_SREG(reg, vreg) -#endif /* * C Helper macros From owner-svn-src-projects@FreeBSD.ORG Sun Oct 20 21:11:36 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E556F308; Sun, 20 Oct 2013 21:11:36 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D2A0A2028; Sun, 20 Oct 2013 21:11:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9KLBadV075958; Sun, 20 Oct 2013 21:11:36 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9KLBaRM075957; Sun, 20 Oct 2013 21:11:36 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201310202111.r9KLBaRM075957@svn.freebsd.org> From: Andrew Turner Date: Sun, 20 Oct 2013 21:11:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256807 - projects/arm_eabi_vfp/lib/msun/arm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Oct 2013 21:11:37 -0000 Author: andrew Date: Sun Oct 20 21:11:36 2013 New Revision: 256807 URL: http://svnweb.freebsd.org/changeset/base/256807 Log: In the hard float version of the fenv functions: * Remove _FPUSW_SHIFT and _ENABLE_MASK as they are unneeded. * Correctly spell fpscr, the Floating-point Status and Control Register. Modified: projects/arm_eabi_vfp/lib/msun/arm/fenv.h Modified: projects/arm_eabi_vfp/lib/msun/arm/fenv.h ============================================================================== --- projects/arm_eabi_vfp/lib/msun/arm/fenv.h Sun Oct 20 21:07:38 2013 (r256806) +++ projects/arm_eabi_vfp/lib/msun/arm/fenv.h Sun Oct 20 21:11:36 2013 (r256807) @@ -79,12 +79,10 @@ extern const fenv_t __fe_dfl_env; #define FE_DFL_ENV (&__fe_dfl_env) /* We need to be able to map status flag positions to mask flag positions */ -#ifdef __ARM_PCS_VFP -#define _FPUSW_SHIFT 8 -#else -#define _FPUSW_SHIFT 16 -#endif +#ifndef __ARM_PCS_VFP +#define _FPUSW_SHIFT 16 #define _ENABLE_MASK (FE_ALL_EXCEPT << _FPUSW_SHIFT) +#endif #ifndef __ARM_PCS_VFP @@ -102,17 +100,17 @@ int feupdateenv(const fenv_t *__envp); #else /* __ARM_PCS_VFP */ -#define vmrs_fpsr(__r) __asm __volatile("vmrs %0, fpscr" : "=&r"(__r)) -#define vmsr_fpsr(__r) __asm __volatile("vmsr fpscr, %0" : : "r"(__r)) +#define vmrs_fpscr(__r) __asm __volatile("vmrs %0, fpscr" : "=&r"(__r)) +#define vmsr_fpscr(__r) __asm __volatile("vmsr fpscr, %0" : : "r"(__r)) __fenv_static inline int feclearexcept(int __excepts) { fexcept_t __fpsr; - vmrs_fpsr(__fpsr); + vmrs_fpscr(__fpsr); __fpsr &= ~__excepts; - vmsr_fpsr(__fpsr); + vmsr_fpscr(__fpsr); return (0); } @@ -121,7 +119,7 @@ fegetexceptflag(fexcept_t *__flagp, int { fexcept_t __fpsr; - vmrs_fpsr(__fpsr); + vmrs_fpscr(__fpsr); *__flagp = __fpsr & __excepts; return (0); } @@ -131,10 +129,10 @@ fesetexceptflag(const fexcept_t *__flagp { fexcept_t __fpsr; - vmrs_fpsr(__fpsr); + vmrs_fpscr(__fpsr); __fpsr &= ~__excepts; __fpsr |= *__flagp & __excepts; - vmsr_fpsr(__fpsr); + vmsr_fpscr(__fpsr); return (0); } @@ -152,7 +150,7 @@ fetestexcept(int __excepts) { fexcept_t __fpsr; - vmrs_fpsr(__fpsr); + vmrs_fpscr(__fpsr); return (__fpsr & __excepts); } @@ -161,7 +159,7 @@ fegetround(void) { fenv_t __fpsr; - vmrs_fpsr(__fpsr); + vmrs_fpscr(__fpsr); return (__fpsr & _ROUND_MASK); } @@ -170,10 +168,10 @@ fesetround(int __round) { fenv_t __fpsr; - vmrs_fpsr(__fpsr); + vmrs_fpscr(__fpsr); __fpsr &= ~(_ROUND_MASK); __fpsr |= __round; - vmsr_fpsr(__fpsr); + vmsr_fpscr(__fpsr); return (0); } @@ -181,7 +179,7 @@ __fenv_static inline int fegetenv(fenv_t *__envp) { - vmrs_fpsr(*__envp); + vmrs_fpscr(*__envp); return (0); } @@ -190,10 +188,10 @@ feholdexcept(fenv_t *__envp) { fenv_t __env; - vmrs_fpsr(__env); + vmrs_fpscr(__env); *__envp = __env; - __env &= ~(FE_ALL_EXCEPT | _ENABLE_MASK); - vmsr_fpsr(__env); + __env &= ~(FE_ALL_EXCEPT); + vmsr_fpscr(__env); return (0); } @@ -201,7 +199,7 @@ __fenv_static inline int fesetenv(const fenv_t *__envp) { - vmsr_fpsr(*__envp); + vmsr_fpscr(*__envp); return (0); } @@ -210,8 +208,8 @@ feupdateenv(const fenv_t *__envp) { fexcept_t __fpsr; - vmrs_fpsr(__fpsr); - vmsr_fpsr(*__envp); + vmrs_fpscr(__fpsr); + vmsr_fpscr(*__envp); feraiseexcept(__fpsr & FE_ALL_EXCEPT); return (0); } @@ -225,10 +223,10 @@ feenableexcept(int __mask) { fenv_t __old_fpsr, __new_fpsr; - vmrs_fpsr(__old_fpsr); - __new_fpsr = __old_fpsr | (__mask & FE_ALL_EXCEPT) << _FPUSW_SHIFT; - vmsr_fpsr(__new_fpsr); - return ((__old_fpsr >> _FPUSW_SHIFT) & FE_ALL_EXCEPT); + vmrs_fpscr(__old_fpsr); + __new_fpsr = __old_fpsr | (__mask & FE_ALL_EXCEPT); + vmsr_fpscr(__new_fpsr); + return (__old_fpsr & FE_ALL_EXCEPT); } static inline int @@ -236,10 +234,10 @@ fedisableexcept(int __mask) { fenv_t __old_fpsr, __new_fpsr; - vmrs_fpsr(__old_fpsr); - __new_fpsr = __old_fpsr & ~((__mask & FE_ALL_EXCEPT) << _FPUSW_SHIFT); - vmsr_fpsr(__new_fpsr); - return ((__old_fpsr >> _FPUSW_SHIFT) & FE_ALL_EXCEPT); + vmrs_fpscr(__old_fpsr); + __new_fpsr = __old_fpsr & ~(__mask & FE_ALL_EXCEPT); + vmsr_fpscr(__new_fpsr); + return (__old_fpsr & FE_ALL_EXCEPT); } static inline int @@ -247,13 +245,13 @@ fegetexcept(void) { fenv_t __fpsr; - vmrs_fpsr(__fpsr); - return ((__fpsr & _ENABLE_MASK) >> _FPUSW_SHIFT); + vmrs_fpscr(__fpsr); + return (__fpsr & FE_ALL_EXCEPT); } #endif /* __BSD_VISIBLE */ -#endif /* ARM_HARD_FLOAT */ +#endif /* __ARM_PCS_VFP */ __END_DECLS From owner-svn-src-projects@FreeBSD.ORG Mon Oct 21 08:37:17 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E9FC0183; Mon, 21 Oct 2013 08:37:17 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D7EB824FD; Mon, 21 Oct 2013 08:37:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9L8bH67046339; Mon, 21 Oct 2013 08:37:17 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9L8bHTJ046338; Mon, 21 Oct 2013 08:37:17 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310210837.r9L8bHTJ046338@svn.freebsd.org> From: Alexander Motin Date: Mon, 21 Oct 2013 08:37:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256834 - projects/camlock/sys/cam/ata X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Oct 2013 08:37:18 -0000 Author: mav Date: Mon Oct 21 08:37:17 2013 New Revision: 256834 URL: http://svnweb.freebsd.org/changeset/base/256834 Log: Don't access BIO pointer after we called bio_done(). Modified: projects/camlock/sys/cam/ata/ata_da.c Modified: projects/camlock/sys/cam/ata/ata_da.c ============================================================================== --- projects/camlock/sys/cam/ata/ata_da.c Mon Oct 21 07:58:37 2013 (r256833) +++ projects/camlock/sys/cam/ata/ata_da.c Mon Oct 21 08:37:17 2013 (r256834) @@ -1755,8 +1755,8 @@ adadone(struct cam_periph *periph, union cam_periph_unlock(periph); while ((bp1 = TAILQ_FIRST(&queue)) != NULL) { TAILQ_REMOVE(&queue, bp1, bio_queue); - bp1->bio_error = bp->bio_error; - if (bp->bio_flags & BIO_ERROR) { + bp1->bio_error = error; + if (error != 0) { bp1->bio_flags |= BIO_ERROR; bp1->bio_resid = bp1->bio_bcount; } else From owner-svn-src-projects@FreeBSD.ORG Mon Oct 21 09:03:36 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 250BD221; Mon, 21 Oct 2013 09:03:36 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0FB8126DC; Mon, 21 Oct 2013 09:03:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9L93aZZ061615; Mon, 21 Oct 2013 09:03:36 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9L93VVa061530; Mon, 21 Oct 2013 09:03:31 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310210903.r9L93VVa061530@svn.freebsd.org> From: Alexander Motin Date: Mon, 21 Oct 2013 09:03:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256837 - in projects/camlock: . bin/sh contrib/binutils/gas/config contrib/jemalloc contrib/jemalloc/doc contrib/jemalloc/include/jemalloc contrib/jemalloc/include/jemalloc/internal co... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Oct 2013 09:03:36 -0000 Author: mav Date: Mon Oct 21 09:03:30 2013 New Revision: 256837 URL: http://svnweb.freebsd.org/changeset/base/256837 Log: MFC @ r256836 Added: projects/camlock/share/man/man4/altera_atse.4 - copied unchanged from r256836, head/share/man/man4/altera_atse.4 projects/camlock/sys/arm/conf/IMX53-QSB - copied unchanged from r256836, head/sys/arm/conf/IMX53-QSB projects/camlock/sys/boot/fdt/dts/imx53-qsb.dts - copied unchanged from r256836, head/sys/boot/fdt/dts/imx53-qsb.dts projects/camlock/sys/dev/altera/atse/ - copied from r256836, head/sys/dev/altera/atse/ projects/camlock/sys/dev/ffec/ - copied from r256836, head/sys/dev/ffec/ projects/camlock/sys/powerpc/powerpc/clock.c - copied unchanged from r256836, head/sys/powerpc/powerpc/clock.c projects/camlock/sys/powerpc/powerpc/nexus.c - copied unchanged from r256836, head/sys/powerpc/powerpc/nexus.c projects/camlock/sys/powerpc/powerpc/vm_machdep.c - copied unchanged from r256836, head/sys/powerpc/powerpc/vm_machdep.c projects/camlock/sys/powerpc/pseries/phyp_llan.c - copied unchanged from r256836, head/sys/powerpc/pseries/phyp_llan.c Deleted: projects/camlock/sys/powerpc/aim/clock.c projects/camlock/sys/powerpc/aim/nexus.c projects/camlock/sys/powerpc/aim/vm_machdep.c projects/camlock/sys/powerpc/booke/clock.c projects/camlock/sys/powerpc/booke/vm_machdep.c projects/camlock/sys/powerpc/mpc85xx/nexus.c Modified: projects/camlock/ObsoleteFiles.inc projects/camlock/bin/sh/jobs.c projects/camlock/contrib/binutils/gas/config/tc-arm.c projects/camlock/contrib/jemalloc/ChangeLog projects/camlock/contrib/jemalloc/FREEBSD-diffs projects/camlock/contrib/jemalloc/FREEBSD-upgrade projects/camlock/contrib/jemalloc/VERSION projects/camlock/contrib/jemalloc/doc/jemalloc.3 projects/camlock/contrib/jemalloc/include/jemalloc/internal/arena.h projects/camlock/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h projects/camlock/contrib/jemalloc/include/jemalloc/internal/private_namespace.h projects/camlock/contrib/jemalloc/include/jemalloc/internal/tcache.h projects/camlock/contrib/jemalloc/include/jemalloc/jemalloc.h projects/camlock/contrib/jemalloc/src/arena.c projects/camlock/contrib/jemalloc/src/chunk.c projects/camlock/contrib/jemalloc/src/ctl.c projects/camlock/contrib/jemalloc/src/jemalloc.c projects/camlock/etc/defaults/rc.conf projects/camlock/etc/mtree/BSD.usr.dist projects/camlock/etc/rc projects/camlock/etc/rc.d/jail projects/camlock/etc/rc.d/sendmail projects/camlock/etc/sendmail/freebsd.mc projects/camlock/lib/libc/gen/popen.c projects/camlock/lib/libc/gen/syslog.c projects/camlock/lib/libc/iconv/citrus_mapper.c projects/camlock/lib/libcrypt/tests/Makefile projects/camlock/sbin/ifconfig/ifconfig.8 projects/camlock/sbin/ifconfig/ifgroup.c projects/camlock/sbin/route/route.c projects/camlock/share/man/man4/Makefile projects/camlock/share/man/man5/rc.conf.5 projects/camlock/share/man/man8/rc.8 projects/camlock/share/man/man8/rc.sendmail.8 projects/camlock/share/mk/atf.test.mk projects/camlock/share/mk/bsd.test.mk projects/camlock/sys/arm/arm/cpufunc_asm_armv7.S projects/camlock/sys/arm/arm/fusu.S projects/camlock/sys/arm/arm/pmap-v6.c projects/camlock/sys/arm/freescale/imx/files.imx53 projects/camlock/sys/arm/freescale/imx/imx51_ccm.c projects/camlock/sys/arm/include/pmap.h projects/camlock/sys/arm/mv/common.c projects/camlock/sys/arm/mv/mvreg.h projects/camlock/sys/arm/xscale/i80321/ep80219_machdep.c projects/camlock/sys/arm/xscale/i80321/iq31244_machdep.c projects/camlock/sys/arm/xscale/i8134x/crb_machdep.c projects/camlock/sys/arm/xscale/ixp425/avila_machdep.c projects/camlock/sys/arm/xscale/pxa/pxa_machdep.c projects/camlock/sys/boot/fdt/dts/digi-ccwmx53.dts projects/camlock/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/camlock/sys/cddl/dev/dtrace/amd64/dtrace_isa.c projects/camlock/sys/conf/files projects/camlock/sys/conf/files.powerpc projects/camlock/sys/conf/options projects/camlock/sys/contrib/dev/run/rt2870.fw.uu projects/camlock/sys/dev/altera/sdcard/altera_sdcard.c projects/camlock/sys/dev/altera/sdcard/altera_sdcard_io.c projects/camlock/sys/dev/cfi/cfi_core.c projects/camlock/sys/dev/cxgbe/iw_cxgbe/device.c projects/camlock/sys/dev/drm2/radeon/radeon_drv.c projects/camlock/sys/dev/fdt/fdtbus.c projects/camlock/sys/dev/ofw/ofw_bus_subr.c projects/camlock/sys/dev/re/if_re.c projects/camlock/sys/dev/uart/uart_dev_pl011.c projects/camlock/sys/dev/usb/controller/xhci.c projects/camlock/sys/dev/usb/serial/uslcom.c projects/camlock/sys/dev/usb/usbdevs projects/camlock/sys/dev/usb/wlan/if_run.c projects/camlock/sys/dev/usb/wlan/if_runreg.h projects/camlock/sys/geom/geom_slice.c projects/camlock/sys/geom/label/g_label.c projects/camlock/sys/kern/subr_taskqueue.c projects/camlock/sys/mips/beri/beri_machdep.c projects/camlock/sys/mips/beri/files.beri projects/camlock/sys/modules/Makefile projects/camlock/sys/modules/cxgb/Makefile projects/camlock/sys/modules/cxgbe/Makefile projects/camlock/sys/net/if_media.h projects/camlock/sys/netinet/in.h projects/camlock/sys/pci/if_rlreg.h projects/camlock/sys/powerpc/aim/machdep.c projects/camlock/sys/powerpc/booke/machdep.c projects/camlock/sys/powerpc/conf/GENERIC64 projects/camlock/sys/powerpc/ofw/ofw_pci.c projects/camlock/sys/powerpc/ofw/ofw_pcib_pci.c projects/camlock/sys/powerpc/ofw/ofw_pcibus.c projects/camlock/sys/powerpc/pseries/phyp-hvcall.S projects/camlock/sys/sys/_task.h projects/camlock/sys/sys/param.h projects/camlock/sys/sys/taskqueue.h projects/camlock/sys/ufs/ffs/ffs_extern.h projects/camlock/sys/ufs/ffs/ffs_softdep.c projects/camlock/sys/ufs/ffs/ffs_vfsops.c projects/camlock/sys/ufs/ffs/softdep.h projects/camlock/sys/ufs/ufs/ufs_extern.h projects/camlock/sys/ufs/ufs/ufsmount.h projects/camlock/sys/xen/xen-os.h projects/camlock/tools/build/mk/OptionalObsoleteFiles.inc projects/camlock/usr.bin/pathchk/pathchk.c projects/camlock/usr.sbin/bhyve/bhyverun.c projects/camlock/usr.sbin/bhyve/bhyverun.h projects/camlock/usr.sbin/bhyve/mptbl.c projects/camlock/usr.sbin/bhyve/pci_ahci.c projects/camlock/usr.sbin/bhyve/pci_hostbridge.c projects/camlock/usr.sbin/bhyve/pci_virtio_block.c projects/camlock/usr.sbin/bhyve/pci_virtio_net.c projects/camlock/usr.sbin/bhyve/rtc.c projects/camlock/usr.sbin/freebsd-update/freebsd-update.sh projects/camlock/usr.sbin/pkg/pkg.c Directory Properties: projects/camlock/ (props changed) projects/camlock/contrib/binutils/ (props changed) projects/camlock/lib/libc/ (props changed) projects/camlock/sbin/ (props changed) projects/camlock/share/man/man4/ (props changed) projects/camlock/sys/ (props changed) projects/camlock/sys/boot/ (props changed) projects/camlock/sys/cddl/contrib/opensolaris/ (props changed) projects/camlock/sys/conf/ (props changed) projects/camlock/usr.sbin/bhyve/ (props changed) Modified: projects/camlock/ObsoleteFiles.inc ============================================================================== --- projects/camlock/ObsoleteFiles.inc Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/ObsoleteFiles.inc Mon Oct 21 09:03:30 2013 (r256837) @@ -97,7 +97,7 @@ OLD_FILES+=usr/include/lwres/result.h OLD_FILES+=usr/include/lwres/version.h OLD_FILES+=usr/lib/liblwres.a OLD_FILES+=usr/lib/liblwres.so -OLD_LIBS+=usr/lib/liblwres.so.50 +OLD_LIBS+=usr/lib/liblwres.so.90 OLD_FILES+=usr/lib/liblwres_p.a OLD_FILES+=usr/sbin/arpaname OLD_FILES+=usr/sbin/ddns-confgen @@ -107,6 +107,7 @@ OLD_FILES+=usr/sbin/dnssec-keygen OLD_FILES+=usr/sbin/dnssec-revoke OLD_FILES+=usr/sbin/dnssec-settime OLD_FILES+=usr/sbin/dnssec-signzone +OLD_FILES+=usr/sbin/dnssec-verify OLD_FILES+=usr/sbin/genrandom OLD_FILES+=usr/sbin/isc-hmac-fixup OLD_FILES+=usr/sbin/lwresd @@ -270,6 +271,7 @@ OLD_FILES+=usr/share/man/man8/dnssec-key OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-verify.8.gz OLD_FILES+=usr/share/man/man8/genrandom.8.gz OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz OLD_FILES+=usr/share/man/man8/lwresd.8.gz @@ -304,6 +306,8 @@ OLD_DIRS+=var/named/var/run OLD_DIRS+=var/named/var/run/named OLD_DIRS+=var/named/var/stats OLD_DIRS+=var/run/named +# 20130923: example moved +OLD_FILES+=usr/share/examples/bsdconfig/browse_packages.sh # 20130908: libssh becomes private OLD_FILES+=usr/lib/libssh.a OLD_FILES+=usr/lib/libssh.so Modified: projects/camlock/bin/sh/jobs.c ============================================================================== --- projects/camlock/bin/sh/jobs.c Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/bin/sh/jobs.c Mon Oct 21 09:03:30 2013 (r256837) @@ -978,7 +978,6 @@ int waitforjob(struct job *jp, int *origstatus) { #if JOBS - pid_t mypgrp = getpgrp(); int propagate_int = jp->jobctl && jp->foreground; #endif int status; @@ -992,7 +991,7 @@ waitforjob(struct job *jp, int *origstat dotrap(); #if JOBS if (jp->jobctl) { - if (tcsetpgrp(ttyfd, mypgrp) < 0) + if (tcsetpgrp(ttyfd, rootpid) < 0) error("tcsetpgrp failed, errno=%d\n", errno); } if (jp->state == JOBSTOPPED) Modified: projects/camlock/contrib/binutils/gas/config/tc-arm.c ============================================================================== --- projects/camlock/contrib/binutils/gas/config/tc-arm.c Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/contrib/binutils/gas/config/tc-arm.c Mon Oct 21 09:03:30 2013 (r256837) @@ -12660,14 +12660,14 @@ do_vfp_nsyn_cvt (enum neon_shape rs, int /* Conversions without bitshift. */ const char *enc[] = { - "ftosis", - "ftouis", + "ftosizs", + "ftouizs", "fsitos", "fuitos", "fcvtsd", "fcvtds", - "ftosid", - "ftouid", + "ftosizd", + "ftouizd", "fsitod", "fuitod" }; Modified: projects/camlock/contrib/jemalloc/ChangeLog ============================================================================== --- projects/camlock/contrib/jemalloc/ChangeLog Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/contrib/jemalloc/ChangeLog Mon Oct 21 09:03:30 2013 (r256837) @@ -6,6 +6,21 @@ found in the git revision history: http://www.canonware.com/cgi-bin/gitweb.cgi?p=jemalloc.git git://canonware.com/jemalloc.git +* 3.4.1 (October 20, 2013) + + Bug fixes: + - Fix a race in the "arenas.extend" mallctl that could cause memory corruption + of internal data structures and subsequent crashes. + - Fix Valgrind integration flaws that caused Valgrind warnings about reads of + uninitialized memory in: + + arena chunk headers + + internal zero-initialized data structures (relevant to tcache and prof + code) + - Preserve errno during the first allocation. A readlink(2) call during + initialization fails unless /etc/malloc.conf exists, so errno was typically + set during the first allocation prior to this fix. + - Fix compilation warnings reported by gcc 4.8.1. + * 3.4.0 (June 2, 2013) This version is essentially a small bugfix release, but the addition of @@ -60,7 +75,7 @@ found in the git revision history: Bug fixes: - Fix "arenas.extend" mallctl to output the number of arenas. - - Fix chunk_recycyle() to unconditionally inform Valgrind that returned memory + - Fix chunk_recycle() to unconditionally inform Valgrind that returned memory is undefined. - Fix build break on FreeBSD related to alloca.h. Modified: projects/camlock/contrib/jemalloc/FREEBSD-diffs ============================================================================== --- projects/camlock/contrib/jemalloc/FREEBSD-diffs Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/contrib/jemalloc/FREEBSD-diffs Mon Oct 21 09:03:30 2013 (r256837) @@ -45,7 +45,7 @@ index abd5e6f..1d7491a 100644 + diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in -index e46ac54..527449d 100644 +index 53c135c..c547339 100644 --- a/include/jemalloc/internal/jemalloc_internal.h.in +++ b/include/jemalloc/internal/jemalloc_internal.h.in @@ -1,5 +1,8 @@ @@ -97,10 +97,10 @@ index de44e14..564d604 100644 bool malloc_mutex_init(malloc_mutex_t *mutex); diff --git a/include/jemalloc/internal/private_namespace.h b/include/jemalloc/internal/private_namespace.h -index 65de316..366676b 100644 +index cdb0b0e..2a98d1f 100644 --- a/include/jemalloc/internal/private_namespace.h +++ b/include/jemalloc/internal/private_namespace.h -@@ -216,7 +216,6 @@ +@@ -218,7 +218,6 @@ #define iralloc JEMALLOC_N(iralloc) #define irallocx JEMALLOC_N(irallocx) #define isalloc JEMALLOC_N(isalloc) @@ -244,7 +244,7 @@ index 0000000..e6c8407 +#endif + diff --git a/src/jemalloc.c b/src/jemalloc.c -index bc350ed..352c98e 100644 +index ae56db6..1412a5e 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -8,6 +8,10 @@ malloc_tsd_data(, arenas, arena_t *, NULL) Modified: projects/camlock/contrib/jemalloc/FREEBSD-upgrade ============================================================================== --- projects/camlock/contrib/jemalloc/FREEBSD-upgrade Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/contrib/jemalloc/FREEBSD-upgrade Mon Oct 21 09:03:30 2013 (r256837) @@ -60,7 +60,7 @@ do_extract() { local rev=$1 # Clone. rm -rf ${work} - git clone git://canonware.com/jemalloc.git ${work} + git clone https://github.com/jemalloc/jemalloc.git ${work} ( cd ${work} if [ "x${rev}" != "x" ] ; then Modified: projects/camlock/contrib/jemalloc/VERSION ============================================================================== --- projects/camlock/contrib/jemalloc/VERSION Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/contrib/jemalloc/VERSION Mon Oct 21 09:03:30 2013 (r256837) @@ -1 +1 @@ -3.4.0-0-g0ed518e5dab789ad2171bb38977a8927e2a26775 +3.4.1-0-g0135fb806e4137dc9cdf152541926a2bc95e33f0 Modified: projects/camlock/contrib/jemalloc/doc/jemalloc.3 ============================================================================== --- projects/camlock/contrib/jemalloc/doc/jemalloc.3 Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/contrib/jemalloc/doc/jemalloc.3 Mon Oct 21 09:03:30 2013 (r256837) @@ -2,12 +2,12 @@ .\" Title: JEMALLOC .\" Author: Jason Evans .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 06/02/2013 +.\" Date: 10/20/2013 .\" Manual: User Manual -.\" Source: jemalloc 3.4.0-0-g0ed518e5dab789ad2171bb38977a8927e2a26775 +.\" Source: jemalloc 3.4.1-0-g0135fb806e4137dc9cdf152541926a2bc95e33f0 .\" Language: English .\" -.TH "JEMALLOC" "3" "06/02/2013" "jemalloc 3.4.0-0-g0ed518e5dab7" "User Manual" +.TH "JEMALLOC" "3" "10/20/2013" "jemalloc 3.4.1-0-g0135fb806e41" "User Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ jemalloc \- general purpose memory allocation functions .SH "LIBRARY" .PP -This manual describes jemalloc 3\&.4\&.0\-0\-g0ed518e5dab789ad2171bb38977a8927e2a26775\&. More information can be found at the +This manual describes jemalloc 3\&.4\&.1\-0\-g0135fb806e4137dc9cdf152541926a2bc95e33f0\&. More information can be found at the \m[blue]\fBjemalloc website\fR\m[]\&\s-2\u[1]\d\s+2\&. .PP The following configuration options are enabled in libc\*(Aqs built\-in jemalloc: Modified: projects/camlock/contrib/jemalloc/include/jemalloc/internal/arena.h ============================================================================== --- projects/camlock/contrib/jemalloc/include/jemalloc/internal/arena.h Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/contrib/jemalloc/include/jemalloc/internal/arena.h Mon Oct 21 09:03:30 2013 (r256837) @@ -441,6 +441,7 @@ void arena_postfork_child(arena_t *arena #ifndef JEMALLOC_ENABLE_INLINE arena_chunk_map_t *arena_mapp_get(arena_chunk_t *chunk, size_t pageind); size_t *arena_mapbitsp_get(arena_chunk_t *chunk, size_t pageind); +size_t arena_mapbitsp_read(size_t *mapbitsp); size_t arena_mapbits_get(arena_chunk_t *chunk, size_t pageind); size_t arena_mapbits_unallocated_size_get(arena_chunk_t *chunk, size_t pageind); @@ -451,6 +452,7 @@ size_t arena_mapbits_dirty_get(arena_chu size_t arena_mapbits_unzeroed_get(arena_chunk_t *chunk, size_t pageind); size_t arena_mapbits_large_get(arena_chunk_t *chunk, size_t pageind); size_t arena_mapbits_allocated_get(arena_chunk_t *chunk, size_t pageind); +void arena_mapbitsp_write(size_t *mapbitsp, size_t mapbits); void arena_mapbits_unallocated_set(arena_chunk_t *chunk, size_t pageind, size_t size, size_t flags); void arena_mapbits_unallocated_size_set(arena_chunk_t *chunk, size_t pageind, @@ -498,10 +500,17 @@ arena_mapbitsp_get(arena_chunk_t *chunk, } JEMALLOC_ALWAYS_INLINE size_t +arena_mapbitsp_read(size_t *mapbitsp) +{ + + return (*mapbitsp); +} + +JEMALLOC_ALWAYS_INLINE size_t arena_mapbits_get(arena_chunk_t *chunk, size_t pageind) { - return (*arena_mapbitsp_get(chunk, pageind)); + return (arena_mapbitsp_read(arena_mapbitsp_get(chunk, pageind))); } JEMALLOC_ALWAYS_INLINE size_t @@ -585,82 +594,89 @@ arena_mapbits_allocated_get(arena_chunk_ } JEMALLOC_ALWAYS_INLINE void +arena_mapbitsp_write(size_t *mapbitsp, size_t mapbits) +{ + + *mapbitsp = mapbits; +} + +JEMALLOC_ALWAYS_INLINE void arena_mapbits_unallocated_set(arena_chunk_t *chunk, size_t pageind, size_t size, size_t flags) { - size_t *mapbitsp; + size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind); - mapbitsp = arena_mapbitsp_get(chunk, pageind); assert((size & PAGE_MASK) == 0); assert((flags & ~CHUNK_MAP_FLAGS_MASK) == 0); assert((flags & (CHUNK_MAP_DIRTY|CHUNK_MAP_UNZEROED)) == flags); - *mapbitsp = size | CHUNK_MAP_BININD_INVALID | flags; + arena_mapbitsp_write(mapbitsp, size | CHUNK_MAP_BININD_INVALID | flags); } JEMALLOC_ALWAYS_INLINE void arena_mapbits_unallocated_size_set(arena_chunk_t *chunk, size_t pageind, size_t size) { - size_t *mapbitsp; + size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind); + size_t mapbits = arena_mapbitsp_read(mapbitsp); - mapbitsp = arena_mapbitsp_get(chunk, pageind); assert((size & PAGE_MASK) == 0); - assert((*mapbitsp & (CHUNK_MAP_LARGE|CHUNK_MAP_ALLOCATED)) == 0); - *mapbitsp = size | (*mapbitsp & PAGE_MASK); + assert((mapbits & (CHUNK_MAP_LARGE|CHUNK_MAP_ALLOCATED)) == 0); + arena_mapbitsp_write(mapbitsp, size | (mapbits & PAGE_MASK)); } JEMALLOC_ALWAYS_INLINE void arena_mapbits_large_set(arena_chunk_t *chunk, size_t pageind, size_t size, size_t flags) { - size_t *mapbitsp; + size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind); + size_t mapbits = arena_mapbitsp_read(mapbitsp); size_t unzeroed; - mapbitsp = arena_mapbitsp_get(chunk, pageind); assert((size & PAGE_MASK) == 0); assert((flags & CHUNK_MAP_DIRTY) == flags); - unzeroed = *mapbitsp & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */ - *mapbitsp = size | CHUNK_MAP_BININD_INVALID | flags | unzeroed | - CHUNK_MAP_LARGE | CHUNK_MAP_ALLOCATED; + unzeroed = mapbits & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */ + arena_mapbitsp_write(mapbitsp, size | CHUNK_MAP_BININD_INVALID | flags + | unzeroed | CHUNK_MAP_LARGE | CHUNK_MAP_ALLOCATED); } JEMALLOC_ALWAYS_INLINE void arena_mapbits_large_binind_set(arena_chunk_t *chunk, size_t pageind, size_t binind) { - size_t *mapbitsp; + size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind); + size_t mapbits = arena_mapbitsp_read(mapbitsp); assert(binind <= BININD_INVALID); - mapbitsp = arena_mapbitsp_get(chunk, pageind); assert(arena_mapbits_large_size_get(chunk, pageind) == PAGE); - *mapbitsp = (*mapbitsp & ~CHUNK_MAP_BININD_MASK) | (binind << - CHUNK_MAP_BININD_SHIFT); + arena_mapbitsp_write(mapbitsp, (mapbits & ~CHUNK_MAP_BININD_MASK) | + (binind << CHUNK_MAP_BININD_SHIFT)); } JEMALLOC_ALWAYS_INLINE void arena_mapbits_small_set(arena_chunk_t *chunk, size_t pageind, size_t runind, size_t binind, size_t flags) { - size_t *mapbitsp; + size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind); + size_t mapbits = arena_mapbitsp_read(mapbitsp); size_t unzeroed; assert(binind < BININD_INVALID); - mapbitsp = arena_mapbitsp_get(chunk, pageind); assert(pageind - runind >= map_bias); assert((flags & CHUNK_MAP_DIRTY) == flags); - unzeroed = *mapbitsp & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */ - *mapbitsp = (runind << LG_PAGE) | (binind << CHUNK_MAP_BININD_SHIFT) | - flags | unzeroed | CHUNK_MAP_ALLOCATED; + unzeroed = mapbits & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */ + arena_mapbitsp_write(mapbitsp, (runind << LG_PAGE) | (binind << + CHUNK_MAP_BININD_SHIFT) | flags | unzeroed | CHUNK_MAP_ALLOCATED); } JEMALLOC_ALWAYS_INLINE void arena_mapbits_unzeroed_set(arena_chunk_t *chunk, size_t pageind, size_t unzeroed) { - size_t *mapbitsp; + size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind); + size_t mapbits = arena_mapbitsp_read(mapbitsp); - mapbitsp = arena_mapbitsp_get(chunk, pageind); - *mapbitsp = (*mapbitsp & ~CHUNK_MAP_UNZEROED) | unzeroed; + arena_mapbitsp_write(mapbitsp, (mapbits & ~CHUNK_MAP_UNZEROED) | + unzeroed); } JEMALLOC_INLINE bool Modified: projects/camlock/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h ============================================================================== --- projects/camlock/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h Mon Oct 21 09:03:30 2013 (r256837) @@ -232,9 +232,18 @@ static const bool config_ivsalloc = # define __DECONST(type, var) ((type)(uintptr_t)(const void *)(var)) #endif +/* + * JEMALLOC_ALWAYS_INLINE is used within header files for functions that are + * static inline functions if inlining is enabled, and single-definition + * library-private functions if inlining is disabled. + * + * JEMALLOC_ALWAYS_INLINE_C is for use in .c files, in which case the denoted + * functions are always static, regardless of whether inlining is enabled. + */ #ifdef JEMALLOC_DEBUG /* Disable inlining to make debugging easier. */ # define JEMALLOC_ALWAYS_INLINE +# define JEMALLOC_ALWAYS_INLINE_C static # define JEMALLOC_INLINE # define inline #else @@ -242,8 +251,11 @@ static const bool config_ivsalloc = # ifdef JEMALLOC_HAVE_ATTR # define JEMALLOC_ALWAYS_INLINE \ static inline JEMALLOC_ATTR(unused) JEMALLOC_ATTR(always_inline) +# define JEMALLOC_ALWAYS_INLINE_C \ + static inline JEMALLOC_ATTR(always_inline) # else # define JEMALLOC_ALWAYS_INLINE static inline +# define JEMALLOC_ALWAYS_INLINE_C static inline # endif # define JEMALLOC_INLINE static inline # ifdef _MSC_VER Modified: projects/camlock/contrib/jemalloc/include/jemalloc/internal/private_namespace.h ============================================================================== --- projects/camlock/contrib/jemalloc/include/jemalloc/internal/private_namespace.h Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/contrib/jemalloc/include/jemalloc/internal/private_namespace.h Mon Oct 21 09:03:30 2013 (r256837) @@ -33,6 +33,8 @@ #define arena_mapbits_unzeroed_get JEMALLOC_N(arena_mapbits_unzeroed_get) #define arena_mapbits_unzeroed_set JEMALLOC_N(arena_mapbits_unzeroed_set) #define arena_mapbitsp_get JEMALLOC_N(arena_mapbitsp_get) +#define arena_mapbitsp_read JEMALLOC_N(arena_mapbitsp_read) +#define arena_mapbitsp_write JEMALLOC_N(arena_mapbitsp_write) #define arena_mapp_get JEMALLOC_N(arena_mapp_get) #define arena_maxclass JEMALLOC_N(arena_maxclass) #define arena_new JEMALLOC_N(arena_new) Modified: projects/camlock/contrib/jemalloc/include/jemalloc/internal/tcache.h ============================================================================== --- projects/camlock/contrib/jemalloc/include/jemalloc/internal/tcache.h Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/contrib/jemalloc/include/jemalloc/internal/tcache.h Mon Oct 21 09:03:30 2013 (r256837) @@ -313,6 +313,7 @@ tcache_alloc_small(tcache_t *tcache, siz } else if (opt_zero) memset(ret, 0, size); } + VALGRIND_MAKE_MEM_UNDEFINED(ret, size); } else { if (config_fill && opt_junk) { arena_alloc_junk_small(ret, &arena_bin_info[binind], @@ -321,7 +322,6 @@ tcache_alloc_small(tcache_t *tcache, siz VALGRIND_MAKE_MEM_UNDEFINED(ret, size); memset(ret, 0, size); } - VALGRIND_MAKE_MEM_UNDEFINED(ret, size); if (config_stats) tbin->tstats.nrequests++; @@ -368,11 +368,11 @@ tcache_alloc_large(tcache_t *tcache, siz else if (opt_zero) memset(ret, 0, size); } + VALGRIND_MAKE_MEM_UNDEFINED(ret, size); } else { VALGRIND_MAKE_MEM_UNDEFINED(ret, size); memset(ret, 0, size); } - VALGRIND_MAKE_MEM_UNDEFINED(ret, size); if (config_stats) tbin->tstats.nrequests++; Modified: projects/camlock/contrib/jemalloc/include/jemalloc/jemalloc.h ============================================================================== --- projects/camlock/contrib/jemalloc/include/jemalloc/jemalloc.h Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/contrib/jemalloc/include/jemalloc/jemalloc.h Mon Oct 21 09:03:30 2013 (r256837) @@ -7,12 +7,12 @@ extern "C" { #include #include -#define JEMALLOC_VERSION "3.4.0-0-g0ed518e5dab789ad2171bb38977a8927e2a26775" +#define JEMALLOC_VERSION "3.4.1-0-g0135fb806e4137dc9cdf152541926a2bc95e33f0" #define JEMALLOC_VERSION_MAJOR 3 #define JEMALLOC_VERSION_MINOR 4 -#define JEMALLOC_VERSION_BUGFIX 0 +#define JEMALLOC_VERSION_BUGFIX 1 #define JEMALLOC_VERSION_NREV 0 -#define JEMALLOC_VERSION_GID "0ed518e5dab789ad2171bb38977a8927e2a26775" +#define JEMALLOC_VERSION_GID "0135fb806e4137dc9cdf152541926a2bc95e33f0" #include "jemalloc_defs.h" #include "jemalloc_FreeBSD.h" Modified: projects/camlock/contrib/jemalloc/src/arena.c ============================================================================== --- projects/camlock/contrib/jemalloc/src/arena.c Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/contrib/jemalloc/src/arena.c Mon Oct 21 09:03:30 2013 (r256837) @@ -369,13 +369,20 @@ arena_run_zero(arena_chunk_t *chunk, siz } static inline void +arena_run_page_mark_zeroed(arena_chunk_t *chunk, size_t run_ind) +{ + + VALGRIND_MAKE_MEM_DEFINED((void *)((uintptr_t)chunk + (run_ind << + LG_PAGE)), PAGE); +} + +static inline void arena_run_page_validate_zeroed(arena_chunk_t *chunk, size_t run_ind) { size_t i; UNUSED size_t *p = (size_t *)((uintptr_t)chunk + (run_ind << LG_PAGE)); - VALGRIND_MAKE_MEM_DEFINED((void *)((uintptr_t)chunk + (run_ind << - LG_PAGE)), PAGE); + arena_run_page_mark_zeroed(chunk, run_ind); for (i = 0; i < PAGE / sizeof(size_t); i++) assert(p[i] == 0); } @@ -458,6 +465,9 @@ arena_run_split(arena_t *arena, arena_ru } else if (config_debug) { arena_run_page_validate_zeroed( chunk, run_ind+i); + } else { + arena_run_page_mark_zeroed( + chunk, run_ind+i); } } } else { @@ -467,6 +477,9 @@ arena_run_split(arena_t *arena, arena_ru */ arena_run_zero(chunk, run_ind, need_pages); } + } else { + VALGRIND_MAKE_MEM_UNDEFINED((void *)((uintptr_t)chunk + + (run_ind << LG_PAGE)), (need_pages << LG_PAGE)); } /* @@ -508,9 +521,9 @@ arena_run_split(arena_t *arena, arena_ru arena_run_page_validate_zeroed(chunk, run_ind+need_pages-1); } + VALGRIND_MAKE_MEM_UNDEFINED((void *)((uintptr_t)chunk + + (run_ind << LG_PAGE)), (need_pages << LG_PAGE)); } - VALGRIND_MAKE_MEM_UNDEFINED((void *)((uintptr_t)chunk + (run_ind << - LG_PAGE)), (need_pages << LG_PAGE)); } static arena_chunk_t * @@ -569,17 +582,24 @@ arena_chunk_alloc(arena_t *arena) * unless the chunk is not zeroed. */ if (zero == false) { + VALGRIND_MAKE_MEM_UNDEFINED( + (void *)arena_mapp_get(chunk, map_bias+1), + (size_t)((uintptr_t) arena_mapp_get(chunk, + chunk_npages-1) - (uintptr_t)arena_mapp_get(chunk, + map_bias+1))); for (i = map_bias+1; i < chunk_npages-1; i++) arena_mapbits_unzeroed_set(chunk, i, unzeroed); - } else if (config_debug) { + } else { VALGRIND_MAKE_MEM_DEFINED( (void *)arena_mapp_get(chunk, map_bias+1), - (void *)((uintptr_t) - arena_mapp_get(chunk, chunk_npages-1) - - (uintptr_t)arena_mapp_get(chunk, map_bias+1))); - for (i = map_bias+1; i < chunk_npages-1; i++) { - assert(arena_mapbits_unzeroed_get(chunk, i) == - unzeroed); + (size_t)((uintptr_t) arena_mapp_get(chunk, + chunk_npages-1) - (uintptr_t)arena_mapp_get(chunk, + map_bias+1))); + if (config_debug) { + for (i = map_bias+1; i < chunk_npages-1; i++) { + assert(arena_mapbits_unzeroed_get(chunk, + i) == unzeroed); + } } } arena_mapbits_unallocated_set(chunk, chunk_npages-1, @@ -1458,6 +1478,7 @@ arena_malloc_small(arena_t *arena, size_ } else if (opt_zero) memset(ret, 0, size); } + VALGRIND_MAKE_MEM_UNDEFINED(ret, size); } else { if (config_fill && opt_junk) { arena_alloc_junk_small(ret, &arena_bin_info[binind], @@ -1466,7 +1487,6 @@ arena_malloc_small(arena_t *arena, size_ VALGRIND_MAKE_MEM_UNDEFINED(ret, size); memset(ret, 0, size); } - VALGRIND_MAKE_MEM_UNDEFINED(ret, size); return (ret); } Modified: projects/camlock/contrib/jemalloc/src/chunk.c ============================================================================== --- projects/camlock/contrib/jemalloc/src/chunk.c Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/contrib/jemalloc/src/chunk.c Mon Oct 21 09:03:30 2013 (r256837) @@ -294,7 +294,7 @@ label_return: if (xnode != NULL) base_node_dealloc(xnode); if (xprev != NULL) - base_node_dealloc(prev); + base_node_dealloc(xprev); } void Modified: projects/camlock/contrib/jemalloc/src/ctl.c ============================================================================== --- projects/camlock/contrib/jemalloc/src/ctl.c Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/contrib/jemalloc/src/ctl.c Mon Oct 21 09:03:30 2013 (r256837) @@ -546,43 +546,30 @@ ctl_arena_refresh(arena_t *arena, unsign static bool ctl_grow(void) { - size_t astats_size; ctl_arena_stats_t *astats; arena_t **tarenas; - /* Extend arena stats and arenas arrays. */ - astats_size = (ctl_stats.narenas + 2) * sizeof(ctl_arena_stats_t); - if (ctl_stats.narenas == narenas_auto) { - /* ctl_stats.arenas and arenas came from base_alloc(). */ - astats = (ctl_arena_stats_t *)imalloc(astats_size); - if (astats == NULL) - return (true); - memcpy(astats, ctl_stats.arenas, (ctl_stats.narenas + 1) * - sizeof(ctl_arena_stats_t)); - - tarenas = (arena_t **)imalloc((ctl_stats.narenas + 1) * - sizeof(arena_t *)); - if (tarenas == NULL) { - idalloc(astats); - return (true); - } - memcpy(tarenas, arenas, ctl_stats.narenas * sizeof(arena_t *)); - } else { - astats = (ctl_arena_stats_t *)iralloc(ctl_stats.arenas, - astats_size, 0, 0, false, false); - if (astats == NULL) - return (true); - - tarenas = (arena_t **)iralloc(arenas, (ctl_stats.narenas + 1) * - sizeof(arena_t *), 0, 0, false, false); - if (tarenas == NULL) - return (true); + /* Allocate extended arena stats and arenas arrays. */ + astats = (ctl_arena_stats_t *)imalloc((ctl_stats.narenas + 2) * + sizeof(ctl_arena_stats_t)); + if (astats == NULL) + return (true); + tarenas = (arena_t **)imalloc((ctl_stats.narenas + 1) * + sizeof(arena_t *)); + if (tarenas == NULL) { + idalloc(astats); + return (true); } - /* Initialize the new astats and arenas elements. */ + + /* Initialize the new astats element. */ + memcpy(astats, ctl_stats.arenas, (ctl_stats.narenas + 1) * + sizeof(ctl_arena_stats_t)); memset(&astats[ctl_stats.narenas + 1], 0, sizeof(ctl_arena_stats_t)); - if (ctl_arena_init(&astats[ctl_stats.narenas + 1])) + if (ctl_arena_init(&astats[ctl_stats.narenas + 1])) { + idalloc(tarenas); + idalloc(astats); return (true); - tarenas[ctl_stats.narenas] = NULL; + } /* Swap merged stats to their new location. */ { ctl_arena_stats_t tstats; @@ -593,13 +580,34 @@ ctl_grow(void) memcpy(&astats[ctl_stats.narenas + 1], &tstats, sizeof(ctl_arena_stats_t)); } + /* Initialize the new arenas element. */ + tarenas[ctl_stats.narenas] = NULL; + { + arena_t **arenas_old = arenas; + /* + * Swap extended arenas array into place. Although ctl_mtx + * protects this function from other threads extending the + * array, it does not protect from other threads mutating it + * (i.e. initializing arenas and setting array elements to + * point to them). Therefore, array copying must happen under + * the protection of arenas_lock. + */ + malloc_mutex_lock(&arenas_lock); + arenas = tarenas; + memcpy(arenas, arenas_old, ctl_stats.narenas * + sizeof(arena_t *)); + narenas_total++; + arenas_extend(narenas_total - 1); + malloc_mutex_unlock(&arenas_lock); + /* + * Deallocate arenas_old only if it came from imalloc() (not + * base_alloc()). + */ + if (ctl_stats.narenas != narenas_auto) + idalloc(arenas_old); + } ctl_stats.arenas = astats; ctl_stats.narenas++; - malloc_mutex_lock(&arenas_lock); - arenas = tarenas; - narenas_total++; - arenas_extend(narenas_total - 1); - malloc_mutex_unlock(&arenas_lock); return (false); } @@ -1109,7 +1117,7 @@ epoch_ctl(const size_t *mib, size_t mibl void *newp, size_t newlen) { int ret; - uint64_t newval; + UNUSED uint64_t newval; malloc_mutex_lock(&ctl_mtx); WRITE(newval, uint64_t); Modified: projects/camlock/contrib/jemalloc/src/jemalloc.c ============================================================================== --- projects/camlock/contrib/jemalloc/src/jemalloc.c Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/contrib/jemalloc/src/jemalloc.c Mon Oct 21 09:03:30 2013 (r256837) @@ -286,7 +286,7 @@ arenas_cleanup(void *arg) malloc_mutex_unlock(&arenas_lock); } -static JEMALLOC_ATTR(always_inline) void +JEMALLOC_ALWAYS_INLINE_C void malloc_thread_init(void) { @@ -303,7 +303,7 @@ malloc_thread_init(void) quarantine_alloc_hook(); } -static JEMALLOC_ATTR(always_inline) bool +JEMALLOC_ALWAYS_INLINE_C bool malloc_init(void) { @@ -440,8 +440,9 @@ malloc_conf_init(void) } break; case 1: { + int linklen = 0; #ifndef _WIN32 - int linklen; + int saved_errno = errno; const char *linkname = # ifdef JEMALLOC_PREFIX "/etc/"JEMALLOC_PREFIX"malloc.conf" @@ -450,21 +451,20 @@ malloc_conf_init(void) # endif ; - if ((linklen = readlink(linkname, buf, - sizeof(buf) - 1)) != -1) { - /* - * Use the contents of the "/etc/malloc.conf" - * symbolic link's name. - */ - buf[linklen] = '\0'; - opts = buf; - } else -#endif - { + /* + * Try to use the contents of the "/etc/malloc.conf" + * symbolic link's name. + */ + linklen = readlink(linkname, buf, sizeof(buf) - 1); + if (linklen == -1) { /* No configuration specified. */ - buf[0] = '\0'; - opts = buf; + linklen = 0; + /* restore errno */ + set_errno(saved_errno); } +#endif + buf[linklen] = '\0'; + opts = buf; break; } case 2: { const char *envname = @@ -1407,7 +1407,7 @@ je_mallctlbymib(const size_t *mib, size_ */ #ifdef JEMALLOC_EXPERIMENTAL -static JEMALLOC_ATTR(always_inline) void * +JEMALLOC_ALWAYS_INLINE_C void * iallocm(size_t usize, size_t alignment, bool zero, bool try_tcache, arena_t *arena) { Modified: projects/camlock/etc/defaults/rc.conf ============================================================================== --- projects/camlock/etc/defaults/rc.conf Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/etc/defaults/rc.conf Mon Oct 21 09:03:30 2013 (r256837) @@ -573,6 +573,8 @@ sendmail_enable="NO" # Run the sendmail sendmail_pidfile="/var/run/sendmail.pid" # sendmail pid file sendmail_procname="/usr/sbin/sendmail" # sendmail process name sendmail_flags="-L sm-mta -bd -q30m" # Flags to sendmail (as a server) +sendmail_cert_create="YES" # Create a server certificate if none (YES/NO) +#sendmail_cert_cn="CN" # CN of the generate certificate sendmail_submit_enable="YES" # Start a localhost-only MTA for mail submission sendmail_submit_flags="-L sm-mta -bd -q30m -ODaemonPortOptions=Addr=localhost" # Flags for localhost-only MTA @@ -619,6 +621,9 @@ quotacheck_flags="-a" # Check all file s accounting_enable="NO" # Turn on process accounting (or NO). ibcs2_enable="NO" # Ibcs2 (SCO) emulation loaded at startup (or NO). ibcs2_loaders="coff" # List of additional Ibcs2 loaders (or NO). +firstboot_sentinel="/firstboot" # Scripts with "firstboot" keyword are run if + # this file exists. Should be on a R/W filesystem so + # the file can be deleted after the boot completes. # Emulation/compatibility services provided by /etc/rc.d/abi sysvipc_enable="NO" # Load System V IPC primitives at startup (or NO). Modified: projects/camlock/etc/mtree/BSD.usr.dist ============================================================================== --- projects/camlock/etc/mtree/BSD.usr.dist Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/etc/mtree/BSD.usr.dist Mon Oct 21 09:03:30 2013 (r256837) @@ -169,12 +169,6 @@ .. atm .. - bind9 - arm - .. - misc - .. - .. legal intel_ipw .. Modified: projects/camlock/etc/rc ============================================================================== --- projects/camlock/etc/rc Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/etc/rc Mon Oct 21 09:03:30 2013 (r256837) @@ -82,10 +82,15 @@ if [ `/sbin/sysctl -n security.jail.jail fi fi +# If the firstboot sentinel doesn't exist, we want to skip firstboot scripts. +if ! [ -e ${firstboot_sentinel} ]; then + skip_firstboot="-s firstboot" +fi + # Do a first pass to get everything up to $early_late_divider so that # we can do a second pass that includes $local_startup directories # -files=`rcorder ${skip} /etc/rc.d/* 2>/dev/null` +files=`rcorder ${skip} ${skip_firstboot} /etc/rc.d/* 2>/dev/null` _rc_elem_done=' ' for _rc_elem in ${files}; do @@ -107,7 +112,13 @@ case ${local_startup} in *) find_local_scripts_new ;; esac -files=`rcorder ${skip} /etc/rc.d/* ${local_rc} 2>/dev/null` +# The firstboot sentinel might be on a newly mounted filesystem; look for it +# again and unset skip_firstboot if we find it. +if [ -e ${firstboot_sentinel} ]; then + skip_firstboot="" +fi + +files=`rcorder ${skip} ${skip_firstboot} /etc/rc.d/* ${local_rc} 2>/dev/null` for _rc_elem in ${files}; do case "$_rc_elem_done" in *" $_rc_elem "*) continue ;; @@ -116,6 +127,15 @@ for _rc_elem in ${files}; do run_rc_script ${_rc_elem} ${_boot} done +# Remove the firstboot sentinel, and reboot if it was requested. +if [ -e ${firstboot_sentinel} ]; then + rm ${firstboot_sentinel} + if [ -e ${firstboot_sentinel}-reboot ]; then + rm ${firstboot_sentinel}-reboot + kill -INT 1 + fi +fi + echo '' date exit 0 Modified: projects/camlock/etc/rc.d/jail ============================================================================== --- projects/camlock/etc/rc.d/jail Mon Oct 21 08:57:27 2013 (r256836) +++ projects/camlock/etc/rc.d/jail Mon Oct 21 09:03:30 2013 (r256837) @@ -132,7 +132,9 @@ parse_options() # _confwarn=1 if [ -r "$jail_conf" -o -r "$_jconf" ]; then - warn "$_conf is created and used for jail $_j." + if ! checkyesno jail_parallel_start; then + warn "$_conf is created and used for jail $_j." + fi fi /usr/bin/install -m 0644 -o root -g wheel /dev/null $_conf || return 1 @@ -367,10 +369,10 @@ jail_handle_ips_option() # Append address to list of addresses for the jail command. case $_type in inet) - echo " ip4.addr += \"${_iface}|${_addr}${_mask}\";" + echo " ip4.addr += \"${_iface:+${_iface}|}${_addr}${_mask}\";" ;; inet6) - echo " ip6.addr += \"${_iface}|${_addr}${_mask}\";" + echo " ip6.addr += \"${_iface:+${_iface}|}${_addr}${_mask}\";" need_dad_wait=1 ;; esac @@ -418,7 +420,7 @@ jail_status() jail_start() { - local _j _jid _jn + local _j _jid _jn _jl if [ $# = 0 ]; then return @@ -426,47 +428,82 @@ jail_start() echo -n 'Starting jails:' case $1 in _ALL) - echo -n ' ' command=$jail_program rc_flags=$jail_flags command_args="-f $jail_conf -c" - $jail_jls -nq | while read IN; do - _jn=$(echo $IN | tr " " "\n" | grep name=) - _jid=$(echo $IN | tr " " "\n" | grep jid=) - if $command $rc_flags $command_args ${_jn#name=}; then + _tmp=`mktemp -t jail` || exit 3 + if $command $rc_flags $command_args >> $_tmp 2>&1; then + $jail_jls -nq | while read IN; do + _jn=$(echo $IN | tr " " "\n" | grep ^name=) + _jid=$(echo $IN | tr " " "\n" | grep ^jid=) echo -n " ${_jn#name=}" echo "${_jid#jid=}" \ > /var/run/jail_${_jn#name=}.id - fi - done + done + else + tail -1 $_tmp + fi + rm -f $_tmp echo '.' return ;; esac - _tmp=`mktemp -t jail` || exit 3 - for _j in $@; do - _j=$(echo $_j | tr /. _) - parse_options $_j || continue - - eval rc_flags=\${jail_${_j}_flags:-$jail_flags} - eval command=\${jail_${_j}_program:-$jail_program} - if checkyesno jail_parallel_start; then - command_args="-i -f $_conf -c $_j &" - else + if checkyesno jail_parallel_start; then + # + # Start jails in parallel and then check jail id when + # jail_parallel_start is YES. + # + _jl= + for _j in $@; do + _j=$(echo $_j | tr /. _) + parse_options $_j || continue + + _jl="$_jl $_j" + eval rc_flags=\${jail_${_j}_flags:-$jail_flags} + eval command=\${jail_${_j}_program:-$jail_program} command_args="-i -f $_conf -c $_j" - fi - if $command $rc_flags $command_args \ - >> $_tmp 2>&1 /dev/null 2>&1 /var/run/jail_${_j}.id - else - rm -f /var/run/jail_${_j}.id - echo " cannot start jail \"${_hostname:-${_j}}\": " - cat $_tmp - fi - rm -f $_tmp - done + if _jid=$($jail_jls -n -j $_j | tr " " "\n" | \ + grep ^jid=); then + echo "${_jid#jid=}" > /var/run/jail_${_j}.id + else + rm -f /var/run/jail_${_j}.id + echo " cannot start jail " \ + "\"${_hostname:-${_j}}\": " + fi + done + else + # + # Start jails one-by-one when jail_parallel_start is NO. + # + for _j in $@; do + _j=$(echo $_j | tr /. _) + parse_options $_j || continue + + eval rc_flags=\${jail_${_j}_flags:-$jail_flags} + eval command=\${jail_${_j}_program:-$jail_program} + command_args="-i -f $_conf -c $_j" + _tmp=`mktemp -t jail` || exit 3 + if $command $rc_flags $command_args \ + >> $_tmp 2>&1 /var/run/jail_${_j}.id + else + rm -f /var/run/jail_${_j}.id + echo " cannot start jail " \ + "\"${_hostname:-${_j}}\": " + cat $_tmp + fi + rm -f $_tmp + done + fi echo '.' } @@ -480,17 +517,21 @@ jail_stop() echo -n 'Stopping jails:' case $1 in _ALL) - echo -n ' ' command=$jail_program rc_flags=$jail_flags command_args="-f $jail_conf -r" $jail_jls -nq | while read IN; do - _jn=$(echo $IN | tr " " "\n" | grep name=) + _jn=$(echo $IN | tr " " "\n" | grep ^name=) echo -n " ${_jn#name=}" - $command $rc_flags $command_args ${_jn#name=} - if ! $jail_jls -j ${_jn#name=} > /dev/null 2>&1; then + _tmp=`mktemp -t jail` || exit 3 + $command $rc_flags $command_args ${_jn#name=} \ + >> $_tmp 2>&1 + if $jail_jls -j ${_jn#name=} > /dev/null 2>&1; then + tail -1 $_tmp + else rm -f /var/run/jail_${_jn#name=}.id fi + rm -f $_tmp done echo '.' return @@ -504,10 +545,14 @@ jail_stop() fi eval command=\${jail_${_j}_program:-$jail_program} echo -n " ${_hostname:-${_j}}" - $command -q -f $_conf -r $_j - if ! $jail_jls -j $_j > /dev/null 2>&1; then + _tmp=`mktemp -t jail` || exit 3 + $command -q -f $_conf -r $_j >> $_tmp 2>&1 + if $jail_jls -j $_j > /dev/null 2>&1; then *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Oct 21 09:51:07 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 37E0D1DB; Mon, 21 Oct 2013 09:51:07 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 24F6E29F8; Mon, 21 Oct 2013 09:51:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9L9p7VU087395; Mon, 21 Oct 2013 09:51:07 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9L9p6ID087392; Mon, 21 Oct 2013 09:51:06 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310210951.r9L9p6ID087392@svn.freebsd.org> From: Alexander Motin Date: Mon, 21 Oct 2013 09:51:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256840 - projects/camlock/sys/cam X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Oct 2013 09:51:07 -0000 Author: mav Date: Mon Oct 21 09:51:06 2013 New Revision: 256840 URL: http://svnweb.freebsd.org/changeset/base/256840 Log: Collect some garbage left after several code refactorings. Modified: projects/camlock/sys/cam/cam_sim.c projects/camlock/sys/cam/cam_sim.h projects/camlock/sys/cam/cam_xpt.c Modified: projects/camlock/sys/cam/cam_sim.c ============================================================================== --- projects/camlock/sys/cam/cam_sim.c Mon Oct 21 09:34:04 2013 (r256839) +++ projects/camlock/sys/cam/cam_sim.c Mon Oct 21 09:51:06 2013 (r256840) @@ -95,9 +95,6 @@ cam_sim_alloc(sim_action_func sim_action sim->flags |= CAM_SIM_MPSAFE; callout_init(&sim->callout, 1); } - mtx_init(&sim->sim_doneq_mtx, "CAM doneq", NULL, MTX_DEF); - TAILQ_INIT(&sim->sim_doneq); - return (sim); } @@ -117,7 +114,6 @@ cam_sim_free(struct cam_sim *sim, int fr if (free_devq) cam_simq_free(sim->devq); - mtx_destroy(&sim->sim_doneq_mtx); free(sim, M_CAMSIM); } Modified: projects/camlock/sys/cam/cam_sim.h ============================================================================== --- projects/camlock/sys/cam/cam_sim.h Mon Oct 21 09:34:04 2013 (r256839) +++ projects/camlock/sys/cam/cam_sim.h Mon Oct 21 09:51:06 2013 (r256840) @@ -110,11 +110,6 @@ struct cam_sim { struct callout callout; struct cam_devq *devq; /* Device Queue to use for this SIM */ int refcount; /* References to the SIM. */ - int sim_doneq_flags; -#define CAM_SIM_DQ_ONQ 0x04 -#define CAM_SIM_DQ_POLLED 0x08 -#define CAM_SIM_DQ_BATCH 0x10 - struct mtx sim_doneq_mtx; }; #define CAM_SIM_LOCK(sim) mtx_lock((sim)->mtx) Modified: projects/camlock/sys/cam/cam_xpt.c ============================================================================== --- projects/camlock/sys/cam/cam_xpt.c Mon Oct 21 09:34:04 2013 (r256839) +++ projects/camlock/sys/cam/cam_xpt.c Mon Oct 21 09:51:06 2013 (r256840) @@ -258,7 +258,7 @@ static int xpt_schedule_dev(struct camq static xpt_devicefunc_t xptpassannouncefunc; static void xptaction(struct cam_sim *sim, union ccb *work_ccb); static void xptpoll(struct cam_sim *sim); -static void camisr_runqueue(struct cam_sim *); +static void camisr_runqueue(void); static void xpt_done_process(struct ccb_hdr *ccb_h); static void xpt_done_td(void *); static dev_match_ret xptbusmatch(struct dev_match_pattern *patterns, @@ -3012,11 +3012,6 @@ xpt_polled_action(union ccb *start_ccb) mtx_unlock(&dev->device_mtx); - /* Don't use ISR for this SIM while polling. */ - mtx_lock(&sim->sim_doneq_mtx); - sim->sim_doneq_flags |= CAM_SIM_DQ_POLLED; - mtx_unlock(&sim->sim_doneq_mtx); - /* * Steal an opening so that no other queued requests * can get it before us while we simulate interrupts. @@ -3031,7 +3026,7 @@ xpt_polled_action(union ccb *start_ccb) CAM_SIM_LOCK(sim); (*(sim->sim_poll))(sim); CAM_SIM_UNLOCK(sim); - camisr_runqueue(sim); + camisr_runqueue(); mtx_lock(&devq->send_mtx); } dev->ccbq.devq_openings++; @@ -3044,7 +3039,7 @@ xpt_polled_action(union ccb *start_ccb) CAM_SIM_LOCK(sim); (*(sim->sim_poll))(sim); CAM_SIM_UNLOCK(sim); - camisr_runqueue(sim); + camisr_runqueue(); if ((start_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_INPROG) break; @@ -3063,11 +3058,6 @@ xpt_polled_action(union ccb *start_ccb) start_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; } - /* We will use CAM ISR for this SIM again. */ - mtx_lock(&sim->sim_doneq_mtx); - sim->sim_doneq_flags &= ~CAM_SIM_DQ_POLLED; - mtx_unlock(&sim->sim_doneq_mtx); - camisr_runqueue(sim); mtx_lock(&dev->device_mtx); } @@ -5289,24 +5279,12 @@ xpt_done_td(void *arg) } static void -camisr_runqueue(struct cam_sim *sim) +camisr_runqueue(void) { struct ccb_hdr *ccb_h; struct cam_doneq *queue; int i; - /* Process per-SIM queue. */ - mtx_lock(&sim->sim_doneq_mtx); - while ((ccb_h = TAILQ_FIRST(&sim->sim_doneq)) != NULL) { - TAILQ_REMOVE(&sim->sim_doneq, ccb_h, sim_links.tqe); - mtx_unlock(&sim->sim_doneq_mtx); - ccb_h->pinfo.index = CAM_UNQUEUED_INDEX; - xpt_done_process(ccb_h); - mtx_lock(&sim->sim_doneq_mtx); - } - sim->sim_doneq_flags &= ~CAM_SIM_DQ_ONQ; - mtx_unlock(&sim->sim_doneq_mtx); - /* Process global queues. */ for (i = 0; i < cam_num_doneqs; i++) { queue = &cam_doneqs[i]; From owner-svn-src-projects@FreeBSD.ORG Mon Oct 21 10:08:40 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BB073B1E; Mon, 21 Oct 2013 10:08:40 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A8D4D2AA9; Mon, 21 Oct 2013 10:08:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9LA8ean096004; Mon, 21 Oct 2013 10:08:40 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9LA8e7d096003; Mon, 21 Oct 2013 10:08:40 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310211008.r9LA8e7d096003@svn.freebsd.org> From: Alexander Motin Date: Mon, 21 Oct 2013 10:08:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256841 - projects/camlock/sys/cam X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Oct 2013 10:08:40 -0000 Author: mav Date: Mon Oct 21 10:08:39 2013 New Revision: 256841 URL: http://svnweb.freebsd.org/changeset/base/256841 Log: Includes are not needed either. Modified: projects/camlock/sys/cam/cam_sim.h Modified: projects/camlock/sys/cam/cam_sim.h ============================================================================== --- projects/camlock/sys/cam/cam_sim.h Mon Oct 21 09:51:06 2013 (r256840) +++ projects/camlock/sys/cam/cam_sim.h Mon Oct 21 10:08:39 2013 (r256841) @@ -33,9 +33,6 @@ #ifdef _KERNEL -#include -#include - /* * The sim driver creates a sim for each controller. The sim device * queue is separately created in order to allow resource sharing between From owner-svn-src-projects@FreeBSD.ORG Mon Oct 21 12:12:18 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8A0829D5; Mon, 21 Oct 2013 12:12:18 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 750E023EB; Mon, 21 Oct 2013 12:12:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9LCCIuN065204; Mon, 21 Oct 2013 12:12:18 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9LCCHoc065200; Mon, 21 Oct 2013 12:12:17 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310211212.r9LCCHoc065200@svn.freebsd.org> From: Alexander Motin Date: Mon, 21 Oct 2013 12:12:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256844 - in projects/camlock: . bin/ps sys/arm/broadcom/bcm2835 sys/dev/usb/controller X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Oct 2013 12:12:18 -0000 Author: mav Date: Mon Oct 21 12:12:17 2013 New Revision: 256844 URL: http://svnweb.freebsd.org/changeset/base/256844 Log: MFC @ r256843 Added: projects/camlock/sys/dev/usb/controller/dwc_otg_fdt.c - copied unchanged from r256843, head/sys/dev/usb/controller/dwc_otg_fdt.c Deleted: projects/camlock/sys/arm/broadcom/bcm2835/dwc_otg_brcm.c Modified: projects/camlock/Makefile.inc1 projects/camlock/bin/ps/print.c projects/camlock/sys/arm/broadcom/bcm2835/files.bcm2835 Directory Properties: projects/camlock/ (props changed) projects/camlock/sys/ (props changed) Modified: projects/camlock/Makefile.inc1 ============================================================================== --- projects/camlock/Makefile.inc1 Mon Oct 21 12:00:26 2013 (r256843) +++ projects/camlock/Makefile.inc1 Mon Oct 21 12:12:17 2013 (r256844) @@ -1722,6 +1722,13 @@ delete-old-libs: chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ rm ${RM_I} "${DESTDIR}/$${file}" <&3; \ fi; \ + for ext in debug symbols; do \ + if ! [ -e "${DESTDIR}/$${file}" ] && [ -f \ + "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \ + rm ${RM_I} "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" \ + <&3; \ + fi; \ + done; \ done @echo ">>> Old libraries removed" @@ -1733,6 +1740,11 @@ check-old-libs: if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ echo "${DESTDIR}/$${file}"; \ fi; \ + for ext in debug symbols; do \ + if [ -f "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \ + echo "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}"; \ + fi; \ + done; \ done delete-old-dirs: Modified: projects/camlock/bin/ps/print.c ============================================================================== --- projects/camlock/bin/ps/print.c Mon Oct 21 12:00:26 2013 (r256843) +++ projects/camlock/bin/ps/print.c Mon Oct 21 12:12:17 2013 (r256844) @@ -797,8 +797,6 @@ char * emulname(KINFO *k, VARENT *ve __unused) { - if (k->ki_p->ki_emul == NULL) - return (NULL); return (strdup(k->ki_p->ki_emul)); } @@ -827,7 +825,6 @@ out: char * loginclass(KINFO *k, VARENT *ve __unused) { - char *s; /* * Don't display login class for system processes; @@ -837,8 +834,5 @@ loginclass(KINFO *k, VARENT *ve __unused if (k->ki_p->ki_flag & P_SYSTEM) { return (strdup("-")); } - s = k->ki_p->ki_loginclass; - if (s == NULL) - return (NULL); - return (strdup(s)); + return (strdup(k->ki_p->ki_loginclass)); } Modified: projects/camlock/sys/arm/broadcom/bcm2835/files.bcm2835 ============================================================================== --- projects/camlock/sys/arm/broadcom/bcm2835/files.bcm2835 Mon Oct 21 12:00:26 2013 (r256843) +++ projects/camlock/sys/arm/broadcom/bcm2835/files.bcm2835 Mon Oct 21 12:12:17 2013 (r256844) @@ -11,7 +11,7 @@ arm/broadcom/bcm2835/bcm2835_systimer.c arm/broadcom/bcm2835/bcm2835_wdog.c standard arm/broadcom/bcm2835/bus_space.c optional fdt arm/broadcom/bcm2835/common.c optional fdt -arm/broadcom/bcm2835/dwc_otg_brcm.c optional dwcotg +dev/usb/controller/dwc_otg_fdt.c optional dwcotg arm/arm/bus_space_generic.c standard arm/arm/bus_space_asm_generic.S standard Copied: projects/camlock/sys/dev/usb/controller/dwc_otg_fdt.c (from r256843, head/sys/dev/usb/controller/dwc_otg_fdt.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/camlock/sys/dev/usb/controller/dwc_otg_fdt.c Mon Oct 21 12:12:17 2013 (r256844, copy of r256843, head/sys/dev/usb/controller/dwc_otg_fdt.c) @@ -0,0 +1,211 @@ +/*- + * Copyright (c) 2012 Hans Petter Selasky. 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + +#include +#include + +#include + +static device_probe_t dwc_otg_probe; +static device_attach_t dwc_otg_attach; +static device_detach_t dwc_otg_detach; + +struct dwc_otg_super_softc { + struct dwc_otg_softc sc_otg; /* must be first */ +}; + +static int +dwc_otg_probe(device_t dev) +{ + if (!ofw_bus_is_compatible(dev, "synopsys,designware-hs-otg2")) + return (ENXIO); + + device_set_desc(dev, "DWC OTG 2.0 integrated USB controller"); + + return (0); +} + +static int +dwc_otg_attach(device_t dev) +{ + struct dwc_otg_super_softc *sc = device_get_softc(dev); + int err; + int rid; + + /* initialise some bus fields */ + sc->sc_otg.sc_bus.parent = dev; + sc->sc_otg.sc_bus.devices = sc->sc_otg.sc_devices; + sc->sc_otg.sc_bus.devices_max = DWC_OTG_MAX_DEVICES; + + /* get all DMA memory */ + if (usb_bus_mem_alloc_all(&sc->sc_otg.sc_bus, + USB_GET_DMA_TAG(dev), NULL)) { + return (ENOMEM); + } + rid = 0; + sc->sc_otg.sc_io_res = + bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); + + if (!(sc->sc_otg.sc_io_res)) { + err = ENOMEM; + goto error; + } + sc->sc_otg.sc_io_tag = rman_get_bustag(sc->sc_otg.sc_io_res); + sc->sc_otg.sc_io_hdl = rman_get_bushandle(sc->sc_otg.sc_io_res); + sc->sc_otg.sc_io_size = rman_get_size(sc->sc_otg.sc_io_res); + + rid = 0; + sc->sc_otg.sc_irq_res = + bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); + if (sc->sc_otg.sc_irq_res == NULL) + goto error; + + sc->sc_otg.sc_bus.bdev = device_add_child(dev, "usbus", -1); + if (sc->sc_otg.sc_bus.bdev == NULL) + goto error; + + device_set_ivars(sc->sc_otg.sc_bus.bdev, &sc->sc_otg.sc_bus); + + err = bus_setup_intr(dev, sc->sc_otg.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, + NULL, (driver_intr_t *)dwc_otg_interrupt, sc, &sc->sc_otg.sc_intr_hdl); + if (err) { + sc->sc_otg.sc_intr_hdl = NULL; + goto error; + } + err = dwc_otg_init(&sc->sc_otg); + if (err == 0) { + err = device_probe_and_attach(sc->sc_otg.sc_bus.bdev); + } + if (err) + goto error; + + + return (0); + +error: + dwc_otg_detach(dev); + return (ENXIO); +} + +static int +dwc_otg_detach(device_t dev) +{ + struct dwc_otg_super_softc *sc = device_get_softc(dev); + device_t bdev; + int err; + + if (sc->sc_otg.sc_bus.bdev) { + bdev = sc->sc_otg.sc_bus.bdev; + device_detach(bdev); + device_delete_child(dev, bdev); + } + /* during module unload there are lots of children leftover */ + device_delete_children(dev); + + if (sc->sc_otg.sc_irq_res && sc->sc_otg.sc_intr_hdl) { + /* + * only call dwc_otg_uninit() after dwc_otg_init() + */ + dwc_otg_uninit(&sc->sc_otg); + + err = bus_teardown_intr(dev, sc->sc_otg.sc_irq_res, + sc->sc_otg.sc_intr_hdl); + sc->sc_otg.sc_intr_hdl = NULL; + } + /* free IRQ channel, if any */ + if (sc->sc_otg.sc_irq_res) { + bus_release_resource(dev, SYS_RES_IRQ, 0, + sc->sc_otg.sc_irq_res); + sc->sc_otg.sc_irq_res = NULL; + } + /* free memory resource, if any */ + if (sc->sc_otg.sc_io_res) { + bus_release_resource(dev, SYS_RES_MEMORY, 0, + sc->sc_otg.sc_io_res); + sc->sc_otg.sc_io_res = NULL; + } + usb_bus_mem_free_all(&sc->sc_otg.sc_bus, NULL); + + return (0); +} + +static device_method_t dwc_otg_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, dwc_otg_probe), + DEVMETHOD(device_attach, dwc_otg_attach), + DEVMETHOD(device_detach, dwc_otg_detach), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + + DEVMETHOD_END +}; + +static driver_t dwc_otg_driver = { + .name = "dwcotg", + .methods = dwc_otg_methods, + .size = sizeof(struct dwc_otg_super_softc), +}; + +static devclass_t dwc_otg_devclass; + +DRIVER_MODULE(dwcotg, simplebus, dwc_otg_driver, dwc_otg_devclass, 0, 0); +MODULE_DEPEND(dwcotg, usb, 1, 1, 1); From owner-svn-src-projects@FreeBSD.ORG Mon Oct 21 18:47:29 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9380ECE4; Mon, 21 Oct 2013 18:47:29 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 816882CB6; Mon, 21 Oct 2013 18:47:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9LIlToF078601; Mon, 21 Oct 2013 18:47:29 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9LIlTwR078600; Mon, 21 Oct 2013 18:47:29 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310211847.r9LIlTwR078600@svn.freebsd.org> From: "Simon J. Gerraty" Date: Mon, 21 Oct 2013 18:47:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256856 - projects/bmake/etc X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Oct 2013 18:47:29 -0000 Author: sjg Date: Mon Oct 21 18:47:29 2013 New Revision: 256856 URL: http://svnweb.freebsd.org/changeset/base/256856 Log: Fix botched sed script Modified: projects/bmake/etc/Makefile Modified: projects/bmake/etc/Makefile ============================================================================== --- projects/bmake/etc/Makefile Mon Oct 21 18:47:02 2013 (r256855) +++ projects/bmake/etc/Makefile Mon Oct 21 18:47:29 2013 (r256856) @@ -308,10 +308,10 @@ distribution: MTREE_CMD?= mtree .if ${MK_INSTALL_AS_USER} != "no" && ${_uid} != 0 -MTREE_FILTER= sed -e 's,(uname=)[^ ]* ,\1${BINOWN},' \ - -e 's,(gname=)[^ ]* ,\1${BINGRP},' \ - -e 's,(uid=)[^ ]* ,\1${_uid},' \ - -e 's,(gid=)[^ ]* ,\1${_gid},' +MTREE_FILTER= sed -e 's,\(uname=\)[^ ]* ,\1${BINOWN} ,' \ + -e 's,\(gname=\)[^ ]* ,\1${BINGRP} ,' \ + -e 's,\(uid=\)[^ ]* ,\1${_uid} ,' \ + -e 's,\(gid=\)[^ ]* ,\1${_gid} ,' .else MTREE_FILTER= cat .endif From owner-svn-src-projects@FreeBSD.ORG Mon Oct 21 21:32:25 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 10189138; Mon, 21 Oct 2013 21:32:25 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D80EA281A; Mon, 21 Oct 2013 21:32:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9LLWOaq070390; Mon, 21 Oct 2013 21:32:24 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9LLWO3x070388; Mon, 21 Oct 2013 21:32:24 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310212132.r9LLWO3x070388@svn.freebsd.org> From: Alexander Motin Date: Mon, 21 Oct 2013 21:32:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256863 - projects/camlock/sys/geom X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Oct 2013 21:32:25 -0000 Author: mav Date: Mon Oct 21 21:32:24 2013 New Revision: 256863 URL: http://svnweb.freebsd.org/changeset/base/256863 Log: Add and use constants for g_collectstats bits. Modified: projects/camlock/sys/geom/geom_int.h projects/camlock/sys/geom/geom_io.c Modified: projects/camlock/sys/geom/geom_int.h ============================================================================== --- projects/camlock/sys/geom/geom_int.h Mon Oct 21 21:16:50 2013 (r256862) +++ projects/camlock/sys/geom/geom_int.h Mon Oct 21 21:32:24 2013 (r256863) @@ -39,6 +39,9 @@ LIST_HEAD(class_list_head, g_class); TAILQ_HEAD(g_tailq_head, g_geom); extern int g_collectstats; +#define G_STATS_PROVIDERS 1 /* Collect I/O stats for providers */ +#define G_STATS_CONSUMERS 2 /* Collect I/O stats for consumers */ + extern int g_debugflags; /* * 1 G_T_TOPOLOGY Modified: projects/camlock/sys/geom/geom_io.c ============================================================================== --- projects/camlock/sys/geom/geom_io.c Mon Oct 21 21:16:50 2013 (r256862) +++ projects/camlock/sys/geom/geom_io.c Mon Oct 21 21:32:24 2013 (r256863) @@ -510,7 +510,8 @@ g_io_request(struct bio *bp, struct g_co KASSERT(!(bp->bio_flags & BIO_ONQUEUE), ("Bio already on queue bp=%p", bp)); - if ((g_collectstats & ~(pp->stat ? 0 : 1)) != 0) + if ((g_collectstats & G_STATS_CONSUMERS) != 0 || + ((g_collectstats & G_STATS_PROVIDERS) != 0 && pp->stat != NULL)) binuptime(&bp->bio_t0); else getbinuptime(&bp->bio_t0); @@ -545,9 +546,9 @@ g_io_request(struct bio *bp, struct g_co */ mtxp = mtx_pool_find(mtxpool_sleep, pp); mtx_lock(mtxp); - if (g_collectstats & 1) + if (g_collectstats & G_STATS_PROVIDERS) devstat_start_transaction(pp->stat, &bp->bio_t0); - if (g_collectstats & 2) + if (g_collectstats & G_STATS_CONSUMERS) devstat_start_transaction(cp->stat, &bp->bio_t0); pp->nstart++; cp->nstart++; @@ -649,13 +650,14 @@ g_io_deliver(struct bio *bp, int error) * can not update one instance of the statistics from more * than one thread at a time, so grab the lock first. */ - if ((g_collectstats & ~(pp->stat ? 0 : 1)) != 0) + if ((g_collectstats & G_STATS_CONSUMERS) != 0 || + ((g_collectstats & G_STATS_PROVIDERS) != 0 && pp->stat != NULL)) binuptime(&now); mtxp = mtx_pool_find(mtxpool_sleep, cp); mtx_lock(mtxp); - if (g_collectstats & 1) + if (g_collectstats & G_STATS_PROVIDERS) devstat_end_transaction_bio_bt(pp->stat, bp, &now); - if (g_collectstats & 2) + if (g_collectstats & G_STATS_CONSUMERS) devstat_end_transaction_bio_bt(cp->stat, bp, &now); cp->nend++; pp->nend++; From owner-svn-src-projects@FreeBSD.ORG Mon Oct 21 23:46:38 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 46E7926A; Mon, 21 Oct 2013 23:46:38 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 34AA82FB5; Mon, 21 Oct 2013 23:46:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9LNkcIa042126; Mon, 21 Oct 2013 23:46:38 GMT (envelope-from neel@svn.freebsd.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9LNkcL7042125; Mon, 21 Oct 2013 23:46:38 GMT (envelope-from neel@svn.freebsd.org) Message-Id: <201310212346.r9LNkcL7042125@svn.freebsd.org> From: Neel Natu Date: Mon, 21 Oct 2013 23:46:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256867 - projects/bhyve_svm/sys/amd64/vmm/amd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Oct 2013 23:46:38 -0000 Author: neel Date: Mon Oct 21 23:46:37 2013 New Revision: 256867 URL: http://svnweb.freebsd.org/changeset/base/256867 Log: The ASID allocation in SVM is incorrect because it allocates a single ASID for all vcpus belonging to a guest. This means that when different vcpus belonging to the same guest are executing on the same host cpu there may be "leakage" in the mappings created by one vcpu to another. The proper fix for this is being worked on and will be committed shortly. In the meantime workaround this bug by flushing the guest TLB entries on every VM entry. Submitted by: Anish Gupta (akgupt3@gmail.com) Modified: projects/bhyve_svm/sys/amd64/vmm/amd/svm.c Modified: projects/bhyve_svm/sys/amd64/vmm/amd/svm.c ============================================================================== --- projects/bhyve_svm/sys/amd64/vmm/amd/svm.c Mon Oct 21 22:55:56 2013 (r256866) +++ projects/bhyve_svm/sys/amd64/vmm/amd/svm.c Mon Oct 21 23:46:37 2013 (r256867) @@ -955,8 +955,13 @@ svm_vmrun(void *arg, int vcpu, register_ /* Can't use any cached VMCB state by cpu.*/ ctrl->vmcb_clean = VMCB_CACHE_NONE; } else { - /* Don't flush TLB since guest ASID is unchanged. */ - ctrl->tlb_ctrl = VMCB_TLB_FLUSH_NOTHING; + /* + * XXX: Using same ASID for all vcpus of a VM will cause TLB + * corruption. This can easily be produced by muxing two vcpus + * on same core. + * For now, flush guest TLB for every vmrun. + */ + ctrl->tlb_ctrl = VMCB_TLB_FLUSH_GUEST; /* * This is the same cpu on which vcpu last ran so don't From owner-svn-src-projects@FreeBSD.ORG Tue Oct 22 09:43:20 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 47C44605; Tue, 22 Oct 2013 09:43:20 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 332892BF9; Tue, 22 Oct 2013 09:43:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9M9hKCn075460; Tue, 22 Oct 2013 09:43:20 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9M9hEAQ075300; Tue, 22 Oct 2013 09:43:14 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310220943.r9M9hEAQ075300@svn.freebsd.org> From: Alexander Motin Date: Tue, 22 Oct 2013 09:43:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256881 - in projects/camlock: bin/sh contrib/binutils/gas/config contrib/gcclibs/libssp etc etc/rc.d lib/libc/sys lib/libutil share/man/man4 sys/arm/allwinner sys/arm/broadcom/bcm2835 ... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Oct 2013 09:43:20 -0000 Author: mav Date: Tue Oct 22 09:43:14 2013 New Revision: 256881 URL: http://svnweb.freebsd.org/changeset/base/256881 Log: MFC @ r256880 Added: - copied unchanged from r256880, head/sys/dev/fdt/fdt_ic_if.m Directory Properties: projects/camlock/sys/dev/fdt/fdt_ic_if.m (props changed) Deleted: projects/camlock/share/man/man4/isf.4 projects/camlock/sys/dev/isf/ projects/camlock/usr.sbin/isfctl/ Modified: projects/camlock/bin/sh/miscbltin.c projects/camlock/contrib/binutils/gas/config/tc-mips.c projects/camlock/contrib/binutils/gas/config/tc-mips.h projects/camlock/contrib/gcclibs/libssp/ssp.c projects/camlock/etc/login.conf projects/camlock/etc/netstart projects/camlock/etc/rc.d/rtadvd projects/camlock/lib/libc/sys/getrlimit.2 projects/camlock/lib/libutil/login_class.3 projects/camlock/lib/libutil/login_class.c projects/camlock/share/man/man4/Makefile projects/camlock/sys/arm/allwinner/a10_wdog.c projects/camlock/sys/arm/broadcom/bcm2835/bcm2835_wdog.c projects/camlock/sys/conf/files projects/camlock/sys/dev/drm2/i915/i915_drv.c projects/camlock/sys/dev/fdt/fdt_common.c projects/camlock/sys/dev/fdt/fdt_common.h projects/camlock/sys/dev/fdt/simplebus.c projects/camlock/sys/dev/ofw/ofw_fdt.c projects/camlock/sys/dev/xen/netback/netback.c projects/camlock/sys/kern/kern_event.c projects/camlock/sys/kern/kern_resource.c projects/camlock/sys/kern/subr_taskqueue.c projects/camlock/sys/kern/uipc_syscalls.c projects/camlock/sys/mips/conf/BERI_DE4.hints projects/camlock/sys/mips/conf/BERI_DE4_MDROOT projects/camlock/sys/mips/conf/BERI_DE4_SDROOT projects/camlock/sys/powerpc/booke/pmap.c projects/camlock/sys/powerpc/ofw/ofw_pci.c projects/camlock/sys/powerpc/ofw/ofw_pci.h projects/camlock/sys/powerpc/powerpc/nexus.c projects/camlock/sys/sys/eventvar.h projects/camlock/sys/sys/resource.h projects/camlock/sys/sys/resourcevar.h projects/camlock/sys/ufs/ffs/ffs_softdep.c projects/camlock/sys/ufs/ffs/ffs_vfsops.c projects/camlock/usr.bin/limits/limits.c projects/camlock/usr.bin/procstat/procstat_rlimit.c projects/camlock/usr.sbin/Makefile Directory Properties: projects/camlock/ (props changed) projects/camlock/contrib/binutils/ (props changed) projects/camlock/lib/libc/ (props changed) projects/camlock/lib/libutil/ (props changed) projects/camlock/share/man/man4/ (props changed) projects/camlock/sys/ (props changed) projects/camlock/sys/conf/ (props changed) projects/camlock/usr.bin/procstat/ (props changed) Modified: projects/camlock/bin/sh/miscbltin.c ============================================================================== --- projects/camlock/bin/sh/miscbltin.c Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/bin/sh/miscbltin.c Tue Oct 22 09:43:14 2013 (r256881) @@ -405,6 +405,9 @@ static const struct limits limits[] = { #ifdef RLIMIT_NPTS { "pseudo-terminals", (char *)0, RLIMIT_NPTS, 1, 'p' }, #endif +#ifdef RLIMIT_KQUEUES + { "kqueues", (char *)0, RLIMIT_KQUEUES, 1, 'k' }, +#endif { (char *) 0, (char *)0, 0, 0, '\0' } }; @@ -421,7 +424,7 @@ ulimitcmd(int argc __unused, char **argv struct rlimit limit; what = 'f'; - while ((optc = nextopt("HSatfdsmcnuvlbpw")) != '\0') + while ((optc = nextopt("HSatfdsmcnuvlbpwk")) != '\0') switch (optc) { case 'H': how = HARD; Modified: projects/camlock/contrib/binutils/gas/config/tc-mips.c ============================================================================== --- projects/camlock/contrib/binutils/gas/config/tc-mips.c Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/contrib/binutils/gas/config/tc-mips.c Tue Oct 22 09:43:14 2013 (r256881) @@ -15420,21 +15420,6 @@ MIPS options:\n\ -mno-octeon-useun generate MIPS unaligned load/store instructions\n")); } -enum dwarf2_format -mips_dwarf2_format (void) -{ - if (HAVE_64BIT_SYMBOLS) - { -#ifdef TE_IRIX - return dwarf2_format_64bit_irix; -#else - return dwarf2_format_64bit; -#endif - } - else - return dwarf2_format_32bit; -} - int mips_dwarf2_addr_size (void) { Modified: projects/camlock/contrib/binutils/gas/config/tc-mips.h ============================================================================== --- projects/camlock/contrib/binutils/gas/config/tc-mips.h Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/contrib/binutils/gas/config/tc-mips.h Tue Oct 22 09:43:14 2013 (r256881) @@ -155,10 +155,6 @@ extern void mips_emit_delays (void); extern void mips_enable_auto_align (void); #define md_elf_section_change_hook() mips_enable_auto_align() -enum dwarf2_format; -extern enum dwarf2_format mips_dwarf2_format (void); -#define DWARF2_FORMAT() mips_dwarf2_format () - extern int mips_dwarf2_addr_size (void); #define DWARF2_ADDR_SIZE(bfd) mips_dwarf2_addr_size () Modified: projects/camlock/contrib/gcclibs/libssp/ssp.c ============================================================================== --- projects/camlock/contrib/gcclibs/libssp/ssp.c Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/contrib/gcclibs/libssp/ssp.c Tue Oct 22 09:43:14 2013 (r256881) @@ -128,7 +128,7 @@ fail (const char *msg1, size_t msg1len, #ifdef HAVE_SYSLOG_H /* Only send the error to syslog if there was no tty available. */ else - syslog (LOG_CRIT, msg3); + syslog (LOG_CRIT, "%s", msg3); #endif /* HAVE_SYSLOG_H */ /* Try very hard to exit. Note that signals may be blocked preventing Modified: projects/camlock/etc/login.conf ============================================================================== --- projects/camlock/etc/login.conf Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/etc/login.conf Tue Oct 22 09:43:14 2013 (r256881) @@ -42,6 +42,7 @@ default:\ :vmemoryuse=unlimited:\ :swapuse=unlimited:\ :pseudoterminals=unlimited:\ + :kqueues=unlimited:\ :priority=0:\ :ignoretime@:\ :umask=022: Modified: projects/camlock/etc/netstart ============================================================================== --- projects/camlock/etc/netstart Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/etc/netstart Tue Oct 22 09:43:14 2013 (r256881) @@ -59,6 +59,7 @@ _start=quietstart /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} exit 0 Modified: projects/camlock/etc/rc.d/rtadvd ============================================================================== --- projects/camlock/etc/rc.d/rtadvd Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/etc/rc.d/rtadvd Tue Oct 22 09:43:14 2013 (r256881) @@ -14,6 +14,8 @@ name="rtadvd" rcvar="rtadvd_enable" command="/usr/sbin/${name}" +extra_commands="reload" +reload_cmd="rtadvd_reload" start_precmd="rtadvd_precmd" rtadvd_precmd() @@ -62,5 +64,9 @@ rtadvd_precmd() return 0 } +rtadvd_reload() { + /usr/sbin/rtadvctl reload +} + load_rc_config $name run_rc_command "$1" Modified: projects/camlock/lib/libc/sys/getrlimit.2 ============================================================================== --- projects/camlock/lib/libc/sys/getrlimit.2 Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/lib/libc/sys/getrlimit.2 Tue Oct 22 09:43:14 2013 (r256881) @@ -108,6 +108,8 @@ Please see for a complete description of this sysctl. .It Dv RLIMIT_NPTS The maximum number of pseudo-terminals created by this user id. +.It Dv RLIMIT_KQUEUES +The maximum number of kqueues created by this user id. .El .Pp A resource limit is specified as a soft limit and a hard limit. Modified: projects/camlock/lib/libutil/login_class.3 ============================================================================== --- projects/camlock/lib/libutil/login_class.3 Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/lib/libutil/login_class.3 Tue Oct 22 09:43:14 2013 (r256881) @@ -118,6 +118,7 @@ sbsize RLIMIT_SBSIZE vmemoryuse RLIMIT_VMEM pseudoterminals RLIMIT_NPTS swapuse RLIMIT_SWAP +kqueues RLIMIT_KQUEUES .Ed .It LOGIN_SETPRIORITY Set the scheduling priority for the current process based on the Modified: projects/camlock/lib/libutil/login_class.c ============================================================================== --- projects/camlock/lib/libutil/login_class.c Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/lib/libutil/login_class.c Tue Oct 22 09:43:14 2013 (r256881) @@ -66,6 +66,7 @@ static struct login_res { { "vmemoryuse", login_getcapsize, RLIMIT_VMEM }, { "pseudoterminals", login_getcapnum, RLIMIT_NPTS }, { "swapuse", login_getcapsize, RLIMIT_SWAP }, + { "kqueues", login_getcapsize, RLIMIT_KQUEUES }, { NULL, 0, 0 } }; Modified: projects/camlock/share/man/man4/Makefile ============================================================================== --- projects/camlock/share/man/man4/Makefile Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/share/man/man4/Makefile Tue Oct 22 09:43:14 2013 (r256881) @@ -196,7 +196,6 @@ MAN= aac.4 \ ipwfw.4 \ isci.4 \ iscsi_initiator.4 \ - isf.4 \ isp.4 \ ispfw.4 \ iwi.4 \ Modified: projects/camlock/sys/arm/allwinner/a10_wdog.c ============================================================================== --- projects/camlock/sys/arm/allwinner/a10_wdog.c Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/sys/arm/allwinner/a10_wdog.c Tue Oct 22 09:43:14 2013 (r256881) @@ -150,6 +150,18 @@ a10wd_watchdog_fn(void *private, u_int c (wd_intervals[i].value << WDOG_MODE_INTVL_SHIFT) | WDOG_MODE_EN | WDOG_MODE_RST_EN); WRITE(sc, WDOG_CTRL, WDOG_CTRL_RESTART); + *error = 0; + } + else { + /* + * Can't arm + * disable watchdog as watchdog(9) requires + */ + device_printf(sc->dev, + "Can't arm, timeout is more than 16 sec\n"); + mtx_unlock(&sc->mtx); + WRITE(sc, WDOG_MODE, 0); + return; } } else Modified: projects/camlock/sys/arm/broadcom/bcm2835/bcm2835_wdog.c ============================================================================== --- projects/camlock/sys/arm/broadcom/bcm2835/bcm2835_wdog.c Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/sys/arm/broadcom/bcm2835/bcm2835_wdog.c Tue Oct 22 09:43:14 2013 (r256881) @@ -76,11 +76,10 @@ struct bcmwd_softc { int wdog_armed; int wdog_period; char wdog_passwd; + struct mtx mtx; }; -#ifdef notyet static void bcmwd_watchdog_fn(void *private, u_int cmd, int *error); -#endif static int bcmwd_probe(device_t dev) @@ -120,19 +119,59 @@ bcmwd_attach(device_t dev) sc->bsh = rman_get_bushandle(sc->res); bcmwd_lsc = sc; -#ifdef notyet + mtx_init(&sc->mtx, "BCM2835 Watchdog", "bcmwd", MTX_DEF); EVENTHANDLER_REGISTER(watchdog_list, bcmwd_watchdog_fn, sc, 0); -#endif + return (0); } -#ifdef notyet static void bcmwd_watchdog_fn(void *private, u_int cmd, int *error) { - /* XXX: not yet */ + struct bcmwd_softc *sc; + uint64_t sec; + uint32_t ticks, reg; + + sc = private; + mtx_lock(&sc->mtx); + + cmd &= WD_INTERVAL; + + if (cmd > 0) { + sec = ((uint64_t)1 << (cmd & WD_INTERVAL)) / 1000000000; + ticks = (sec << 16) & BCM2835_WDOG_TIME_MASK; + if (ticks == 0) { + /* + * Can't arm + * disable watchdog as watchdog(9) requires + */ + device_printf(sc->dev, + "Can't arm, timeout is less than 1 second\n"); + WRITE(sc, BCM2835_RSTC_REG, + (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) | + BCM2835_RSTC_RESET); + mtx_unlock(&sc->mtx); + return; + } + + reg = (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) | ticks; + WRITE(sc, BCM2835_WDOG_REG, reg); + + reg = READ(sc, BCM2835_RSTC_REG); + reg &= BCM2835_RSTC_WRCFG_CLR; + reg |= BCM2835_RSTC_WRCFG_FULL_RESET; + reg |= (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT); + WRITE(sc, BCM2835_RSTC_REG, reg); + + *error = 0; + } + else + WRITE(sc, BCM2835_RSTC_REG, + (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) | + BCM2835_RSTC_RESET); + + mtx_unlock(&sc->mtx); } -#endif void bcmwd_watchdog_reset() Modified: projects/camlock/sys/conf/files ============================================================================== --- projects/camlock/sys/conf/files Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/sys/conf/files Tue Oct 22 09:43:14 2013 (r256881) @@ -1401,6 +1401,7 @@ dev/exca/exca.c optional cbb dev/fatm/if_fatm.c optional fatm pci dev/fb/splash.c optional splash dev/fdt/fdt_common.c optional fdt +dev/fdt/fdt_ic_if.m optional fdt dev/fdt/fdt_pci.c optional fdt pci dev/fdt/fdt_slicer.c optional fdt cfi | fdt nand dev/fdt/fdt_static_dtb.S optional fdt fdt_dtb_static \ @@ -1540,9 +1541,6 @@ dev/iscsi_initiator/isc_cam.c optional i dev/iscsi_initiator/isc_soc.c optional iscsi_initiator scbus dev/iscsi_initiator/isc_sm.c optional iscsi_initiator scbus dev/iscsi_initiator/isc_subr.c optional iscsi_initiator scbus -dev/isf/isf.c optional isf -dev/isf/isf_fdt.c optional isf fdt -dev/isf/isf_nexus.c optional isf dev/isp/isp.c optional isp dev/isp/isp_freebsd.c optional isp dev/isp/isp_library.c optional isp Modified: projects/camlock/sys/dev/drm2/i915/i915_drv.c ============================================================================== --- projects/camlock/sys/dev/drm2/i915/i915_drv.c Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/sys/dev/drm2/i915/i915_drv.c Tue Oct 22 09:43:14 2013 (r256881) @@ -685,7 +685,7 @@ gen6_do_reset(struct drm_device *dev, u8 /* Spin waiting for the device to ack the reset request */ ret = _intel_wait_for(dev, - (I915_READ(GEN6_GDRST) & GEN6_GRDOM_FULL) == 0, + (I915_READ_NOTRACE(GEN6_GDRST) & GEN6_GRDOM_FULL) == 0, 500, 1, "915rst"); /* If reset with a user forcewake, try to restore, otherwise turn it off */ Modified: projects/camlock/sys/dev/fdt/fdt_common.c ============================================================================== --- projects/camlock/sys/dev/fdt/fdt_common.c Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/sys/dev/fdt/fdt_common.c Tue Oct 22 09:43:14 2013 (r256881) @@ -63,6 +63,8 @@ vm_paddr_t fdt_immr_pa; vm_offset_t fdt_immr_va; vm_offset_t fdt_immr_size; +struct fdt_ic_list fdt_ic_list_head = SLIST_HEAD_INITIALIZER(fdt_ic_list_head); + int fdt_get_range(phandle_t node, int range_id, u_long *base, u_long *size) { Modified: projects/camlock/sys/dev/fdt/fdt_common.h ============================================================================== --- projects/camlock/sys/dev/fdt/fdt_common.h Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/sys/dev/fdt/fdt_common.h Tue Oct 22 09:43:14 2013 (r256881) @@ -70,6 +70,13 @@ struct fdt_fixup_entry { }; extern struct fdt_fixup_entry fdt_fixup_table[]; +extern SLIST_HEAD(fdt_ic_list, fdt_ic) fdt_ic_list_head; +struct fdt_ic { + SLIST_ENTRY(fdt_ic) fdt_ics; + ihandle_t iph; + device_t dev; +}; + extern vm_paddr_t fdt_immr_pa; extern vm_offset_t fdt_immr_va; extern vm_offset_t fdt_immr_size; Copied: projects/camlock/sys/dev/fdt/fdt_ic_if.m (from r256880, head/sys/dev/fdt/fdt_ic_if.m) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/camlock/sys/dev/fdt/fdt_ic_if.m Tue Oct 22 09:43:14 2013 (r256881, copy of r256880, head/sys/dev/fdt/fdt_ic_if.m) @@ -0,0 +1,266 @@ +#- +# Copyright (c) 2013 SRI International +# Copyright (c) 1998-2004 Doug Rabson +# 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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$ +# + +#include +#include +#include + +/** + * @defgroup FST_IC fdt_ic - KObj methods for interrupt controllers + * @brief A set of methods required device drivers that are interrupt + * controllers. Derived from sys/kern/bus_if.m. + * @{ + */ +INTERFACE fdt_ic; + +/** + * @brief Allocate an interrupt resource + * + * This method is called by child devices of an interrupt controller to + * allocate an interrup. The meaning of the resource-ID field varies + * from bus to bus and is opaque to the interrupt controller. If a + * resource was allocated and the caller did not use the RF_ACTIVE + * to specify that it should be activated immediately, the caller is + * responsible for calling FDT_IC_ACTIVATE_INTR() when it actually uses + * the interupt. + * + * @param _dev the interrupt-parent device of @p _child + * @param _child the device which is requesting an allocation + * @param _rid a pointer to the resource identifier + * @param _irq interrupt source to allocate + * @param _flags any extra flags to control the resource + * allocation - see @c RF_XXX flags in + * for details + * + * @returns the interrupt which was allocated or @c NULL if no + * resource could be allocated + */ +METHOD struct resource * alloc_intr { + device_t _dev; + device_t _child; + int *_rid; + u_long _irq; + u_int _flags; +}; + +/** + * @brief Activate an interrupt + * + * Activate an interrupt previously allocated with FDT_IC_ALLOC_INTR(). + * + * @param _dev the parent device of @p _child + * @param _r interrupt to activate + */ +METHOD int activate_intr { + device_t _dev; + struct resource *_r; +}; + +/** + * @brief Deactivate an interrupt + * + * Deactivate a resource previously allocated with FDT_IC_ALLOC_INTR(). + * + * @param _dev the parent device of @p _child + * @param _r the interrupt to deactivate + */ +METHOD int deactivate_intr { + device_t _dev; + struct resource *_r; +}; + +/** + * @brief Release an interrupt + * + * Free an interupt allocated by the FDT_IC_ALLOC_INTR. + * + * @param _dev the parent device of @p _child + * @param _r the resource to release + */ +METHOD int release_intr { + device_t _dev; + struct resource *_res; +}; + +/** + * @brief Install an interrupt handler + * + * This method is used to associate an interrupt handler function with + * an irq resource. When the interrupt triggers, the function @p _intr + * will be called with the value of @p _arg as its single + * argument. The value returned in @p *_cookiep is used to cancel the + * interrupt handler - the caller should save this value to use in a + * future call to FDT_IC_TEARDOWN_INTR(). + * + * @param _dev the interrupt-parent device of @p _child + * @param _child the device which allocated the resource + * @param _irq the resource representing the interrupt + * @param _flags a set of bits from enum intr_type specifying + * the class of interrupt + * @param _intr the function to call when the interrupt + * triggers + * @param _arg a value to use as the single argument in calls + * to @p _intr + * @param _cookiep a pointer to a location to recieve a cookie + * value that may be used to remove the interrupt + * handler + */ +METHOD int setup_intr { + device_t _dev; + device_t _child; + struct resource *_irq; + int _flags; + driver_filter_t *_filter; + driver_intr_t *_intr; + void *_arg; + void **_cookiep; +}; + +/** + * @brief Uninstall an interrupt handler + * + * This method is used to disassociate an interrupt handler function + * with an irq resource. The value of @p _cookie must be the value + * returned from a previous call to FDT_IC_SETUP_INTR(). + * + * @param _dev the interrupt-parent device of @p _child + * @param _child the device which allocated the resource + * @param _irq the resource representing the interrupt + * @param _cookie the cookie value returned when the interrupt + * was originally registered + */ +METHOD int teardown_intr { + device_t _dev; + device_t _child; + struct resource *_irq; + void *_cookie; +}; + +/** + * @brief Allow drivers to request that an interrupt be bound to a specific + * CPU. + * + * @param _dev the interrupt-parent device of @p _child + * @param _child the device which allocated the resource + * @param _irq the resource representing the interrupt + * @param _cpu the CPU to bind the interrupt to + */ +METHOD int bind_intr { + device_t _dev; + device_t _child; + struct resource *_irq; + int _cpu; +}; + +/** + * @brief Allow drivers to specify the trigger mode and polarity + * of the specified interrupt. + * + * @param _dev the interrupt-parent device + * @param _irq the interrupt number to modify + * @param _trig the trigger mode required + * @param _pol the interrupt polarity required + */ +METHOD int config_intr { + device_t _dev; + int _irq; + enum intr_trigger _trig; + enum intr_polarity _pol; +}; + +/** + * @brief Allow drivers to associate a description with an active + * interrupt handler. + * + * @param _dev the interrupt-parent device of @p _child + * @param _child the device which allocated the resource + * @param _irq the resource representing the interrupt + * @param _cookie the cookie value returned when the interrupt + * was originally registered + * @param _descr the description to associate with the interrupt + */ +METHOD int describe_intr { + device_t _dev; + device_t _child; + struct resource *_irq; + void *_cookie; + const char *_descr; +}; + +/** + * @brief Notify an ic that specified child's IRQ should be remapped. + * + * @param _dev the interrupt-parent device + * @param _child the child device + * @param _irq the irq number + */ +METHOD int remap_intr { + device_t _dev; + device_t _child; + u_int _irq; +}; + +/** + * @brief Enable an IPI source. + * + * @param _dev the interrupt controller + * @param _tid the thread ID (relative to the interrupt controller) + * to enable IPIs for + * @param _ipi_irq hardware IRQ to send IPIs to + */ +METHOD void setup_ipi { + device_t _dev; + u_int _tid; + u_int _irq; +}; + +/** + * @brief Send an IPI to the specified thread. + * + * @param _dev the interrupt controller + * @param _tid the thread ID (relative to the interrupt controller) + * to send IPIs to + */ +METHOD void send_ipi { + device_t _dev; + u_int _tid; +}; + +/** + * @brief Clear the IPI on the specfied thread. Only call with the + * local hardware thread or interrupts may be lost! + * + * @param _dev the interrupt controller + * @param _tid the thread ID (relative to the interrupt controller) + * to clear the IPI on + */ +METHOD void clear_ipi { + device_t _dev; + u_int _tid; +}; Modified: projects/camlock/sys/dev/fdt/simplebus.c ============================================================================== --- projects/camlock/sys/dev/fdt/simplebus.c Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/sys/dev/fdt/simplebus.c Tue Oct 22 09:43:14 2013 (r256881) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include "fdt_common.h" +#include "fdt_ic_if.h" #include "ofw_bus_if.h" #ifdef DEBUG @@ -80,9 +81,18 @@ static int simplebus_attach(device_t); static int simplebus_print_child(device_t, device_t); static int simplebus_setup_intr(device_t, device_t, struct resource *, int, driver_filter_t *, driver_intr_t *, void *, void **); +static int simplebus_teardown_intr(device_t, device_t, struct resource *, + void *); +static int simplebus_activate_resource(device_t, device_t, int, int, + struct resource *); static struct resource *simplebus_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); +static int simplebus_deactivate_resource(device_t, device_t, int, int, + struct resource *); +static int simplebus_release_resource(device_t, device_t, int, int, + struct resource *); +static device_t simplebus_get_interrupt_parent(device_t); static struct resource_list *simplebus_get_resource_list(device_t, device_t); static ofw_bus_get_devinfo_t simplebus_get_devinfo; @@ -102,11 +112,11 @@ static device_method_t simplebus_methods /* Bus interface */ DEVMETHOD(bus_print_child, simplebus_print_child), DEVMETHOD(bus_alloc_resource, simplebus_alloc_resource), - DEVMETHOD(bus_release_resource, bus_generic_release_resource), - DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_release_resource, simplebus_release_resource), + DEVMETHOD(bus_activate_resource, simplebus_activate_resource), + DEVMETHOD(bus_deactivate_resource, simplebus_deactivate_resource), DEVMETHOD(bus_setup_intr, simplebus_setup_intr), - DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_teardown_intr, simplebus_teardown_intr), DEVMETHOD(bus_get_resource_list, simplebus_get_resource_list), /* OFW bus interface */ @@ -217,6 +227,7 @@ simplebus_attach(device_t dev) static int simplebus_print_child(device_t dev, device_t child) { + device_t ip; struct simplebus_devinfo *di; struct resource_list *rl; int rv; @@ -228,6 +239,8 @@ simplebus_print_child(device_t dev, devi rv += bus_print_child_header(dev, child); rv += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx"); rv += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld"); + if ((ip = simplebus_get_interrupt_parent(child)) != NULL) + rv += printf(" (%s)", device_get_nameunit(ip)); rv += bus_print_child_footer(dev, child); return (rv); @@ -237,6 +250,7 @@ static struct resource * simplebus_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + device_t ic; struct simplebus_devinfo *di; struct resource_list_entry *rle; @@ -263,10 +277,53 @@ simplebus_alloc_resource(device_t bus, d count = rle->count; } + if (type == SYS_RES_IRQ && + (ic = simplebus_get_interrupt_parent(child)) != NULL) + return(FDT_IC_ALLOC_INTR(ic, child, rid, start, flags)); + return (bus_generic_alloc_resource(bus, child, type, rid, start, end, count, flags)); } +static int +simplebus_activate_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ + device_t ic; + + if (type == SYS_RES_IRQ && + (ic = simplebus_get_interrupt_parent(child)) != NULL) + return (FDT_IC_ACTIVATE_INTR(ic, r)); + + return (bus_generic_activate_resource(dev, child, type, rid, r)); +} + +static int +simplebus_deactivate_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ + device_t ic; + + if (type == SYS_RES_IRQ && + (ic = simplebus_get_interrupt_parent(child)) != NULL) + return (FDT_IC_DEACTIVATE_INTR(ic, r)); + + return (bus_generic_deactivate_resource(dev, child, type, rid, r)); +} + +static int +simplebus_release_resource(device_t dev, device_t child, int type, int rid, + struct resource *r) +{ + device_t ic; + + if (type == SYS_RES_IRQ && + (ic = simplebus_get_interrupt_parent(child)) != NULL) + return (FDT_IC_RELEASE_INTR(ic, r)); + + return (bus_generic_release_resource(dev, child, type, rid, r)); +} + static struct resource_list * simplebus_get_resource_list(device_t bus, device_t child) { @@ -276,15 +333,45 @@ simplebus_get_resource_list(device_t bus return (&di->di_res); } +static device_t +simplebus_get_interrupt_parent(device_t dev) +{ + struct simplebus_devinfo *di; + struct fdt_ic *ic; + device_t ip; + ihandle_t iph; + phandle_t ph; + + ip = NULL; + + di = device_get_ivars(dev); + if (di == NULL) + return (NULL); + + if (OF_getprop(di->di_ofw.obd_node, "interrupt-parent", &iph, + sizeof(iph)) > 0) { + iph = fdt32_to_cpu(iph); + ph = OF_instance_to_package(iph); + SLIST_FOREACH(ic, &fdt_ic_list_head, fdt_ics) { + if (ic->iph == ph) { + ip = ic->dev; + break; + } + } + } + return (ip); +} + static int simplebus_setup_intr(device_t bus, device_t child, struct resource *res, int flags, driver_filter_t *filter, driver_intr_t *ihand, void *arg, void **cookiep) { struct simplebus_devinfo *di; + device_t ic; enum intr_trigger trig; enum intr_polarity pol; - int error, rid; + int error, irq, rid; di = device_get_ivars(child); if (di == NULL) @@ -297,20 +384,41 @@ simplebus_setup_intr(device_t bus, devic if (rid >= DI_MAX_INTR_NUM) return (ENOENT); + ic = simplebus_get_interrupt_parent(child); + trig = di->di_intr_sl[rid].trig; pol = di->di_intr_sl[rid].pol; if (trig != INTR_TRIGGER_CONFORM || pol != INTR_POLARITY_CONFORM) { - error = bus_generic_config_intr(bus, rman_get_start(res), - trig, pol); + irq = rman_get_start(res); + if (ic != NULL) + error = FDT_IC_CONFIG_INTR(ic, irq, trig, pol); + else + error = bus_generic_config_intr(bus, irq, trig, pol); if (error) return (error); } - error = bus_generic_setup_intr(bus, child, res, flags, filter, ihand, - arg, cookiep); + if (ic != NULL) + error = FDT_IC_SETUP_INTR(ic, child, res, flags, filter, + ihand, arg, cookiep); + else + error = bus_generic_setup_intr(bus, child, res, flags, filter, + ihand, arg, cookiep); return (error); } +static int +simplebus_teardown_intr(device_t bus, device_t child, struct resource *res, + void *cookie) +{ + device_t ic; + + if ((ic = simplebus_get_interrupt_parent(child)) != NULL) + return (FDT_IC_TEARDOWN_INTR(ic, child, res, cookie)); + + return (bus_generic_teardown_intr(bus, child, res, cookie)); +} + static const struct ofw_bus_devinfo * simplebus_get_devinfo(device_t bus, device_t child) { Modified: projects/camlock/sys/dev/ofw/ofw_fdt.c ============================================================================== --- projects/camlock/sys/dev/ofw/ofw_fdt.c Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/sys/dev/ofw/ofw_fdt.c Tue Oct 22 09:43:14 2013 (r256881) @@ -329,7 +329,7 @@ fdt_nextprop(int offset, char *buf, size depth = -1; } while (depth >= 0); - return (-1); + return (0); } /* Modified: projects/camlock/sys/dev/xen/netback/netback.c ============================================================================== --- projects/camlock/sys/dev/xen/netback/netback.c Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/sys/dev/xen/netback/netback.c Tue Oct 22 09:43:14 2013 (r256881) @@ -2191,8 +2191,8 @@ static int xnb_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct xnb_softc *xnb = ifp->if_softc; -#ifdef INET struct ifreq *ifr = (struct ifreq*) data; +#ifdef INET struct ifaddr *ifa = (struct ifaddr*)data; #endif int error = 0; Modified: projects/camlock/sys/kern/kern_event.c ============================================================================== --- projects/camlock/sys/kern/kern_event.c Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/sys/kern/kern_event.c Tue Oct 22 09:43:14 2013 (r256881) @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -699,9 +700,23 @@ sys_kqueue(struct thread *td, struct kqu struct filedesc *fdp; struct kqueue *kq; struct file *fp; + struct proc *p; + struct ucred *cred; int fd, error; - fdp = td->td_proc->p_fd; + p = td->td_proc; + cred = td->td_ucred; + crhold(cred); + PROC_LOCK(p); + if (!chgkqcnt(cred->cr_ruidinfo, 1, lim_cur(td->td_proc, + RLIMIT_KQUEUES))) { + PROC_UNLOCK(p); + crfree(cred); + return (EMFILE); + } + PROC_UNLOCK(p); + + fdp = p->p_fd; error = falloc(td, &fp, &fd, 0); if (error) goto done2; @@ -711,6 +726,7 @@ sys_kqueue(struct thread *td, struct kqu mtx_init(&kq->kq_lock, "kqueue", NULL, MTX_DEF|MTX_DUPOK); TAILQ_INIT(&kq->kq_head); kq->kq_fdp = fdp; + kq->kq_cred = cred; knlist_init_mtx(&kq->kq_sel.si_note, &kq->kq_lock); TASK_INIT(&kq->kq_task, 0, kqueue_task, kq); @@ -723,6 +739,10 @@ sys_kqueue(struct thread *td, struct kqu td->td_retval[0] = fd; done2: + if (error != 0) { + chgkqcnt(cred->cr_ruidinfo, -1, 0); + crfree(cred); + } return (error); } @@ -1767,6 +1787,8 @@ kqueue_close(struct file *fp, struct thr free(kq->kq_knlist, M_KQUEUE); funsetown(&kq->kq_sigio); + chgkqcnt(kq->kq_cred->cr_ruidinfo, -1, 0); + crfree(kq->kq_cred); free(kq, M_KQUEUE); fp->f_data = NULL; Modified: projects/camlock/sys/kern/kern_resource.c ============================================================================== --- projects/camlock/sys/kern/kern_resource.c Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/sys/kern/kern_resource.c Tue Oct 22 09:43:14 2013 (r256881) @@ -1432,3 +1432,21 @@ chgptscnt(uip, diff, max) } return (1); } + +int +chgkqcnt(struct uidinfo *uip, int diff, rlim_t max) +{ + + if (diff > 0 && max != 0) { + if (atomic_fetchadd_long(&uip->ui_kqcnt, (long)diff) + + diff > max) { + atomic_subtract_long(&uip->ui_kqcnt, (long)diff); + return (0); + } + } else { + atomic_add_long(&uip->ui_kqcnt, (long)diff); + if (uip->ui_kqcnt < 0) + printf("negative kqcnt for uid = %d\n", uip->ui_uid); + } + return (1); +} Modified: projects/camlock/sys/kern/subr_taskqueue.c ============================================================================== --- projects/camlock/sys/kern/subr_taskqueue.c Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/sys/kern/subr_taskqueue.c Tue Oct 22 09:43:14 2013 (r256881) @@ -237,6 +237,7 @@ taskqueue_enqueue_locked(struct taskqueu if ((queue->tq_flags & TQ_FLAGS_UNLOCKED_ENQUEUE) == 0) TQ_UNLOCK(queue); + /* Return with lock released. */ return (0); } int @@ -246,6 +247,7 @@ taskqueue_enqueue(struct taskqueue *queu TQ_LOCK(queue); res = taskqueue_enqueue_locked(queue, task); + /* The lock is released inside. */ return (res); } @@ -262,6 +264,7 @@ taskqueue_timeout_func(void *arg) timeout_task->f &= ~DT_CALLOUT_ARMED; queue->tq_callouts--; taskqueue_enqueue_locked(timeout_task->q, &timeout_task->t); + /* The lock is released inside. */ } int @@ -278,6 +281,7 @@ taskqueue_enqueue_timeout(struct taskque res = timeout_task->t.ta_pending; if (ticks == 0) { taskqueue_enqueue_locked(queue, &timeout_task->t); + /* The lock is released inside. */ } else { if ((timeout_task->f & DT_CALLOUT_ARMED) != 0) { res++; Modified: projects/camlock/sys/kern/uipc_syscalls.c ============================================================================== --- projects/camlock/sys/kern/uipc_syscalls.c Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/sys/kern/uipc_syscalls.c Tue Oct 22 09:43:14 2013 (r256881) @@ -2070,7 +2070,8 @@ free_page: } KASSERT(error != 0 || (m->wire_count > 0 && vm_page_is_valid(m, off & PAGE_MASK, xfsize)), - ("wrong page state m %p", m)); + ("wrong page state m %p off %#jx xfsize %d", m, (uintmax_t)off, + xfsize)); VM_OBJECT_WUNLOCK(obj); return (error); } Modified: projects/camlock/sys/mips/conf/BERI_DE4.hints ============================================================================== --- projects/camlock/sys/mips/conf/BERI_DE4.hints Tue Oct 22 08:22:19 2013 (r256880) +++ projects/camlock/sys/mips/conf/BERI_DE4.hints Tue Oct 22 09:43:14 2013 (r256881) @@ -55,7 +55,6 @@ hint.altera_avgen.0.devname="berirom" # # Expose the DE4 flash via an Avalon "generic" device. -# This is incompatible with the isf(4) driver. # #hint.altera_avgen.0.at="nexus0" #hint.altera_avgen.0.maddr=0x74000000 @@ -74,38 +73,3 @@ hint.altera_avgen.0.msize=2 hint.altera_avgen.0.width=1 hint.altera_avgen.0.fileio="r" hint.altera_avgen.0.devname="de4bsw" - -# -# General Intel StrataFlash driver -# -hint.isf.0.at="nexus0" -hint.isf.0.maddr=0x74000000 -hint.isf.0.msize=0x2000000 -hint.isf.1.at="nexus0" -hint.isf.1.maddr=0x76000000 -hint.isf.1.msize=0x2000000 - -# Reserved configuration blocks. Don't touch. -hint.map.0.at="isf0" -hint.map.0.start=0x00000000 -hint.map.0.end=0x00020000 -hint.map.0.name="config" -hint.map.0.readonly=1 - -# Hardwired location of bitfile -hint.map.1.at="isf0" -hint.map.1.start=0x00020000 -hint.map.1.end=0x01820000 -hint.map.1.name="fpga" - -# Kernel on first chip -hint.map.2.at="isf0" -hint.map.2.start=0x01820000 -hint.map.2.end=0x02000000 -hint.map.2.name="reserved" - -# The second chip -hint.map.3.at="isf1" -hint.map.3.start=0x00000000 -hint.map.3.end=0x02000000 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 15:02:55 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E87C6E0A; Wed, 23 Oct 2013 15:02:55 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D63DD263D; Wed, 23 Oct 2013 15:02:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NF2tD1019942; Wed, 23 Oct 2013 15:02:55 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NF2tq5019938; Wed, 23 Oct 2013 15:02:55 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231502.r9NF2tq5019938@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 15:02:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256976 - in projects/vps: sys/kern sys/sys tools/vps/rsync X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 15:02:56 -0000 Author: will Date: Wed Oct 23 15:02:54 2013 New Revision: 256976 URL: http://svnweb.freebsd.org/changeset/base/256976 Log: Sync with svn.7he.at/vps/trunk r182 on 2013-06-26. The only apparent diffs to the upstream are the omitted binary files tools/vps/rsync/rsync_vps.{i386,amd64}. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/kern/kern_thread.c projects/vps/sys/sys/systm.h projects/vps/tools/vps/rsync/README Modified: projects/vps/sys/kern/kern_thread.c ============================================================================== --- projects/vps/sys/kern/kern_thread.c Wed Oct 23 14:58:09 2013 (r256975) +++ projects/vps/sys/kern/kern_thread.c Wed Oct 23 15:02:54 2013 (r256976) @@ -322,7 +322,6 @@ thread_reap(void) if (!TAILQ_EMPTY(&zombie_threads)) { mtx_lock_spin(&zombie_lock); td_first = TAILQ_FIRST(&zombie_threads); - /* XXX - KLAUS: ?! */ if (td_first) TAILQ_INIT(&zombie_threads); mtx_unlock_spin(&zombie_lock); Modified: projects/vps/sys/sys/systm.h ============================================================================== --- projects/vps/sys/sys/systm.h Wed Oct 23 14:58:09 2013 (r256975) +++ projects/vps/sys/sys/systm.h Wed Oct 23 15:02:54 2013 (r256976) @@ -403,9 +403,6 @@ int alloc_unr(struct unrhdr *uh); int alloc_unr_specific(struct unrhdr *uh, u_int item); int alloc_unrl(struct unrhdr *uh); void free_unr(struct unrhdr *uh, u_int item); -#ifdef VPS -int alloc_unr_unit(struct unrhdr *uh, int item); -#endif /* * Population count algorithm using SWAR approach Modified: projects/vps/tools/vps/rsync/README ============================================================================== --- projects/vps/tools/vps/rsync/README Wed Oct 23 14:58:09 2013 (r256975) +++ projects/vps/tools/vps/rsync/README Wed Oct 23 15:02:54 2013 (r256976) @@ -1,4 +1,4 @@ -Binaries are available at: -XXX +RSync binaries are available at: +http://www.7he.at/freebsd/vps/files/rsync/ From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 15:52:40 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 75720BFB; Wed, 23 Oct 2013 15:52:40 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 636552929; Wed, 23 Oct 2013 15:52:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NFqeld036673; Wed, 23 Oct 2013 15:52:40 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NFqeEE036672; Wed, 23 Oct 2013 15:52:40 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231552.r9NFqeEE036672@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 15:52:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256979 - projects/vps/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 15:52:40 -0000 Author: will Date: Wed Oct 23 15:52:39 2013 New Revision: 256979 URL: http://svnweb.freebsd.org/changeset/base/256979 Log: Sync with svn.7he.at/vps/trunk r183 r183 | klaus | 2013-07-06 09:41:22 -0600 (Sat, 06 Jul 2013) | 3 lines Fixed missing lock statement in deadlkres(). Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/kern/kern_clock.c Modified: projects/vps/sys/kern/kern_clock.c ============================================================================== --- projects/vps/sys/kern/kern_clock.c Wed Oct 23 15:29:42 2013 (r256978) +++ projects/vps/sys/kern/kern_clock.c Wed Oct 23 15:52:39 2013 (r256979) @@ -232,6 +232,9 @@ deadlkres(void) __func__); tryl++; pause("allproc", sleepfreq * hz); +#ifdef VPS + sx_slock(&vps_all_lock); +#endif /* VPS */ continue; } tryl = 0; From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 16:12:21 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 266C91A4; Wed, 23 Oct 2013 16:12:21 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 122D82A56; Wed, 23 Oct 2013 16:12:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NGCKhe043844; Wed, 23 Oct 2013 16:12:20 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NGCKI4043843; Wed, 23 Oct 2013 16:12:20 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231612.r9NGCKI4043843@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 16:12:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256980 - projects/vps/sys/mips/conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 16:12:21 -0000 Author: will Date: Wed Oct 23 16:12:20 2013 New Revision: 256980 URL: http://svnweb.freebsd.org/changeset/base/256980 Log: Add file missing from previous commits. Added: projects/vps/sys/mips/conf/EDGEROUTER_VPS Added: projects/vps/sys/mips/conf/EDGEROUTER_VPS ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/vps/sys/mips/conf/EDGEROUTER_VPS Wed Oct 23 16:12:20 2013 (r256980) @@ -0,0 +1,330 @@ +# +# OCTEON1 -- Generic kernel configuration file for FreeBSD/MIPS on Cavium Octeon +# +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD: head/sys/mips/conf/OCTEON1 250429 2013-05-10 03:05:44Z imp $ + +ident EDGEROUTER_VPS + +options VPS +options VPS_STATIC +options VIMAGE + +#options MD_ROOT_SIZE=8192 # Reserve 8 MB for MD root image +#makeoptions MFS_IMAGE=/usr/src/edgerouter/mdroot.img + +options ROOTDEVNAME=\"ufs:da0s2a\" # Default root filesystem. + +makeoptions ARCH_FLAGS="-march=octeon -mabi=64" +makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1 + +# Don't build any modules yet. +makeoptions MODULES_OVERRIDE="" +makeoptions KERNLOADADDR=0xffffffff80100000 + +# We don't need to build a trampolined version of the kernel. +makeoptions WITHOUT_KERNEL_TRAMPOLINE=1 + +include "../cavium/std.octeon1" + +hints "OCTEON1.hints" #Default places to look for devices. + +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols + +# Board-specific support that cannot be auto-detected at runtime. +#options OCTEON_VENDOR_LANNER # Support for Lanner boards. +#options OCTEON_VENDOR_RADISYS # Support for Radisys boards. +options OCTEON_VENDOR_UBIQUITI # Support for Ubiquiti boards. +#options OCTEON_VENDOR_GEFES # Support for GE LANIC boards +#options OCTEON_BOARD_CAPK_0100ND # Support for CAPK-0100nd. + +# Compile for a specified Octeon model. If not specified, support for +# detection at runtime will be used instead, which may give inferior +# performance. +# +# See sys/contrib/octeon-sdk/octeon-model.h for possible values. +#options OCTEON_MODEL=OCTEON_CN58XX_PASS1_1 + +options SCHED_ULE # ULE scheduler +options PREEMPTION # Enable kernel thread preemption +options INET # InterNETworking +options INET6 # IPv6 communications protocols +options SCTP # Stream Control Transmission Protocol +options FFS # Berkeley Fast Filesystem +options SOFTUPDATES # Enable FFS soft updates support +options UFS_ACL # Support for access control lists +options UFS_DIRHASH # Improve performance on big directories +options UFS_GJOURNAL # Enable gjournal-based UFS journaling +options MD_ROOT # MD is a potential root device +options NFSCL # Network Filesystem Client +options NFSD # Network Filesystem Server +options NFSLOCKD # Network Lock Manager +options NFS_ROOT # NFS usable as /, requires NFSCL +options MSDOSFS # MSDOS Filesystem +options CD9660 # ISO 9660 Filesystem +options PROCFS # Process filesystem (requires PSEUDOFS) +options PSEUDOFS # Pseudo-filesystem framework +options GEOM_PART_GPT # GUID Partition Tables. +options GEOM_LABEL # Provides labelization +#options COMPAT_FREEBSD32 # Compatible with o32 binaries +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI +options KTRACE # ktrace(1) support +options STACK # stack(9) support +options SYSVSHM # SYSV-style shared memory +options SYSVMSG # SYSV-style message queues +options SYSVSEM # SYSV-style semaphores +options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions +options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options AUDIT # Security event auditing +options MAC # TrustedBSD MAC Framework +#options KDTRACE_FRAME # Ensure frames are compiled in +#options KDTRACE_HOOKS # Kernel DTrace hooks +options INCLUDE_CONFIG_FILE # Include this file in kernel +options NO_SWAPPING # Disable support for paging + +# Debugging for use in -current +options KDB # Enable kernel debugger support. +options DDB # Support DDB. +options GDB # Support remote GDB. +options DEADLKRES # Enable the deadlock resolver +options INVARIANTS # Enable calls of extra sanity checking +options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +options WITNESS # Enable checks to detect deadlocks and cycles +options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones + +# Make an SMP-capable kernel by default +options SMP # Symmetric MultiProcessor Kernel + +# Bus support. +device pci + +# ATA controllers +device ahci # AHCI-compatible SATA controllers +device ata # Legacy ATA/SATA controllers +options ATA_STATIC_ID # Static device numbering +device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA +device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA + +# On-board Compact Flash driver. +device cf +#options ROOTDEVNAME=\"ufs:cf0s2a\" # Default root filesystem. + +# SCSI Controllers +device ahc # AHA2940 and onboard AIC7xxx devices +options AHC_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~128k to driver. +device ahd # AHA39320/29320 and onboard AIC79xx devices +options AHD_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~215k to driver. +device esp # AMD Am53C974 (Tekram DC-390(T)) +device hptiop # Highpoint RocketRaid 3xxx series +device isp # Qlogic family +#device ispfw # Firmware for QLogic HBAs- normally a module +device mpt # LSI-Logic MPT-Fusion +device mps # LSI-Logic MPT-Fusion 2 +#device ncr # NCR/Symbios Logic +device trm # Tekram DC395U/UW/F DC315U adapters + +device adv # Advansys SCSI adapters +device adw # Advansys wide SCSI adapters +device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60. +device bt # Buslogic/Mylex MultiMaster SCSI adapters + +# ATA/SCSI peripherals +device scbus # SCSI bus (required for ATA/SCSI) +device ch # SCSI media changers +device da # Direct Access (disks) +device sa # Sequential Access (tape etc) +device cd # CD +device pass # Passthrough device (direct ATA/SCSI access) +device ses # Enclosure Services (SES and SAF-TE) + +# RAID controllers interfaced to the SCSI subsystem +device amr # AMI MegaRAID +#XXX it is not 64-bit clean, -scottl +#device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID +device ciss # Compaq Smart RAID 5* +device dpt # DPT Smartcache III, IV - See NOTES for options +device iir # Intel Integrated RAID +device ips # IBM (Adaptec) ServeRAID +device mly # Mylex AcceleRAID/eXtremeRAID + +# RAID controllers +device aac # Adaptec FSA RAID +device aacp # SCSI passthrough for aac (requires CAM) +device ida # Compaq Smart RAID +device mfi # LSI MegaRAID SAS +device mlx # Mylex DAC960 family +#XXX pointer/int warnings +#device pst # Promise Supertrak SX6000 +device twe # 3ware ATA RAID + +# PCCARD (PCMCIA) support +# PCMCIA and cardbus bridge support +device cbb # cardbus (yenta) bridge +device pccard # PC Card (16-bit) bus +device cardbus # CardBus (32-bit) bus + +# Serial (COM) ports +device uart # Generic UART driver + +# If you've got a "dumb" serial or parallel PCI card that is +# supported by the puc(4) glue driver, uncomment the following +# line to enable it (connects to sio, uart and/or ppc drivers): +#device puc + +# On-board Cavium Octeon Ethernet. +# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! +device octe + +# Cavium Octeon management Ethernet. +device octm + +# Switch PHY support for the octe driver. These currently present a VLAN per +# physical port, but may eventually provide support for DSA or similar instead. +#device mv88e61xxphy # Marvell 88E61XX + +# PCI Ethernet NICs. +device de # DEC/Intel DC21x4x (``Tulip'') +device em # Intel PRO/1000 Gigabit Ethernet Family +device igb # Intel PRO/1000 PCIE Server Gigabit Family +device ixgbe # Intel PRO/10GbE PCIE Ethernet Family +device le # AMD Am7900 LANCE and Am79C9xx PCnet +device ti # Alteon Networks Tigon I/II gigabit Ethernet +device txp # 3Com 3cR990 (``Typhoon'') +device vx # 3Com 3c590, 3c595 (``Vortex'') + +# PCI Ethernet NICs that use the common MII bus controller code. +# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! +device miibus # MII bus support +device ae # Attansic/Atheros L2 FastEthernet +device age # Attansic/Atheros L1 Gigabit Ethernet +device alc # Atheros AR8131/AR8132 Ethernet +device ale # Atheros AR8121/AR8113/AR8114 Ethernet +device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet +device bfe # Broadcom BCM440x 10/100 Ethernet +device bge # Broadcom BCM570xx Gigabit Ethernet +device dc # DEC/Intel 21143 and various workalikes +device et # Agere ET1310 10/100/Gigabit Ethernet +device fxp # Intel EtherExpress PRO/100B (82557, 82558) +device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet +device lge # Level 1 LXT1001 gigabit Ethernet +device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet +device nge # NatSemi DP83820 gigabit Ethernet +#device nve # nVidia nForce MCP on-board Ethernet Networking +device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le') +device re # RealTek 8139C+/8169/8169S/8110S +device rl # RealTek 8129/8139 +device sf # Adaptec AIC-6915 (``Starfire'') +device sge # Silicon Integrated Systems SiS190/191 +device sis # Silicon Integrated Systems SiS 900/SiS 7016 +device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet +device ste # Sundance ST201 (D-Link DFE-550TX) +device stge # Sundance/Tamarack TC9021 gigabit Ethernet +device tl # Texas Instruments ThunderLAN +device tx # SMC EtherPower II (83c170 ``EPIC'') +device vge # VIA VT612x gigabit Ethernet +device vr # VIA Rhine, Rhine II +device wb # Winbond W89C840F +device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') + +# Wireless NIC cards +device wlan # 802.11 support +options IEEE80211_DEBUG # enable debug msgs +options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's +options IEEE80211_SUPPORT_MESH # enable 802.11s draft support +device wlan_wep # 802.11 WEP support +device wlan_ccmp # 802.11 CCMP support +device wlan_tkip # 802.11 TKIP support +device wlan_amrr # AMRR transmit rate control algorithm +device an # Aironet 4500/4800 802.11 wireless NICs. +device ath # Atheros NIC's +device ath_pci # Atheros pci/cardbus glue +device ath_hal # pci/cardbus chip support +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +device ath_rate_sample # SampleRate tx rate control for ath +device ral # Ralink Technology RT2500 wireless NICs. +device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. + +# Pseudo devices. +device loop # Network loopback +device random # Entropy device +device ether # Ethernet support +device vlan # 802.1Q VLAN support +device tun # Packet tunnel. +device md # Memory "disks" +device gif # IPv6 and IPv4 tunneling +device faith # IPv6-to-IPv4 relaying (translation) +device firmware # firmware assist module + +# The `bpf' device enables the Berkeley Packet Filter. +# Be aware of the administrative consequences of enabling this! +# Note that 'bpf' is required for DHCP. +device bpf # Berkeley packet filter + +# Hardware watchdog support. +#device octeon_wdog # Octeon hardware watchdog + +# USB support +options USB_DEBUG # enable debug msgs +device octusb # Cavium Octeon on-board USB interface (USB 2.0) +device uhci # UHCI PCI->USB interface +device ohci # OHCI PCI->USB interface +device ehci # EHCI PCI->USB interface (USB 2.0) +device usb # USB Bus (required) +#device udbp # USB Double Bulk Pipe devices +device uhid # "Human Interface Devices" +device ulpt # Printer +device umass # Disks/Mass storage - Requires scbus and da +device ums # Mouse +device urio # Diamond Rio 500 MP3 player +# USB Serial devices +device u3g # USB-based 3G modems (Option, Huawei, Sierra) +device uark # Technologies ARK3116 based serial adapters +device ubsa # Belkin F5U103 and compatible serial adapters +device uftdi # For FTDI usb serial adapters +device uipaq # Some WinCE based devices +device uplcom # Prolific PL-2303 serial adapters +device uslcom # SI Labs CP2101/CP2102 serial adapters +device uvisor # Visor and Palm devices +device uvscom # USB serial support for DDI pocket's PHS +# USB Ethernet, requires miibus +device aue # ADMtek USB Ethernet +device axe # ASIX Electronics USB Ethernet +device cdce # Generic USB over Ethernet +device cue # CATC USB Ethernet +device kue # Kawasaki LSI USB Ethernet +device rue # RealTek RTL8150 USB Ethernet +device udav # Davicom DM9601E USB +# USB Wireless +device rum # Ralink Technology RT2501USB wireless NICs +device uath # Atheros AR5523 wireless NICs +device ural # Ralink Technology RT2500USB wireless NICs +device zyd # ZyDAS zd1211/zd1211b wireless NICs + +# crypto subsystem +device crypto # core crypto support +device cryptodev # /dev/crypto for access to h/w +device cryptocteon # Octeon coprocessor 2 crypto offload + +# GPIO support +#device gpio + +# PMC support +#device hwpmc From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 16:14:51 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 00DAA41A; Wed, 23 Oct 2013 16:14:50 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D2E212A86; Wed, 23 Oct 2013 16:14:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NGEoXq044276; Wed, 23 Oct 2013 16:14:50 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NGEnOO044263; Wed, 23 Oct 2013 16:14:49 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231614.r9NGEnOO044263@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 16:14:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256981 - in projects/vps/sys: amd64/amd64 i386/i386 mips/conf mips/mips vps X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 16:14:51 -0000 Author: will Date: Wed Oct 23 16:14:48 2013 New Revision: 256981 URL: http://svnweb.freebsd.org/changeset/base/256981 Log: Sync with svn.7he.at/vps/trunk r184. r184 | klaus | 2013-07-09 03:58:48 -0600 (Tue, 09 Jul 2013) | 3 lines Fixed the mips port (td->td_md.md_tls was not set properly). Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/amd64/amd64/vps_machdep.c projects/vps/sys/i386/i386/vps_machdep.c projects/vps/sys/mips/conf/EDGEROUTER_VPS projects/vps/sys/mips/mips/vps_machdep.c projects/vps/sys/vps/vps2.h projects/vps/sys/vps/vps_libdump.h projects/vps/sys/vps/vps_priv.c projects/vps/sys/vps/vps_snapst.c projects/vps/sys/vps/vps_suspend.c Modified: projects/vps/sys/amd64/amd64/vps_machdep.c ============================================================================== --- projects/vps/sys/amd64/amd64/vps_machdep.c Wed Oct 23 16:12:20 2013 (r256980) +++ projects/vps/sys/amd64/amd64/vps_machdep.c Wed Oct 23 16:14:48 2013 (r256981) @@ -87,6 +87,14 @@ vps_md_print_thread(struct thread *td) /*__attribute__((inline))*/ int +vps_md_snapshot_thread(struct vps_dump_thread *vdtd, struct thread *td) +{ + + return (0); +} + +/*__attribute__((inline))*/ +int vps_md_restore_thread(struct vps_dump_thread *vdtd, struct thread *ntd, struct proc *p) { Modified: projects/vps/sys/i386/i386/vps_machdep.c ============================================================================== --- projects/vps/sys/i386/i386/vps_machdep.c Wed Oct 23 16:12:20 2013 (r256980) +++ projects/vps/sys/i386/i386/vps_machdep.c Wed Oct 23 16:14:48 2013 (r256981) @@ -87,6 +87,14 @@ vps_md_print_thread(struct thread *td) /*__attribute__((inline))*/ int +vps_md_snapshot_thread(struct vps_dump_thread *vdtd, struct thread *td) +{ + + return (0); +} + +/*__attribute__((inline))*/ +int vps_md_restore_thread(struct vps_dump_thread *vdtd, struct thread *ntd, struct proc *p) { Modified: projects/vps/sys/mips/conf/EDGEROUTER_VPS ============================================================================== --- projects/vps/sys/mips/conf/EDGEROUTER_VPS Wed Oct 23 16:12:20 2013 (r256980) +++ projects/vps/sys/mips/conf/EDGEROUTER_VPS Wed Oct 23 16:14:48 2013 (r256981) @@ -23,6 +23,7 @@ ident EDGEROUTER_VPS options VPS options VPS_STATIC options VIMAGE +options DIAGNOSTIC #options MD_ROOT_SIZE=8192 # Reserve 8 MB for MD root image #makeoptions MFS_IMAGE=/usr/src/edgerouter/mdroot.img Modified: projects/vps/sys/mips/mips/vps_machdep.c ============================================================================== --- projects/vps/sys/mips/mips/vps_machdep.c Wed Oct 23 16:12:20 2013 (r256980) +++ projects/vps/sys/mips/mips/vps_machdep.c Wed Oct 23 16:14:48 2013 (r256981) @@ -105,6 +105,16 @@ vps_md_print_thread(struct thread *td) /*__attribute__((inline))*/ int +vps_md_snapshot_thread(struct vps_dump_thread *vdtd, struct thread *td) +{ + + vdtd->td_spare[0] = (uint64)td->td_md.md_tls; + + return (0); +} + +/*__attribute__((inline))*/ +int vps_md_restore_thread(struct vps_dump_thread *vdtd, struct thread *ntd, struct proc *p) { @@ -116,17 +126,6 @@ vps_md_restore_thread(struct vps_dump_th return (EOPNOTSUPP); } - /* - ntd->td_pcb->pcb_cr3 = - DMAP_TO_PHYS((vm_offset_t)vmspace_pmap(p->p_vmspace)->pm_pml4); - ntd->td_pcb->pcb_r12 = (uint64_t)vps_func->vps_restore_return; - ntd->td_pcb->pcb_rbp = 0; - ntd->td_pcb->pcb_rsp = (uint64_t)ntd->td_frame - sizeof(void *); - ntd->td_pcb->pcb_rbx = (uint64_t)ntd; - ntd->td_pcb->pcb_rip = (uint64_t)fork_trampoline; - ntd->td_md.md_spinlock_count = 1; - ntd->td_md.md_saved_flags = PSL_KERNEL | PSL_I; - */ ntd->td_pcb->pcb_context[PCB_REG_RA] = (register_t)(intptr_t) fork_trampoline; /* Make sp 64-bit aligned */ @@ -139,11 +138,12 @@ vps_md_restore_thread(struct vps_dump_th ntd->td_frame; ntd->td_pcb->pcb_context[PCB_REG_SR] = mips_rd_status() & (MIPS_SR_KX | MIPS_SR_UX | MIPS_SR_INT_MASK); - ntd->td_md.md_tls = curthread->td_md.md_tls; ntd->td_md.md_saved_intr = MIPS_SR_INT_IE; ntd->td_md.md_spinlock_count = 1; - /* XXX CPU_CNMIPS stuff ?! */ + ntd->td_md.md_tls = (void *)vdtd->td_spare[0]; + + /* XXX CPU_CNMIPS stuff */ ntd->td_errno = vdtd->td_errno; ntd->td_retval[0] = vdtd->td_retval[0]; @@ -279,7 +279,7 @@ XXX */ if (vdsf->sf_length != sizeof(struct savefpu)) { DBGCORE("%s: vdsf->sf_length != sizeof(struct savefpu) " - (%u != %lu)\n", __func__, vdsf->sf_length, + "(%u != %lu)\n", __func__, vdsf->sf_length, sizeof(struct savefpu)); return (EINVAL); } @@ -499,15 +499,6 @@ vps_md_syscall_fixup_setup_inthread(stru if (vps_func->vps_syscall_fixup_inthread == NULL) return (EOPNOTSUPP); - /* - td->td_pcb->pcb_r12 = - (uint64_t)vps_func->vps_syscall_fixup_inthread; - td->td_pcb->pcb_rip = (uint64_t)fork_trampoline; - td->td_pcb->pcb_rsp = (uint64_t)td->td_frame - - sizeof(void *); - td->td_pcb->pcb_rbx = (uint64_t)code; - td->td_pcb->pcb_rbp = 0; - */ td->td_pcb->pcb_context[PCB_REG_RA] = (register_t)(intptr_t) fork_trampoline; /* Make sp 64-bit aligned */ Modified: projects/vps/sys/vps/vps2.h ============================================================================== --- projects/vps/sys/vps/vps2.h Wed Oct 23 16:12:20 2013 (r256980) +++ projects/vps/sys/vps/vps2.h Wed Oct 23 16:14:48 2013 (r256981) @@ -240,6 +240,7 @@ struct vps_dump_thread; struct execve_args; void vps_md_print_thread(struct thread *td); void vps_md_print_pcb(struct thread *td); +int vps_md_snapshot_thread(struct vps_dump_thread *vdtd, struct thread *td); int vps_md_restore_thread(struct vps_dump_thread *vdtd, struct thread *ntd, struct proc *p); int vps_md_snapshot_sysentvec(struct sysentvec *sv, long *svtype); int vps_md_restore_sysentvec(long svtype, struct sysentvec **sv); Modified: projects/vps/sys/vps/vps_libdump.h ============================================================================== --- projects/vps/sys/vps/vps_libdump.h Wed Oct 23 16:12:20 2013 (r256980) +++ projects/vps/sys/vps/vps_libdump.h Wed Oct 23 16:14:48 2013 (r256981) @@ -128,7 +128,7 @@ void vps_libdump_printheader(struct vps_ #define VPS_DUMPOBJT_UCRED 120 #define VPS_DUMPH_MAGIC 0xc0debabe -#define VPS_DUMPH_VERSION 0x20130512 +#define VPS_DUMPH_VERSION 0x20130709 #define VPS_DUMPH_MSB 12 #define VPS_DUMPH_LSB 21 #define VPS_DUMPH_32BIT 32 @@ -573,6 +573,8 @@ struct vps_dump_thread { sint32 td_errno; uint32 _pad2; + uint64 td_spare[4]; + sint32 td_tid; uint32 td_kstack_pages; char td_kstack[0]; /* always padded to 64 bit alignment */ Modified: projects/vps/sys/vps/vps_priv.c ============================================================================== --- projects/vps/sys/vps/vps_priv.c Wed Oct 23 16:12:20 2013 (r256980) +++ projects/vps/sys/vps/vps_priv.c Wed Oct 23 16:14:48 2013 (r256981) @@ -383,7 +383,7 @@ vps_devfs_ruleset_free(struct vps *vps, struct thread *td; int ruleset_num; devfs_rid rid; - int error; + int error = 0; DBGCORE("%s: vps=%p dm=%p\n", __func__, vps, dm); Modified: projects/vps/sys/vps/vps_snapst.c ============================================================================== --- projects/vps/sys/vps/vps_snapst.c Wed Oct 23 16:12:20 2013 (r256980) +++ projects/vps/sys/vps/vps_snapst.c Wed Oct 23 16:14:48 2013 (r256981) @@ -3280,6 +3280,12 @@ vps_snapshot_thread(struct vps_snapst_ct goto again; } + if (vps_md_snapshot_thread(vdtd, td) != 0) { + thread_unlock(td); + vdo_discard(ctx, o1); + goto again; + } + if (vps_snapshot_thread_savefpu(ctx, vps, td) != 0) { thread_unlock(td); vdo_discard(ctx, o1); Modified: projects/vps/sys/vps/vps_suspend.c ============================================================================== --- projects/vps/sys/vps/vps_suspend.c Wed Oct 23 16:12:20 2013 (r256980) +++ projects/vps/sys/vps/vps_suspend.c Wed Oct 23 16:14:48 2013 (r256981) @@ -755,7 +755,7 @@ vps_syscall_fixup_inthread(register_t co DBGCORE("%s: ####################### curthread=%p/%u code=%zu\n", __func__, td, td->td_tid, (size_t)code); - KASSERT(frame == td->td_frame, ("%s: frame == td->td_frame\n", + KASSERT(frame == td->td_frame, ("%s: frame != td->td_frame\n", __func__)); switch(code) { From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 16:55:45 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 80C3EE69; Wed, 23 Oct 2013 16:55:45 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5DC072D7B; Wed, 23 Oct 2013 16:55:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NGtj9m057478; Wed, 23 Oct 2013 16:55:45 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NGtiUi057472; Wed, 23 Oct 2013 16:55:44 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231655.r9NGtiUi057472@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 16:55:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256983 - in projects/vps/sys: amd64/amd64 i386/i386 mips/mips vps X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 16:55:45 -0000 Author: will Date: Wed Oct 23 16:55:43 2013 New Revision: 256983 URL: http://svnweb.freebsd.org/changeset/base/256983 Log: Sync with svn.7he.at/vps/trunk r185. r185 | klaus | 2013-07-09 05:20:23 -0600 (Tue, 09 Jul 2013) | 3 lines Some code cleanup. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/amd64/amd64/pmap.c projects/vps/sys/amd64/amd64/vps_machdep.c projects/vps/sys/i386/i386/pmap.c projects/vps/sys/i386/i386/vps_machdep.c projects/vps/sys/mips/mips/vps_machdep.c projects/vps/sys/vps/vps_libdump.h Modified: projects/vps/sys/amd64/amd64/pmap.c ============================================================================== --- projects/vps/sys/amd64/amd64/pmap.c Wed Oct 23 16:55:20 2013 (r256982) +++ projects/vps/sys/amd64/amd64/pmap.c Wed Oct 23 16:55:43 2013 (r256983) @@ -122,8 +122,6 @@ __FBSDID("$FreeBSD$"); #include #endif -#include - #include #include #include @@ -167,24 +165,6 @@ __FBSDID("$FreeBSD$"); #define pa_index(pa) ((pa) >> PDRSHIFT) #define pa_to_pvh(pa) (&pv_table[pa_index(pa)]) -#if 0 - -#ifdef VPS -#define VPS_ACCOUNT_PMAP(_pmap, action, charge) \ - do { \ - if (_pmap == kernel_map->pmap || \ - _pmap == kmem_map->pmap || \ - _pmap == buffer_map->pmap) \ - break; \ - vps_account(curthread->td_vps, VPS_ACC_PHYS, \ - action, charge << PAGE_SHIFT); \ - } while (0) -#endif /* VPS */ - -#else -#define VPS_ACCOUNT_PMAP(a, b, c) -#endif - #define NPV_LIST_LOCKS MAXCPU #define PHYS_TO_PV_LIST_LOCK(pa) \ @@ -481,7 +461,6 @@ pmap_resident_count_inc(pmap_t pmap, int PMAP_LOCK_ASSERT(pmap, MA_OWNED); pmap->pm_stats.resident_count += count; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_ALLOC, count); } static __inline void @@ -490,7 +469,6 @@ pmap_resident_count_dec(pmap_t pmap, int PMAP_LOCK_ASSERT(pmap, MA_OWNED); pmap->pm_stats.resident_count -= count; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_FREE, count); } PMAP_INLINE pt_entry_t * Modified: projects/vps/sys/amd64/amd64/vps_machdep.c ============================================================================== --- projects/vps/sys/amd64/amd64/vps_machdep.c Wed Oct 23 16:55:20 2013 (r256982) +++ projects/vps/sys/amd64/amd64/vps_machdep.c Wed Oct 23 16:55:43 2013 (r256983) @@ -63,7 +63,6 @@ static const char vpsid[] = #ifdef VPS -/*__attribute__((inline))*/ void vps_md_print_thread(struct thread *td) { @@ -85,7 +84,6 @@ vps_md_print_thread(struct thread *td) td->td_frame->tf_rip); } -/*__attribute__((inline))*/ int vps_md_snapshot_thread(struct vps_dump_thread *vdtd, struct thread *td) { @@ -93,7 +91,6 @@ vps_md_snapshot_thread(struct vps_dump_t return (0); } -/*__attribute__((inline))*/ int vps_md_restore_thread(struct vps_dump_thread *vdtd, struct thread *ntd, struct proc *p) @@ -119,14 +116,13 @@ vps_md_restore_thread(struct vps_dump_th ntd->td_retval[0] = vdtd->td_retval[0]; ntd->td_retval[1] = vdtd->td_retval[1]; - //db_trace_thread(ntd, 10); + /* db_trace_thread(ntd, 10); */ DBGCORE("%s: td_pcb = %p; td_frame = %p; pcb_rsp = %016lx\n", __func__, ntd->td_pcb, ntd->td_frame, ntd->td_pcb->pcb_rsp); return (0); } -/*__attribute__((inline))*/ int vps_md_snapshot_sysentvec(struct sysentvec *sv, long *svtype) { @@ -151,7 +147,6 @@ vps_md_snapshot_sysentvec(struct sysentv return (error); } -/*__attribute__((inline))*/ int vps_md_restore_sysentvec(long svtype, struct sysentvec **sv) { @@ -174,7 +169,6 @@ vps_md_restore_sysentvec(long svtype, st return (error); } -/*__attribute__((inline))*/ int vps_md_restore_checkarch(uint8 ptrsize, uint8 byteorder) { @@ -188,7 +182,6 @@ vps_md_restore_checkarch(uint8 ptrsize, return (error); } -/*__attribute__((inline))*/ int vps_md_snapshot_thread_savefpu(struct vps_snapst_ctx *ctx, struct vps *vps, struct thread *td) @@ -223,7 +216,6 @@ vps_md_snapshot_thread_savefpu(struct vp return (0); } -/*__attribute__((inline))*/ int vps_md_restore_thread_savefpu(struct vps_snapst_ctx *ctx, struct vps *vps, struct thread *td) @@ -258,7 +250,6 @@ vps_md_restore_thread_savefpu(struct vps return (0); } -/*__attribute__((inline))*/ int vps_md_reboot_copyout(struct thread *td, struct execve_args *args) { @@ -329,7 +320,6 @@ vps_md_reboot_copyout(struct thread *td, return (error); } -/*__attribute__((noinline))*/ int vps_md_syscall_fixup(struct vps *vps, struct thread *td, register_t *ret_code, register_t **ret_args, int *ret_narg) @@ -489,7 +479,6 @@ vps_md_syscall_fixup_setup_inthread(stru return (0); } -__attribute__((noinline)) void vps_md_print_pcb(struct thread *td) { @@ -497,50 +486,21 @@ vps_md_print_pcb(struct thread *td) p = td->td_pcb; -#if 0 -// XXX DBGCORE("%s: td=%p\n" - "pcb_cr3: 0x%08x\n" - "pcb_edi: 0x%08x\n" - "pcb_esi: 0x%08x\n" - "pcb_ebp: 0x%08x\n" - "pcb_esp: 0x%08x\n" - "pcb_ebx: 0x%08x\n" - "pcb_eip: 0x%08x\n" - "pcb_psl: 0x%08x\n" - "pcb_ext: 0x%08x\n" + "pcb_cr3: 0x%16lx\n" + "pcb_rbp: 0x%16lx\n" + "pcb_rsp: 0x%16lx\n" + "pcb_rbx: 0x%16lx\n" + "pcb_rip: 0x%16lx\n" , __func__, td , p->pcb_cr3 - , p->pcb_edi - , p->pcb_esi - , p->pcb_ebp - , p->pcb_esp - , p->pcb_ebx - , p->pcb_eip - , p->pcb_psl - , (int)p->pcb_ext + , p->pcb_rbp + , p->pcb_rsp + , p->pcb_rbx + , p->pcb_rip ); -#endif } -#if 0 -/* --------------------------- 8< --------------------------- */ - -// vps_suspend(): -#if defined(CPU_X86) - DBGCORE("td->td_frame=%p tf_rax=%p tf_rsp=%p\n", td->td_frame, - (void*)td->td_frame->tf_rax, (void*)td->td_frame->tf_rsp); -#elif defined(CPU_386) - DBGCORE("td->td_frame=%p tf_eax=%p tf_esp=%p\n", td->td_frame, - (void*)td->td_frame->tf_eax, (void*)td->td_frame->tf_esp); -#else -#error "unsupported architecture" -#endif - -// -/* --------------------------- 8< --------------------------- */ -#endif /* 0 */ - #endif /* VPS */ /* EOF */ Modified: projects/vps/sys/i386/i386/pmap.c ============================================================================== --- projects/vps/sys/i386/i386/pmap.c Wed Oct 23 16:55:20 2013 (r256982) +++ projects/vps/sys/i386/i386/pmap.c Wed Oct 23 16:55:43 2013 (r256983) @@ -155,9 +155,6 @@ __FBSDID("$FreeBSD$"); #include #endif -#include -#include - #if !defined(CPU_DISABLE_SSE) && defined(I686_CPU) #define CPU_ENABLE_SSE #endif @@ -201,24 +198,6 @@ __FBSDID("$FreeBSD$"); atomic_clear_int((u_int *)(pte), PG_W)) #define pmap_pte_set_prot(pte, v) ((*(int *)pte &= ~PG_PROT), (*(int *)pte |= (v))) -#if 0 - -#ifdef VPS -#define VPS_ACCOUNT_PMAP(_pmap, action, charge) \ - do { \ - if (_pmap == kernel_map->pmap || \ - _pmap == kmem_map->pmap || \ - _pmap == buffer_map->pmap) \ - break; \ - vps_account(curthread->td_vps, VPS_ACC_PHYS, \ - action, charge << PAGE_SHIFT); \ - } while (0) -#endif /* VPS */ - -#else -#define VPS_ACCOUNT_PMAP(a, b, c) -#endif - struct pmap kernel_pmap_store; LIST_HEAD(pmaplist, pmap); static struct pmaplist allpmaps; @@ -1687,7 +1666,6 @@ _pmap_unwire_ptp(pmap_t pmap, vm_page_t */ pmap->pm_pdir[m->pindex] = 0; --pmap->pm_stats.resident_count; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_FREE, 1); /* * This is a release store so that the ordinary store unmapping @@ -1871,7 +1849,6 @@ _pmap_allocpte(pmap_t pmap, u_int ptepin */ pmap->pm_stats.resident_count++; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_ALLOC, 1); ptepa = VM_PAGE_TO_PHYS(m); pmap->pm_pdir[ptepindex] = @@ -2691,7 +2668,6 @@ pmap_demote_pde(pmap_t pmap, pd_entry_t } if (va < VM_MAXUSER_ADDRESS) { pmap->pm_stats.resident_count++; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_ALLOC, 1); } } mptepa = VM_PAGE_TO_PHYS(mpte); @@ -2822,7 +2798,6 @@ pmap_remove_pde(pmap_t pmap, pd_entry_t if (oldpde & PG_G) pmap_invalidate_page(kernel_pmap, sva); pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_FREE, NBPDR / PAGE_SIZE); if (oldpde & PG_MANAGED) { pvh = pa_to_pvh(oldpde & PG_PS_FRAME); pmap_pvh_free(pvh, pmap, sva); @@ -2846,7 +2821,6 @@ pmap_remove_pde(pmap_t pmap, pd_entry_t if (mpte != NULL) { pmap_remove_pt_page(pmap, mpte); pmap->pm_stats.resident_count--; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_FREE, 1); KASSERT(mpte->wire_count == NPTEPG, ("pmap_remove_pde: pte page wire count error")); mpte->wire_count = 0; @@ -2879,7 +2853,6 @@ pmap_remove_pte(pmap_t pmap, pt_entry_t if (oldpte & PG_G) pmap_invalidate_page(kernel_pmap, va); pmap->pm_stats.resident_count -= 1; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_FREE, 1); if (oldpte & PG_MANAGED) { m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME); if ((oldpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) @@ -3070,7 +3043,6 @@ small_mappings: pmap = PV_PMAP(pv); PMAP_LOCK(pmap); pmap->pm_stats.resident_count--; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_FREE, 1); pde = pmap_pde(pmap, pv->pv_va); KASSERT((*pde & PG_PS) == 0, ("pmap_remove_all: found" " a 4mpage in page %p's pv list", m)); @@ -3535,7 +3507,6 @@ pmap_enter(pmap_t pmap, vm_offset_t va, } } else { pmap->pm_stats.resident_count++; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_ALLOC, 1); } /* @@ -3676,7 +3647,6 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t * Increment counters. */ pmap->pm_stats.resident_count += NBPDR / PAGE_SIZE; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_ALLOC, NBPDR / PAGE_SIZE); /* * Map the superpage. @@ -3842,7 +3812,6 @@ pmap_enter_quick_locked(pmap_t pmap, vm_ * Increment counters */ pmap->pm_stats.resident_count++; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_ALLOC, 1); pa = VM_PAGE_TO_PHYS(m) | pmap_cache_bits(m->md.pat_mode, 0); #ifdef PAE @@ -3939,7 +3908,6 @@ pmap_object_init_pt(pmap_t pmap, vm_offs PG_U | PG_RW | PG_V); pmap->pm_stats.resident_count += NBPDR / PAGE_SIZE; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_ALLOC, NBPDR / PAGE_SIZE); pmap_pde_mappings++; } /* Else continue on if the PDE is already valid. */ @@ -4062,7 +4030,6 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm ~PG_W; dst_pmap->pm_stats.resident_count += NBPDR / PAGE_SIZE; - VPS_ACCOUNT_PMAP(dst_pmap, VPS_ACC_ALLOC, NBPDR / PAGE_SIZE); } continue; } @@ -4098,7 +4065,6 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm *dst_pte = ptetemp & ~(PG_W | PG_M | PG_A); dst_pmap->pm_stats.resident_count++; - VPS_ACCOUNT_PMAP(dst_pmap, VPS_ACC_ALLOC, 1); } else { free = NULL; if (pmap_unwire_ptp(dst_pmap, dstmpte, @@ -4495,7 +4461,6 @@ pmap_remove_pages(pmap_t pmap) pc->pc_map[field] |= bitmask; if ((tpte & PG_PS) != 0) { pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_FREE, NBPDR / PAGE_SIZE); pvh = pa_to_pvh(tpte & PG_PS_FRAME); TAILQ_REMOVE(&pvh->pv_list, pv, pv_next); if (TAILQ_EMPTY(&pvh->pv_list)) { @@ -4507,7 +4472,6 @@ pmap_remove_pages(pmap_t pmap) if (mpte != NULL) { pmap_remove_pt_page(pmap, mpte); pmap->pm_stats.resident_count--; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_FREE, 1); KASSERT(mpte->wire_count == NPTEPG, ("pmap_remove_pages: pte page wire count error")); mpte->wire_count = 0; @@ -4516,7 +4480,6 @@ pmap_remove_pages(pmap_t pmap) } } else { pmap->pm_stats.resident_count--; - VPS_ACCOUNT_PMAP(pmap, VPS_ACC_FREE, 1); TAILQ_REMOVE(&m->md.pv_list, pv, pv_next); if (TAILQ_EMPTY(&m->md.pv_list) && (m->flags & PG_FICTITIOUS) == 0) { Modified: projects/vps/sys/i386/i386/vps_machdep.c ============================================================================== --- projects/vps/sys/i386/i386/vps_machdep.c Wed Oct 23 16:55:20 2013 (r256982) +++ projects/vps/sys/i386/i386/vps_machdep.c Wed Oct 23 16:55:43 2013 (r256983) @@ -63,7 +63,6 @@ static const char vpsid[] = #ifdef VPS -/*__attribute__((inline))*/ void vps_md_print_thread(struct thread *td) { @@ -85,7 +84,6 @@ vps_md_print_thread(struct thread *td) td->td_frame->tf_eip); } -/*__attribute__((inline))*/ int vps_md_snapshot_thread(struct vps_dump_thread *vdtd, struct thread *td) { @@ -93,7 +91,6 @@ vps_md_snapshot_thread(struct vps_dump_t return (0); } -/*__attribute__((inline))*/ int vps_md_restore_thread(struct vps_dump_thread *vdtd, struct thread *ntd, struct proc *p) @@ -121,14 +118,13 @@ vps_md_restore_thread(struct vps_dump_th ntd->td_retval[0] = vdtd->td_retval[0]; ntd->td_retval[1] = vdtd->td_retval[1]; - //db_trace_thread(ntd, 10); + /* db_trace_thread(ntd, 10); */ DBGCORE("%s: td_pcb = %p; td_frame = %p; pcb_esp = %08x\n", __func__, ntd->td_pcb, ntd->td_frame, ntd->td_pcb->pcb_esp); return (0); } -/*__attribute__((inline))*/ int vps_md_snapshot_sysentvec(struct sysentvec *sv, long *svtype) { @@ -148,7 +144,6 @@ vps_md_snapshot_sysentvec(struct sysentv return (error); } -/*__attribute__((inline))*/ int vps_md_restore_sysentvec(long svtype, struct sysentvec **sv) { @@ -167,7 +162,6 @@ vps_md_restore_sysentvec(long svtype, st return (error); } -/*__attribute__((inline))*/ int vps_md_restore_checkarch(uint8 ptrsize, uint8 byteorder) { @@ -181,7 +175,6 @@ vps_md_restore_checkarch(uint8 ptrsize, return (error); } -/*__attribute__((inline))*/ int vps_md_snapshot_thread_savefpu(struct vps_snapst_ctx *ctx, struct vps *vps, struct thread *td) @@ -190,7 +183,6 @@ vps_md_snapshot_thread_savefpu(struct vp return (0); } -/*__attribute__((inline))*/ int vps_md_restore_thread_savefpu(struct vps_snapst_ctx *ctx, struct vps *vps, struct thread *td) @@ -199,7 +191,6 @@ vps_md_restore_thread_savefpu(struct vps return (0); } -/*__attribute__((inline))*/ int vps_md_reboot_copyout(struct thread *td, struct execve_args *args) { @@ -264,7 +255,6 @@ vps_md_reboot_copyout(struct thread *td, return (error); } -/*__attribute__((noinline))*/ int vps_md_syscall_fixup(struct vps *vps, struct thread *td, register_t *ret_code, register_t **ret_args, int *ret_narg) @@ -380,7 +370,6 @@ vps_md_syscall_fixup_setup_inthread(stru return (0); } -__attribute__((noinline)) void vps_md_print_pcb(struct thread *td) { @@ -411,24 +400,6 @@ vps_md_print_pcb(struct thread *td) ); } -#if 0 -/* --------------------------- 8< --------------------------- */ - -// vps_suspend(): -#if defined(CPU_X86) - DBGCORE("td->td_frame=%p tf_rax=%p tf_rsp=%p\n", td->td_frame, - (void*)td->td_frame->tf_rax, (void*)td->td_frame->tf_rsp); -#elif defined(CPU_386) - DBGCORE("td->td_frame=%p tf_eax=%p tf_esp=%p\n", td->td_frame, - (void*)td->td_frame->tf_eax, (void*)td->td_frame->tf_esp); -#else -#error "unsupported architecture" -#endif - -// -/* --------------------------- 8< --------------------------- */ -#endif /* 0 */ - #endif /* VPS */ /* EOF */ Modified: projects/vps/sys/mips/mips/vps_machdep.c ============================================================================== --- projects/vps/sys/mips/mips/vps_machdep.c Wed Oct 23 16:55:20 2013 (r256982) +++ projects/vps/sys/mips/mips/vps_machdep.c Wed Oct 23 16:55:43 2013 (r256983) @@ -75,35 +75,25 @@ static const char vpsid[] = #ifdef VPS -/*__attribute__((inline))*/ void vps_md_print_thread(struct thread *td) { DBGCORE("%s: thread %p/%d kernel stack:\n" - /* - "td->td_pcb->rsp=%016lx\n" - "td->td_frame->tf_rax=%016lx\n" - "td->td_frame->tf_rsp=%016lx\n" - "td->td_frame->tf_rbp=%016lx\n" - "td->td_frame->tf_rip=%016lx\n" + "td->td_pcb->pcb_context[PCB_REG_SP]=%016lx\n" + "td->td_frame->tf_sp=%016lx\n" + "td->td_frame->tf_pc=%016lx\n" "trace:\n", - */ , __func__, td, td->td_tid - /* - td->td_pcb->pcb_rsp, - td->td_frame->tf_rax, - td->td_frame->tf_rsp, - td->td_frame->tf_rbp, - td->td_frame->tf_rip - */ + td->td_pcb->pcb_context[PCB_REG_SP], + td->td_frame->sp, + td->td_frame->pc ); } -/*__attribute__((inline))*/ int vps_md_snapshot_thread(struct vps_dump_thread *vdtd, struct thread *td) { @@ -113,7 +103,6 @@ vps_md_snapshot_thread(struct vps_dump_t return (0); } -/*__attribute__((inline))*/ int vps_md_restore_thread(struct vps_dump_thread *vdtd, struct thread *ntd, struct proc *p) @@ -158,7 +147,6 @@ vps_md_restore_thread(struct vps_dump_th return (0); } -/*__attribute__((inline))*/ int vps_md_snapshot_sysentvec(struct sysentvec *sv, long *svtype) { @@ -183,7 +171,6 @@ vps_md_snapshot_sysentvec(struct sysentv return (error); } -/*__attribute__((inline))*/ int vps_md_restore_sysentvec(long svtype, struct sysentvec **sv) { @@ -192,6 +179,7 @@ vps_md_restore_sysentvec(long svtype, st if (svtype == VPS_SYSENTVEC_ELF64) *sv = &elf64_freebsd_sysvec; #ifdef COMPAT_FREEBSD32 + /* XXX */ else if (svtype == VPS_SYSENTVEC_ELF32) *sv = &ia32_freebsd_sysvec; #endif @@ -206,7 +194,6 @@ vps_md_restore_sysentvec(long svtype, st return (error); } -/*__attribute__((inline))*/ int vps_md_restore_checkarch(uint8 ptrsize, uint8 byteorder) { @@ -220,7 +207,6 @@ vps_md_restore_checkarch(uint8 ptrsize, return (error); } -/*__attribute__((inline))*/ int vps_md_snapshot_thread_savefpu(struct vps_snapst_ctx *ctx, struct vps *vps, struct thread *td) @@ -258,7 +244,6 @@ XXX return (0); } -/*__attribute__((inline))*/ int vps_md_restore_thread_savefpu(struct vps_snapst_ctx *ctx, struct vps *vps, struct thread *td) @@ -296,7 +281,6 @@ XXX return (0); } -/*__attribute__((inline))*/ int vps_md_reboot_copyout(struct thread *td, struct execve_args *args) { @@ -320,6 +304,7 @@ vps_md_reboot_copyout(struct thread *td, suword64((void *)(addr + 0x0), (addr + 0x40)); suword64((void *)(addr + 0x8), (vm_offset_t)NULL); #ifdef COMPAT_FREEBSD32 + /* XXX */ } else if (p->p_sysent == &ia32_freebsd_sysvec) { copyout("/sbin/init", (void *)(addr + 0x40), 11); suword32((void *)(addr + 0x0), (addr + 0x40)); @@ -367,7 +352,6 @@ vps_md_reboot_copyout(struct thread *td, return (error); } -/*__attribute__((noinline))*/ int vps_md_syscall_fixup(struct vps *vps, struct thread *td, register_t *ret_code, register_t **ret_args, int *ret_narg) @@ -407,6 +391,7 @@ vps_md_syscall_fixup(struct vps *vps, st DBGCORE("%s: proc=%p/%u elf64_freebsd_sysvec\n", __func__, p, p->p_pid); #ifdef COMPAT_FREEBSD32 + /* XXX */ } else if (sv == &ia32_freebsd_sysvec) { DBGCORE("%s: proc=%p/%u ia32_freebsd_sysvec\n", __func__, p, p->p_pid); @@ -511,7 +496,6 @@ vps_md_syscall_fixup_setup_inthread(stru return (0); } -__attribute__((noinline)) void vps_md_print_pcb(struct thread *td) { @@ -519,50 +503,39 @@ vps_md_print_pcb(struct thread *td) p = td->td_pcb; -#if 0 -// XXX - DBGCORE("%s: td=%p\n" - "pcb_cr3: 0x%08x\n" - "pcb_edi: 0x%08x\n" - "pcb_esi: 0x%08x\n" - "pcb_ebp: 0x%08x\n" - "pcb_esp: 0x%08x\n" - "pcb_ebx: 0x%08x\n" - "pcb_eip: 0x%08x\n" - "pcb_psl: 0x%08x\n" - "pcb_ext: 0x%08x\n" + DBGCORE("%s: td=%p PCB\n" + "s0: 0x%16lx\n" + "s1: 0x%16lx\n" + "s2: 0x%16lx\n" + "s3: 0x%16lx\n" + "s4: 0x%16lx\n" + "s5: 0x%16lx\n" + "s6: 0x%16lx\n" + "s7: 0x%16lx\n" + "sp: 0x%16lx\n" + "s8: 0x%16lx\n" + "ra: 0x%16lx\n" + "sr: 0x%16lx\n" + "gp: 0x%16lx\n" + "pc: 0x%16lx\n" , __func__, td - , p->pcb_cr3 - , p->pcb_edi - , p->pcb_esi - , p->pcb_ebp - , p->pcb_esp - , p->pcb_ebx - , p->pcb_eip - , p->pcb_psl - , (int)p->pcb_ext + , p->pcb_context[PCB_REG_S0] + , p->pcb_context[PCB_REG_S1] + , p->pcb_context[PCB_REG_S2] + , p->pcb_context[PCB_REG_S3] + , p->pcb_context[PCB_REG_S4] + , p->pcb_context[PCB_REG_S5] + , p->pcb_context[PCB_REG_S6] + , p->pcb_context[PCB_REG_S7] + , p->pcb_context[PCB_REG_SP] + , p->pcb_context[PCB_REG_S8] + , p->pcb_context[PCB_REG_RA] + , p->pcb_context[PCB_REG_SR] + , p->pcb_context[PCB_REG_GP] + , p->pcb_context[PCB_REG_PC] ); -#endif } -#if 0 -/* --------------------------- 8< --------------------------- */ - -// vps_suspend(): -#if defined(CPU_X86) - DBGCORE("td->td_frame=%p tf_rax=%p tf_rsp=%p\n", td->td_frame, - (void*)td->td_frame->tf_rax, (void*)td->td_frame->tf_rsp); -#elif defined(CPU_386) - DBGCORE("td->td_frame=%p tf_eax=%p tf_esp=%p\n", td->td_frame, - (void*)td->td_frame->tf_eax, (void*)td->td_frame->tf_esp); -#else -#error "unsupported architecture" -#endif - -// -/* --------------------------- 8< --------------------------- */ -#endif /* 0 */ - #endif /* VPS */ /* EOF */ Modified: projects/vps/sys/vps/vps_libdump.h ============================================================================== --- projects/vps/sys/vps/vps_libdump.h Wed Oct 23 16:55:20 2013 (r256982) +++ projects/vps/sys/vps/vps_libdump.h Wed Oct 23 16:55:43 2013 (r256983) @@ -134,7 +134,6 @@ void vps_libdump_printheader(struct vps_ #define VPS_DUMPH_32BIT 32 #define VPS_DUMPH_64BIT 64 -//#if defined(CPU_X86) #if defined(VPS_ARCH_AMD64) /* AMD64 declarations */ typedef unsigned char uint8; @@ -165,7 +164,6 @@ typedef unsigned long size_t; /* end amd64 declarations */ -//#elif defined(CPU_386) #elif defined(VPS_ARCH_I386) /* i386 declarations */ typedef unsigned char uint8; From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 16:56:44 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B7212F59; Wed, 23 Oct 2013 16:56:44 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A2CB82D85; Wed, 23 Oct 2013 16:56:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NGuidK057622; Wed, 23 Oct 2013 16:56:44 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NGuiL1057621; Wed, 23 Oct 2013 16:56:44 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231656.r9NGuiL1057621@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 16:56:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256984 - projects/vps/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 16:56:44 -0000 Author: will Date: Wed Oct 23 16:56:44 2013 New Revision: 256984 URL: http://svnweb.freebsd.org/changeset/base/256984 Log: Sync with svn.7he.at/vps/trunk r186. r186 | klaus | 2013-07-09 05:53:11 -0600 (Tue, 09 Jul 2013) | 3 lines Made sysctl vfs.conflist public, because tar needs it. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/kern/vfs_subr.c Modified: projects/vps/sys/kern/vfs_subr.c ============================================================================== --- projects/vps/sys/kern/vfs_subr.c Wed Oct 23 16:55:43 2013 (r256983) +++ projects/vps/sys/kern/vfs_subr.c Wed Oct 23 16:56:44 2013 (r256984) @@ -3201,9 +3201,9 @@ sysctl_vfs_conflist(SYSCTL_HANDLER_ARGS) return (error); } -SYSCTL_PROC(_vfs, OID_AUTO, conflist, CTLTYPE_OPAQUE | CTLFLAG_RD, +_SYSCTL_PROC(_vfs, OID_AUTO, conflist, CTLTYPE_OPAQUE | CTLFLAG_RD, NULL, 0, sysctl_vfs_conflist, - "S,xvfsconf", "List of all configured filesystems"); + "S,xvfsconf", "List of all configured filesystems", VPS_PUBLIC); #ifndef BURN_BRIDGES static int sysctl_ovfs_conf(SYSCTL_HANDLER_ARGS); From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 16:58:05 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8D2CDD3; Wed, 23 Oct 2013 16:58:05 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7A4BD2D90; Wed, 23 Oct 2013 16:58:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NGw5M1057809; Wed, 23 Oct 2013 16:58:05 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NGw5iv057807; Wed, 23 Oct 2013 16:58:05 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231658.r9NGw5iv057807@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 16:58:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256985 - projects/vps/usr.sbin/vpsctl X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 16:58:05 -0000 Author: will Date: Wed Oct 23 16:58:04 2013 New Revision: 256985 URL: http://svnweb.freebsd.org/changeset/base/256985 Log: Sync with svn.7he.at/vps/trunk r187. r187 | klaus | 2013-07-09 06:44:15 -0600 (Tue, 09 Jul 2013) | 3 lines Wrote a shellscript instead of mkprivlist.c for cross-compiling. Submitted by: Klaus P. Ohrhallinger Added: projects/vps/usr.sbin/vpsctl/mkprivlist.sh Modified: projects/vps/usr.sbin/vpsctl/Makefile Modified: projects/vps/usr.sbin/vpsctl/Makefile ============================================================================== --- projects/vps/usr.sbin/vpsctl/Makefile Wed Oct 23 16:56:44 2013 (r256984) +++ projects/vps/usr.sbin/vpsctl/Makefile Wed Oct 23 16:58:04 2013 (r256985) @@ -16,11 +16,17 @@ clean: vpsctl.8.ps vps.conf.5.ps vps.4.ps vps.9.ps mount_vpsfs.8.ps \ vpsctl.8.pdf vps.conf.5.pdf vps.4.pdf vps.9.pdf mount_vpsfs.8.pdf +#mkprivlist: +# cc -Wall -g -o ./mkprivlist ${.CURDIR}/mkprivlist.c +# +#priv_ston.c priv_ntos.c: mkprivlist +# ./mkprivlist ${.CURDIR}/../../sys/sys/priv.h + mkprivlist: - cc -Wall -g -o ./mkprivlist ${.CURDIR}/mkprivlist.c + true priv_ston.c priv_ntos.c: mkprivlist - ./mkprivlist ${.CURDIR}/../../sys/sys/priv.h + ./mkprivlist.sh ${.CURDIR}/../../sys/sys/priv.h vpsctl: priv_ston.c priv_ntos.c cc -Wall -g -I../../sys -I/usr/include -o vpsctl \ Added: projects/vps/usr.sbin/vpsctl/mkprivlist.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/vps/usr.sbin/vpsctl/mkprivlist.sh Wed Oct 23 16:58:04 2013 (r256985) @@ -0,0 +1,78 @@ +#!/bin/sh + +set -e + +if [ "_$1" = "_" ] +then + echo "requires argument: path/to/sys/priv.h" + exit 1 +fi + +SYS_PRIV_H=$1 + +ECHO="printf" + +FILE_NTOS=priv_ntos.c +FILE_STON=priv_ston.c + +rm -f $FILE_NTOS +rm -f $FILE_STON + +${ECHO} "/* AUTOMATICALLY GENERATED FILE */\n" >> $FILE_NTOS +${ECHO} "\n" >> $FILE_NTOS +${ECHO} "#include \n" >> $FILE_NTOS +${ECHO} "\n" >> $FILE_NTOS +${ECHO} "const char * priv_ntos(int priv);\n" >> $FILE_NTOS +${ECHO} "\n" >> $FILE_NTOS +${ECHO} "const char *\n" >> $FILE_NTOS +${ECHO} "priv_ntos(int priv)\n" >> $FILE_NTOS +${ECHO} "{\n" >> $FILE_NTOS +${ECHO} "\n" >> $FILE_NTOS +${ECHO} " switch (priv) {\n" >> $FILE_NTOS + +${ECHO} "/* AUTOMATICALLY GENERATED FILE */\n" >> $FILE_STON +${ECHO} "\n" >> $FILE_STON +${ECHO} "#include \n" >> $FILE_STON +${ECHO} "#include \n" >> $FILE_STON +${ECHO} "\n" >> $FILE_STON +${ECHO} "int priv_ston(const char *str);\n" >> $FILE_STON +${ECHO} "\n" >> $FILE_STON +${ECHO} "int\n" >> $FILE_STON +${ECHO} "priv_ston(const char *str)\n" >> $FILE_STON +${ECHO} "{\n" >> $FILE_STON +${ECHO} "\n" >> $FILE_STON + + +### + +PRIVLIST=$( \ + grep -E '^#define\W+PRIV_.*\W+[0-9]+' ${SYS_PRIV_H} | \ + sed 's/\/\*.*//' | \ + sed -r 's/[ ]+/;/g') + +for PRIV in $PRIVLIST +do + NAME=$(echo ${PRIV} | sed -r 's/[^;]*;([^;]*);([^;]*).*/\1/') + NUMBER=$(echo ${PRIV} | sed -r 's/[^;]*;([^;]*);([^;]*).*/\2/') + + #echo "NAME=[${NAME}] NUMBER=[${NUMBER}]" + + printf " case %s: return (\"%s\");\n" ${NUMBER} ${NAME} \ + >> $FILE_NTOS + + printf " if (strcmp(str, \"%s\") == 0) return (%s);\n" \ + ${NAME} ${NUMBER} >> $FILE_STON +done + +### + +${ECHO} " default: return (\"unknown\");\n" >> $FILE_NTOS +${ECHO} " }\n" >> $FILE_NTOS +${ECHO} "}\n" >> $FILE_NTOS + +${ECHO} " return (0);\n" >> $FILE_STON +${ECHO} "}\n" >> $FILE_STON + +exit 0 + +# EOF From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 16:59:00 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D8A60280; Wed, 23 Oct 2013 16:59:00 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B788A2D97; Wed, 23 Oct 2013 16:59:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NGx02K057938; Wed, 23 Oct 2013 16:59:00 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NGx03d057937; Wed, 23 Oct 2013 16:59:00 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231659.r9NGx03d057937@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 16:59:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256986 - projects/vps/usr.sbin/vpsctl X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 16:59:01 -0000 Author: will Date: Wed Oct 23 16:59:00 2013 New Revision: 256986 URL: http://svnweb.freebsd.org/changeset/base/256986 Log: Sync with svn.7he.at/vps/trunk r188. r188 | klaus | 2013-07-09 07:37:55 -0600 (Tue, 09 Jul 2013) | 4 lines vpsctl: additional rsync flags (preserve extended attributes, hardlinks, ACLs); create vps mountpoint directory when doing ''onersync'', too. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/usr.sbin/vpsctl/vpsctl.c Modified: projects/vps/usr.sbin/vpsctl/vpsctl.c ============================================================================== --- projects/vps/usr.sbin/vpsctl/vpsctl.c Wed Oct 23 16:58:04 2013 (r256985) +++ projects/vps/usr.sbin/vpsctl/vpsctl.c Wed Oct 23 16:59:00 2013 (r256986) @@ -1358,21 +1358,23 @@ vc_migrate(int argc, char **argv) fprintf(stderr, "done\n"); - if (f_onersync == 0) { + /* Always create directories. */ + if (vc.fsroot_priv[0] != '\0') { + /* Create vps' private root directory. */ + snprintf(cmd, sizeof(cmd), "mkdir -p %s\n", vc.fsroot_priv); + write(wfd, cmd, strlen(cmd)); + //len = read(rfd, cmd, sizeof(cmd)); + } + /* Create vps' mountpoint directory. */ + snprintf(cmd, sizeof(cmd), "mkdir -p %s\n", vc.fsroot); + write(wfd, cmd, strlen(cmd)); + //len = read(rfd, cmd, sizeof(cmd)); - fprintf(stderr, "Performing first filesystem sync ... "); + if (f_onersync == 0) { /* Start a first filesystem sync while vps is still running. */ - if (vc.fsroot_priv[0] != '\0') { - /* Create vps' private root directory. */ - snprintf(cmd, sizeof(cmd), "mkdir -p %s\n", vc.fsroot_priv); - write(wfd, cmd, strlen(cmd)); - //len = read(rfd, cmd, sizeof(cmd)); - } - /* Create vps' mountpoint directory. */ - snprintf(cmd, sizeof(cmd), "mkdir -p %s\n", vc.fsroot); - write(wfd, cmd, strlen(cmd)); - //len = read(rfd, cmd, sizeof(cmd)); + + fprintf(stderr, "Performing first filesystem sync ... "); snprintf(cmd, sizeof(cmd), "vpsctl rsyncserver %s/\n", fsroot); write(wfd, cmd, strlen(cmd)); @@ -1608,16 +1610,20 @@ vc_sshtest(int argc, char **argv) * The rsync program that is used here is slightly adapted to allow * write/read from/to its stdin/stdout. */ +/* + * XXX Somehow rsync doesn't work properly with --numeric-ids specified. + */ int vc_rsync(int mode, int rfd, int wfd, char *path) { - char *argv[7]; + char *argv[8]; char str_rsync[] = "/usr/sbin/rsync_vps"; - char str_flagscl[] = "-xae"; + char str_flagscl[] = "-xaHAXe"; char str_dash[] = "-"; char str_server[] = "--server"; - char str_flagssv[] = "-logDtprxe.iLf"; + char str_flagssv[] = "-logDtprxHAXe.iLf"; char str_delete[] = "--delete"; + //char str_numericids[] = "--numeric-ids"; char str_dot[] = "."; int oflags_rfd; int oflags_wfd; @@ -1653,6 +1659,7 @@ vc_rsync(int mode, int rfd, int wfd, cha argv[0] = str_rsync; argv[1] = str_delete; + //argv[2] = str_numericids; argv[2] = str_flagscl; argv[3] = str_dash; argv[4] = path; @@ -1664,6 +1671,7 @@ vc_rsync(int mode, int rfd, int wfd, cha argv[1] = str_server; argv[2] = str_flagssv; argv[3] = str_delete; + //argv[4] = str_numericids; argv[4] = str_dot; argv[5] = path; argv[6] = NULL; From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 17:04:11 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A9954477; Wed, 23 Oct 2013 17:04:11 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9649D2E02; Wed, 23 Oct 2013 17:04:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NH4B5X060936; Wed, 23 Oct 2013 17:04:11 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NH49hs060921; Wed, 23 Oct 2013 17:04:09 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231704.r9NH49hs060921@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 17:04:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256987 - in projects/vps/sys: kern vps X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 17:04:11 -0000 Author: will Date: Wed Oct 23 17:04:09 2013 New Revision: 256987 URL: http://svnweb.freebsd.org/changeset/base/256987 Log: Sync with svn.7he.at/vps/trunk r189. r189 | klaus | 2013-07-12 01:15:07 -0600 (Fri, 12 Jul 2013) | 3 lines Style and other minor changes. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/kern/kern_umtx.c projects/vps/sys/vps/if_vps.c projects/vps/sys/vps/vps.h projects/vps/sys/vps/vps2.h projects/vps/sys/vps/vps_account.c projects/vps/sys/vps/vps_account.h projects/vps/sys/vps/vps_console.c projects/vps/sys/vps/vps_core.c projects/vps/sys/vps/vps_ddb.c projects/vps/sys/vps/vps_dev.c projects/vps/sys/vps/vps_libdump.c projects/vps/sys/vps/vps_pager.c projects/vps/sys/vps/vps_priv.c projects/vps/sys/vps/vps_restore.c projects/vps/sys/vps/vps_snapst.c projects/vps/sys/vps/vps_snapst.h projects/vps/sys/vps/vps_suspend.c projects/vps/sys/vps/vps_user.c projects/vps/sys/vps/vps_user.h Modified: projects/vps/sys/kern/kern_umtx.c ============================================================================== --- projects/vps/sys/kern/kern_umtx.c Wed Oct 23 16:59:00 2013 (r256986) +++ projects/vps/sys/kern/kern_umtx.c Wed Oct 23 17:04:09 2013 (r256987) @@ -50,6 +50,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include #include #include @@ -3778,7 +3780,6 @@ umtx_thread_cleanup(struct thread *td) * VPS stuff */ -int vps_umtx_snapshot(struct thread *td); int vps_umtx_snapshot(struct thread *td) { Modified: projects/vps/sys/vps/if_vps.c ============================================================================== --- projects/vps/sys/vps/if_vps.c Wed Oct 23 16:59:00 2013 (r256986) +++ projects/vps/sys/vps/if_vps.c Wed Oct 23 17:04:09 2013 (r256987) @@ -126,12 +126,6 @@ static int vps_if_clone_match(struct if_ static int vps_if_clone_create(struct if_clone *, char *, size_t, caddr_t); static int vps_if_clone_destroy(struct if_clone *, struct ifnet *); -/* -delete -static struct if_clone vps_if_cloner = IFC_CLONE_INITIALIZER( - IFNAME, NULL, IF_MAXUNIT, - NULL, vps_if_clone_match, vps_if_clone_create, vps_if_clone_destroy); -*/ static struct if_clone *vps_if_cloner; #ifdef VIMAGE static VNET_DEFINE(struct if_clone *, vps_if_cloner); @@ -400,11 +394,15 @@ static struct ifnet * vps_if_get_if_by_addr_v4(const struct sockaddr *dst, struct mbuf *m) { struct vps_if_rtentry *vrt; + struct ifnet *ifp; vrt = vps_if_lookup(dst); if (vrt == NULL) { /* Nothing found, so use the default (first) interface. */ - return ((TAILQ_FIRST(&vps_if_head))->ifp); + mtx_lock(&vps_if_mtx); + ifp = TAILQ_FIRST(&vps_if_head)->ifp; + mtx_unlock(&vps_if_mtx); + return (ifp); } return (vrt->rt_ifp); @@ -433,8 +431,6 @@ vps_if_output(struct ifnet *ifp, struct struct vps_if_softc *sc; int isr; - /* LOCK allvpsif read lock */ - switch (dst->sa_family) { case AF_INET: oifp = vps_if_get_if_by_addr_v4(dst, m); @@ -445,14 +441,12 @@ vps_if_output(struct ifnet *ifp, struct default: DBGIF("%s: af=%d unexpected\n", __func__, dst->sa_family); m_freem(m); - /* LOCK allvpsif read unlock */ return (EAFNOSUPPORT); } if (oifp == NULL) { ifp->if_oerrors++; m_freem(m); - /* LOCK allvpsif read unlock */ return (EHOSTUNREACH); } sc = ifp->if_softc; @@ -465,7 +459,6 @@ vps_if_output(struct ifnet *ifp, struct (oifp->if_flags & IFF_UP) == 0) { ifp->if_oerrors++; m_freem(m); - /* LOCK allvpsif read unlock */ return (EHOSTUNREACH); } @@ -474,7 +467,6 @@ vps_if_output(struct ifnet *ifp, struct DBGIF("%s: LOOP ! oifp == ifp == %p\n", __func__, ifp); ifp->if_oerrors++; m_freem(m); - /* LOCK allvpsif read unlock */ return (EHOSTUNREACH); } @@ -502,7 +494,6 @@ vps_if_output(struct ifnet *ifp, struct } refcount_acquire(&sc->refcount); - /* LOCK allvpsif read unlock */ m->m_pkthdr.rcvif = oifp; KASSERT(m->m_pkthdr.rcvif->if_dname[0] == 'v', ("%s: m->m_pkthdr.rcvif->if_dname = [%s]\n", @@ -519,23 +510,6 @@ vps_if_output(struct ifnet *ifp, struct return (error); } -#ifdef DISABLED__VIMAGE -static void -vps_if_reassign(struct ifnet *ifp, struct vnet *vnet, char *dname) -{ - - if_detach(ifp); - ifp->if_bpf = NULL; - if_reassign_common(ifp, vnet, "eth"); - if (dname) - snprintf(ifp->if_xname, IFNAMSIZ, "%s", dname); - - CURVNET_SET_QUIET(vnet); - if_attach(ifp); - CURVNET_RESTORE(); -} -#endif - static void vps_if_ioctl2(u_long cmd, caddr_t data, struct ifnet *ifp, struct thread *td) @@ -774,14 +748,14 @@ vps_if_clone_create(struct if_clone *ifc { int tmpticks = ticks; - memcpy(&ll[0], &curthread->td_vps, 0); + memcpy(&ll[0], &curthread->td_vps, 4); memcpy(&ll[4], &tmpticks, 4); } ifa = ifp->if_addr; KASSERT(ifa != NULL, ("%s: no lladdr!\n", __func__)); sdl = (struct sockaddr_dl *)ifa->ifa_addr; sdl->sdl_type = IFT_PROPVIRTUAL; - sdl->sdl_alen = sizeof (ll); + sdl->sdl_alen = sizeof(ll); bcopy(&ll, LLADDR(sdl), sdl->sdl_alen); mtx_lock(&vps_if_mtx); @@ -851,10 +825,6 @@ vps_modevent(module_t mod, int type, voi /* For now limit us to one global mutex and one inq. */ mtx_init(&vps_if_mtx, "if_vps", NULL, MTX_DEF); vps_if_inithead(); - /* - delete - if_clone_attach(&vps_if_cloner); - */ #ifndef VIMAGE vps_if_cloner = if_clone_advanced(IFNAME, 0, vps_if_clone_match, vps_if_clone_create, @@ -863,19 +833,10 @@ vps_modevent(module_t mod, int type, voi refcount_init(&vps_if_refcnt, 0); if (bootverbose) printf("%s initialized.\n", IFNAME); -#if 0 - printf("%s: SIOCSIFADDR=%08lx\n", __func__, SIOCSIFADDR); - printf("%s: SIOCDIFADDR=%08lx\n", __func__, SIOCDIFADDR); - printf("%s: SIOCAIFADDR=%08lx\n", __func__, SIOCAIFADDR); -#endif break; case MOD_UNLOAD: if (vps_if_refcnt > 0) return (EBUSY); - /* - delete - if_clone_detach(&vps_if_cloner); - */ #ifndef VIMAGE if_clone_detach(vps_if_cloner); #endif Modified: projects/vps/sys/vps/vps.h ============================================================================== --- projects/vps/sys/vps/vps.h Wed Oct 23 16:59:00 2013 (r256986) +++ projects/vps/sys/vps/vps.h Wed Oct 23 17:04:09 2013 (r256987) @@ -46,8 +46,6 @@ #define TD_TO_VPS(x) (x)->td_ucred->cr_vps #define P_TO_VPS(x) (x)->p_ucred->cr_vps -#define VPSYM(x) curthread->td_vps->_##x - /* * At least for now, just use vnet's facility for virtualized * global variables. Modified: projects/vps/sys/vps/vps2.h ============================================================================== --- projects/vps/sys/vps/vps2.h Wed Oct 23 16:59:00 2013 (r256986) +++ projects/vps/sys/vps/vps2.h Wed Oct 23 17:04:09 2013 (r256987) @@ -54,8 +54,6 @@ struct vps_acc; #define TD_TO_VPS(x) (x)->td_ucred->cr_vps #define P_TO_VPS(x) (x)->p_ucred->cr_vps -#define VPSYM(x) curthread->td_vps->_##x - LIST_HEAD(vps_list_head, vps); extern struct vps_list_head vps_head; @@ -70,84 +68,92 @@ struct vps_ref { #endif #ifdef DIAGNOSTIC + +#define VPSFUNC __attribute__((noinline)) #define DBGCORE if (vps_debug_core) printf extern int vps_debug_core; -#else + +#else /* ! DIAGNOSTIC */ + +#define VPSFUNC #define DBGCORE(x, ...) + #endif /* ! DIAGNOSTIC */ #ifdef VPS /* Keep in sync with ''struct vps2'' declared in vps/vps.h ! */ + struct vps { - struct vnet *vnet; - LIST_ENTRY(vps) vps_all; - LIST_ENTRY(vps) vps_sibling; - LIST_HEAD(, vps) vps_child_head; - struct vps *vps_parent; - - struct sx vps_lock; - char *vps_lock_name; - - u_int vps_id; - char vps_name[MAXHOSTNAMELEN]; - u_char vps_status; + struct vnet *vnet; + + LIST_ENTRY(vps) vps_all; + LIST_ENTRY(vps) vps_sibling; + LIST_HEAD(, vps) vps_child_head; + struct vps *vps_parent; + + struct sx vps_lock; + char *vps_lock_name; + + u_int vps_id; + char vps_name[MAXHOSTNAMELEN]; + u_char vps_status; - u_int vps_refcnt; - struct mtx vps_refcnt_lock; + u_int vps_refcnt; + struct mtx vps_refcnt_lock; #ifdef INVARIANTS TAILQ_HEAD(, vps_ref) vps_ref_head; #endif - /* - struct task vps_task; - */ - struct timeout_task vps_task; + struct timeout_task vps_task; - u_char priv_allow_set[PRIV_SET_SIZE]; - u_char priv_impl_set[PRIV_SET_SIZE]; + u_char priv_allow_set[PRIV_SET_SIZE]; + u_char priv_impl_set[PRIV_SET_SIZE]; - struct vps_arg_ip4 *vps_ip4; - struct vps_arg_ip6 *vps_ip6; - u_int16_t vps_ip4_cnt; - u_int16_t vps_ip6_cnt; + struct vps_arg_ip4 *vps_ip4; + struct vps_arg_ip6 *vps_ip6; + u_int16_t vps_ip4_cnt; + u_int16_t vps_ip6_cnt; - u_int vps_flags; + u_int vps_flags; - int restore_count; + int restore_count; - int64_t suspend_time; + int64_t suspend_time; - struct vps_acc *vps_acc; /* XXX do inline */ + struct vps_acc *vps_acc; /* XXX do inline */ - struct vnode *consolelog; - int consolelog_refcnt; - struct tty *console_tty; - struct file *console_fp_ma; - int console_flags; + struct vnode *consolelog; + struct tty *console_tty; + struct file *console_fp_ma; + int consolelog_refcnt; + int console_flags; - struct ucred *vps_ucred; + struct ucred *vps_ucred; - struct devfs_rule *devfs_ruleset; + struct devfs_rule *devfs_ruleset; - struct vnode *_rootvnode; - char _rootpath[MAXPATHLEN]; + struct vnode *_rootvnode; + char _rootpath[MAXPATHLEN]; }; -#define VPS_F_REBOOT 0x00000200 - struct vps_snapst_ctx; struct vps_dev_ctx { - LIST_ENTRY(vps_dev_ctx) list; - struct file *fp; - struct thread *td; - caddr_t data; - size_t length; - u_long cmd; - struct vps_snapst_ctx *snapst; + LIST_ENTRY(vps_dev_ctx) list; + struct file *fp; + struct thread *td; + caddr_t data; + size_t length; + u_long cmd; + struct vps_snapst_ctx *snapst; }; +struct devfs_mount; +struct cdev; +struct cdev_priv; +struct mount; + struct vps *vps_by_name(struct vps *, char *); struct vps *vps_alloc(struct vps *, struct vps_param *, char *, int *errorval); @@ -156,11 +162,7 @@ int vps_free_locked(struct vps *); int vps_destroy(struct vps *); void vps_ref(struct vps *, struct ucred *); void vps_deref(struct vps *, struct ucred *); -struct devfs_mount; -struct cdev; -struct cdev_priv; -struct mount; -int vps_canseemount (struct ucred *, struct mount *); +int vps_canseemount(struct ucred *, struct mount *); int vps_devfs_ruleset_create(struct vps *vps); int vps_devfs_ruleset_destroy(struct vps *vps); @@ -214,15 +216,16 @@ int vps_ioc_fscalcpath(struct vps *, str int vps_ioc_getconsfd(struct vps *, struct vps_dev_ctx *, u_long, caddr_t, int, struct thread *); -void vps_priv_setdefault(struct vps *, struct vps_param *); -int vps_priv_check(struct ucred *, int); +struct in_addr; +struct in6_addr; struct vps_arg_item; + +void vps_priv_setdefault(struct vps *, struct vps_param *); int vps_priv_setitem(struct vps *, struct vps *, struct vps_arg_item *); int vps_priv_getitemall(struct vps *, struct vps *, caddr_t, size_t *); int vps_ip_setitem(struct vps *, struct vps *, struct vps_arg_item *); int vps_ip_getitemall(struct vps *, struct vps *, caddr_t, size_t *); -struct in_addr; -struct in6_addr; +int vps_priv_check(struct ucred *, int); int vps_ip4_check(struct vps *, struct in_addr *, struct in_addr *); int vps_ip6_check(struct vps *, struct in6_addr *, u_int8_t); @@ -235,22 +238,28 @@ int vps_console_getfd(struct vps *, stru int vps_unmount_all(struct vps *vps); +int vps_umtx_snapshot(struct thread *td); + /* machdep stuff */ struct vps_dump_thread; struct execve_args; void vps_md_print_thread(struct thread *td); void vps_md_print_pcb(struct thread *td); int vps_md_snapshot_thread(struct vps_dump_thread *vdtd, struct thread *td); -int vps_md_restore_thread(struct vps_dump_thread *vdtd, struct thread *ntd, struct proc *p); +int vps_md_restore_thread(struct vps_dump_thread *vdtd, struct thread *ntd, + struct proc *p); int vps_md_snapshot_sysentvec(struct sysentvec *sv, long *svtype); int vps_md_restore_sysentvec(long svtype, struct sysentvec **sv); int vps_md_restore_checkarch(u_int8_t ptrsize, u_int8_t byteorder); -int vps_md_snapshot_thread_savefpu(struct vps_snapst_ctx *ctx, struct vps *vps, struct thread *td); -int vps_md_restore_thread_savefpu(struct vps_snapst_ctx *ctx, struct vps *vps, struct thread *td); +int vps_md_snapshot_thread_savefpu(struct vps_snapst_ctx *ctx, + struct vps *vps, struct thread *td); +int vps_md_restore_thread_savefpu(struct vps_snapst_ctx *ctx, + struct vps *vps, struct thread *td); int vps_md_reboot_copyout(struct thread *td, struct execve_args *); int vps_md_syscall_fixup(struct vps *, struct thread *, register_t *ret_code, register_t **ret_args, int *narg); -int vps_md_syscall_fixup_setup_inthread(struct vps *, struct thread *, register_t); +int vps_md_syscall_fixup_setup_inthread(struct vps *, struct thread *, + register_t); extern struct sx vps_all_lock; Modified: projects/vps/sys/vps/vps_account.c ============================================================================== --- projects/vps/sys/vps/vps_account.c Wed Oct 23 16:59:00 2013 (r256986) +++ projects/vps/sys/vps/vps_account.c Wed Oct 23 17:04:09 2013 (r256987) @@ -106,35 +106,27 @@ SYSCTL_INT(_debug, OID_AUTO, vps_account SYSCTL_NODE(, OID_AUTO, vps, CTLFLAG_RD, NULL, "Virtual Private Systems"); SYSCTL_NODE(_vps, OID_AUTO, acc, CTLFLAG_RD, NULL, "Limits and Accounting"); -/* -static VPS_DEFINE(size_t, acc_kmem) = 0; -#define V_acc_kmem VPS(acc_kmem) - -SYSCTL_VPS_UINT(_vps_acc, OID_AUTO, kmem, CTLFLAG_RD, - &VPS_NAME(acc_kmem), 0, ""); -*/ - /* Interval between calls to vps_account_threads() in microseconds. */ /* XXX determine a good default value */ static u_int vps_account_threads_interval = 100*1000; SYSCTL_UINT(_vps_acc, OID_AUTO, account_threads_interval, CTLFLAG_RW, - &vps_account_threads_interval, 0, - "Interval for thread accounting in microseconds"); + &vps_account_threads_interval, 0, + "Interval for thread accounting in microseconds"); -struct mtx vps_pfault_mtx; -struct rqhead vps_paused_threads_head; +struct mtx vps_pfault_mtx; +struct rqhead vps_paused_threads_head; -static u_int vps_account_suspensions; -static u_int vps_account_failedsuspensions; -struct sx vps_account_threads_sx; -struct mtx vps_account_pausedqueue_mtx; -struct task vps_account_threads_task; -static struct proc *vps_account_kproc_p; -static int vps_account_exit; - -static fixpt_t vps_account_cpu_idlepct; -static u_long vps_account_cpu_last; -static long vps_account_cpu_updated; +static u_int vps_account_suspensions; +static u_int vps_account_failedsuspensions; +struct sx vps_account_threads_sx; +struct mtx vps_account_pausedqueue_mtx; +struct task vps_account_threads_task; +static struct proc *vps_account_kproc_p; +static int vps_account_exit; + +static fixpt_t vps_account_cpu_idlepct; +static u_long vps_account_cpu_last; +static long vps_account_cpu_updated; static int _vps_account2(struct vps *, int, int, size_t); static void vps_account_check_threads(void); @@ -142,10 +134,6 @@ static void vps_account_thread_resume(st void vps_account_threads2(void *, int); void vps_account_kproc(void *); -/* -int (*vpsfs_calcusage_path_p)(const char *, struct vpsfs_limits *) = NULL; -*/ - int vps_account_init(void) { @@ -180,11 +168,6 @@ vps_account_init(void) return (0); } -/* -SYSINIT(vps_account, SI_SUB_RUN_SCHEDULER, SI_ORDER_ANY, - vps_account_init, NULL); -*/ - int vps_account_uninit(void) { @@ -280,11 +263,7 @@ _vps_account2(struct vps *vps, int type, case VPS_ACC_PROCS: val = &vps->vps_acc->procs; break; - /* not handled here - case VPS_ACC_PCTCPU: - val = &vps->vps_acc->pctcpu; - break; - */ + /* not handled here: VPS_ACC_PCTCPU: */ default: printf("%s: unkown type %d\n", __func__, type); return (ENOENT); @@ -293,13 +272,6 @@ _vps_account2(struct vps *vps, int type, mtx_lock_spin(&vps->vps_acc->lock); - /* - if (vps != vps0 && type==VPS_ACC_PHYS) - DBGACC("%s: pid=%d type=%d %zu %s %zu\n", - __func__, curthread->td_proc->p_pid, type, - val->cur, action==VPS_ACC_ALLOC ? "+" : "-", size); - */ - error = 0; switch (action) { @@ -339,16 +311,6 @@ _vps_account2(struct vps *vps, int type, break; } - /* - if (type == VPS_ACC_VIRT && vps != vps0) { - DBGACC("%s: VPS_ACC_VIRT: %s %lx --> %lx\n", - __func__, - action == VPS_ACC_ALLOC ? "ALLOC" : "FREE", - size, - val->cur); - } - */ - if (error == 0) val->updated = ticks; @@ -628,8 +590,8 @@ vps_account_threads(void *dummy) } PROC_UNLOCK(p); } - //sx_sunlock(&vps->_proctree_lock); sx_sunlock(&VPS_VPS(vps, allproc_lock)); + //sx_sunlock(&vps->_proctree_lock); mtx_lock_spin(&vps->vps_acc->lock); @@ -696,7 +658,7 @@ _vps_account_thread_pause(struct thread by thread_lock */ TAILQ_INSERT_TAIL(&vps_paused_threads_head, td, td_runq); mtx_unlock_spin(&vps_account_pausedqueue_mtx); - //DBGACC("%s: paused thread=%p/%d\n", __func__, td, td->td_tid); + /*DBGACC("%s: paused thread=%p/%d\n", __func__, td, td->td_tid);*/ } static void @@ -710,7 +672,7 @@ vps_account_thread_resume(struct thread mtx_unlock_spin(&vps_account_pausedqueue_mtx); sched_add(td, SRQ_BORING); - //DBGACC("%s: resumed thread=%p/%d\n", __func__, td, td->td_tid); + /*DBGACC("%s: resumed thread=%p/%d\n", __func__, td, td->td_tid);*/ } @@ -827,14 +789,6 @@ _vps_account_stats(struct vps *vps) printf("%s: vps=%p\n", __func__, vps); printf("%s: virt=%zu\n", __func__, va->virt.cur); printf("%s: phys=%zu\n", __func__, va->phys.cur); - /* - printf("%s: kmem=%zu (0-kmem=%zu)\n", __func__, - va->kmem.cur, 0 - va->kmem.cur); - printf("%s: kernel=%zu (0-kernel=%zu)\n", __func__, - va->kernel.cur, 0 - va->kernel.cur); - printf("%s: buffer=%zu (0-buffer=%zu)\n", __func__, - va->buffer.cur, 0 - va->buffer.cur); - */ printf("%s: pctcpu=%zu\n", __func__, va->pctcpu.cur); printf("%s: blockio=%zu\n", __func__, va->blockio.cur); printf("%s: threads=%zu\n", __func__, va->threads.cur); @@ -920,26 +874,24 @@ _vps_limit_setitem(struct vps *vpsp, str (x)->u.limit.hits_hard = (y)->hits_hard; \ } while (0); +#define ACC_ITEM_CNT 6 + int _vps_limit_getitemall(struct vps *vpsp, struct vps *vps, caddr_t kdata, size_t *kdatalen) { struct vps_arg_item *item; - int cnt; if (vps->vps_acc == NULL) { *kdatalen = 0; return (0); } - /* !!! */ - cnt = 6; - - if ((sizeof (*item) * cnt) > *kdatalen) + if ((sizeof(*item) * ACC_ITEM_CNT) > *kdatalen) return (ENOSPC); item = (struct vps_arg_item *)kdata; - memset(item, 0, sizeof (*item) * cnt); + memset(item, 0, sizeof (*item) * ACC_ITEM_CNT); mtx_lock_spin(&vps->vps_acc->lock); @@ -947,14 +899,6 @@ _vps_limit_getitemall(struct vps *vpsp, item++; FILL(item, &vps->vps_acc->phys, VPS_ACC_PHYS); item++; - /* - FILL(item, &vps->vps_acc->kmem, VPS_ACC_KMEM); - item++; - FILL(item, &vps->vps_acc->kernel, VPS_ACC_KERNEL); - item++; - FILL(item, &vps->vps_acc->buffer, VPS_ACC_BUFFER); - item++; - */ FILL(item, &vps->vps_acc->pctcpu, VPS_ACC_PCTCPU); item++; FILL(item, &vps->vps_acc->blockio, VPS_ACC_BLOCKIO); @@ -966,7 +910,8 @@ _vps_limit_getitemall(struct vps *vpsp, mtx_unlock_spin(&vps->vps_acc->lock); - *kdatalen = sizeof (*item) * cnt; + *kdatalen = sizeof (*item) * ACC_ITEM_CNT; + return (0); } @@ -1000,8 +945,8 @@ vps_account_print_pctcpu(struct vps *vps } PROC_UNLOCK(p); } - //sx_sunlock(&vps->_proctree_lock); sx_sunlock(&VPS_VPS(vps, allproc_lock)); + //sx_sunlock(&vps->_proctree_lock); printf("%s: vps=%p [%s] threads=%d vpstot=%u\n", __func__, vps, vps->vps_name, threads, vpstot); Modified: projects/vps/sys/vps/vps_account.h ============================================================================== --- projects/vps/sys/vps/vps_account.h Wed Oct 23 16:59:00 2013 (r256986) +++ projects/vps/sys/vps/vps_account.h Wed Oct 23 17:04:09 2013 (r256987) @@ -61,20 +61,27 @@ struct vps; struct mount; struct vps_acc_val { + /* Current accounting value (counter or rate). */ size_t cur; + /* For rate calculation. */ size_t cnt_cur; + /* Preconfigured soft limit (a warning is emitted when limit is hit). */ size_t soft; + /* Preconfigured hard limit (allocation is denied and error returned where possible). */ size_t hard; + /* Counter of exceeding the soft limit. */ u_int16_t hits_soft; + /* Counter of attempts exceeding the hard limit. */ u_int16_t hits_hard; + /* Last updated (ticks) */ int updated; }; Modified: projects/vps/sys/vps/vps_console.c ============================================================================== --- projects/vps/sys/vps/vps_console.c Wed Oct 23 16:59:00 2013 (r256986) +++ projects/vps/sys/vps/vps_console.c Wed Oct 23 17:04:09 2013 (r256987) @@ -76,19 +76,20 @@ static const char vpsid[] = MALLOC_DECLARE(M_VPS_CORE); -static struct mtx vps_console_mtx; -static struct proc *vps_console_kproc_p = NULL; -static int vps_console_exit = 0; -static void vps_console_kproc(void *); -static void *vps_console_readbuf; -static size_t vps_console_readbuf_len; +static struct mtx vps_console_mtx; +static struct proc *vps_console_kproc_p = NULL; +static int vps_console_exit = 0; +static void *vps_console_readbuf; +static size_t vps_console_readbuf_len; -static th_getc_capture_t vps_console_getc_capture; +static th_getc_capture_t vps_console_getc_capture; static struct ttyhook vps_console_hook = { .th_getc_capture = vps_console_getc_capture, }; +static void vps_console_kproc(void *); + /* * VPS pseudo system console. * @@ -318,8 +319,8 @@ vps_console_alloc(struct vps *vps, struc struct file *fp_ma; struct tty *tp; int error; -//#ifdef DIAGNOSTIC_2 #if 1 + /* Additional debugging. */ struct ucred *saveucred; struct ucred *dbgucred; @@ -392,7 +393,7 @@ vps_console_alloc(struct vps *vps, struc /* Will be deleted automatically on delete of parent device. */ make_dev_alias_cred(dev, vps_ucred, "ttyv0"); - //DBGCORE("%s: tty=%p dev=%p (slave device)\n", __func__, tp, dev); + DBGCORE("%s: tty=%p dev=%p (slave device)\n", __func__, tp, dev); dev_lock(); dev->si_usecount++; @@ -413,8 +414,8 @@ vps_console_alloc(struct vps *vps, struc } tty_unlock(tp); -//#ifdef DIAGNOSTIC_2 #if 1 + /* Additional debugging. */ td->td_ucred = saveucred; crfree(dbgucred); @@ -488,6 +489,7 @@ vps_console_free(struct vps *vps, struct int vps_console_getfd(struct vps *vps, struct thread *td, int *retfd) { + struct vps *vps2; struct file *fp; int fd; int error; @@ -495,14 +497,16 @@ vps_console_getfd(struct vps *vps, struc DBGCORE("%s: td=%p vps=%p\n", __func__, td, vps); /* - * XXX make sure vps is a child of td->td_vps ! - * - if (td->td_vps != vps) { - DBGCORE("%s: td->td_vps=%p vps=%p\n", - __func__, td->td_vps, vps); + * Make sure vps is a child of td->td_vps. + */ + LIST_FOREACH(vps2, &td->td_vps->vps_child_head, vps_sibling) + if (vps == vps2) + break; + if (vps != vps2) { + DBGCORE("%s: vps=%p is not a child of td->td_vps=%p\n", + __func__, vps, td->td_vps); return (EPERM); } - */ fp = vps->console_fp_ma; Modified: projects/vps/sys/vps/vps_core.c ============================================================================== --- projects/vps/sys/vps/vps_core.c Wed Oct 23 16:59:00 2013 (r256986) +++ projects/vps/sys/vps/vps_core.c Wed Oct 23 17:04:09 2013 (r256987) @@ -1610,14 +1610,6 @@ vps_reboot(struct thread *td, int howto) } sx_sunlock(&V_allproc_lock); -#if 0 - /* No effect. */ - vps->vps_flags |= VPS_F_REBOOT; - - /* Broadcast kill. */ - vps_proc_signal(vps, -1, SIGKILL); -#endif - while ((V_nprocs - V_nprocs_zomb) > 1) { /* Sleep. */ pause("vpsbot", hz / 10); @@ -1636,10 +1628,9 @@ vps_reboot(struct thread *td, int howto) if ( ! reboot ) { /* * When the last proc has exited, - * exit1() calls vps_destroy(). + * exit1() schedules vps_destroy(). * XXX not yet ! */ - //vps->f_destroy = 1; return (error); } Modified: projects/vps/sys/vps/vps_ddb.c ============================================================================== --- projects/vps/sys/vps/vps_ddb.c Wed Oct 23 16:59:00 2013 (r256986) +++ projects/vps/sys/vps/vps_ddb.c Wed Oct 23 17:04:09 2013 (r256987) @@ -73,10 +73,6 @@ static const char * vps_statusstr(int status) { switch (status) { - /* - case VPS_ST_INITISDYING: - return ("init_is_dying"); - */ case VPS_ST_CREATING: return ("creating"); case VPS_ST_RUNNING: Modified: projects/vps/sys/vps/vps_dev.c ============================================================================== --- projects/vps/sys/vps/vps_dev.c Wed Oct 23 16:59:00 2013 (r256986) +++ projects/vps/sys/vps/vps_dev.c Wed Oct 23 17:04:09 2013 (r256987) @@ -79,26 +79,24 @@ SYSCTL_INT(_debug, OID_AUTO, vps_dev_deb #endif /* DIAGNOSTIC */ -static int vps_dev_refcnt = 0; - -static caddr_t vps_dev_emptypage; - -static struct cdev *vps_dev_p; -static d_fdopen_t vps_dev_fdopen; -static d_open_t vps_dev_open; -static d_close_t vps_dev_close; -static d_ioctl_t vps_dev_ioctl; -static d_mmap_t vps_dev_mmap; +static int vps_dev_refcnt = 0; +static caddr_t vps_dev_emptypage; +static struct cdev *vps_dev_p; +static d_fdopen_t vps_dev_fdopen; +static d_open_t vps_dev_open; +static d_close_t vps_dev_close; +static d_ioctl_t vps_dev_ioctl; +static d_mmap_t vps_dev_mmap; static struct cdevsw vps_dev_cdevsw = { - .d_version = D_VERSION, - .d_name = "vps control device", - .d_fdopen = vps_dev_fdopen, - .d_open = vps_dev_open, - .d_close = vps_dev_close, - .d_ioctl = vps_dev_ioctl, - .d_mmap = vps_dev_mmap, - .d_flags = D_TRACKCLOSE, + .d_version = D_VERSION, + .d_name = "vps control device", + .d_fdopen = vps_dev_fdopen, + .d_open = vps_dev_open, + .d_close = vps_dev_close, + .d_ioctl = vps_dev_ioctl, + .d_mmap = vps_dev_mmap, + .d_flags = D_TRACKCLOSE, }; LIST_HEAD(vps_dev_ctx_le, vps_dev_ctx) vps_dev_ctx_head; @@ -173,7 +171,7 @@ vps_dev_get_ctx(struct thread *td) struct vps_dev_ctx *ctx; if (jailed(td->td_ucred)) { - printf("%s: td is jailed --> denying any vps-device " + DBGCORE("%s: td is jailed --> denying any vps-device " "action !\n", __func__); return (NULL); } @@ -185,7 +183,7 @@ vps_dev_get_ctx(struct thread *td) return (ctx); } - printf("%s: ######## dev_ctx not found for td=%p td->td_fpop=%p " + DBGDEV("%s: ######## dev_ctx not found for td=%p td->td_fpop=%p " "pid=%d\n", __func__, td, td->td_fpop, td->td_proc->p_pid); return (NULL); @@ -198,7 +196,7 @@ vps_dev_fdopen(struct cdev *dev, int ffl struct vps_dev_ctx *ctx; if (jailed(td->td_ucred)) { - printf("%s: td is jailed --> denying any vps-device " + DBGDEV("%s: td is jailed --> denying any vps-device " "action !\n", __func__); return (EPERM); } @@ -232,10 +230,8 @@ vps_dev_close(struct cdev *dev, int flag DBGDEV("%s: ctx=%p\n", __func__, ctx); - if (ctx == NULL) { - printf("%s: ctx == NULL !\n", __func__); + if (ctx == NULL) return (0); - } LIST_REMOVE(ctx, list); @@ -264,10 +260,8 @@ vps_dev_ioctl(struct cdev *dev, u_long c int error; ctx = vps_dev_get_ctx(td); - if (ctx == NULL) { - printf("%s: ctx == NULL !\n", __func__); + if (ctx == NULL) return (EBADF); - } /* Needed for conext lookup in mmap pager function. */ ctx->td = td; @@ -344,7 +338,7 @@ vps_dev_ioctl(struct cdev *dev, u_long c return (error); } -__attribute__((noinline)) +VPSFUNC static int vps_dev_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, int nprot, vm_memattr_t *memattr) @@ -353,10 +347,6 @@ vps_dev_mmap(struct cdev *dev, vm_ooffse struct vps *vps; int error; - /* td->td_fpop is not set here. - ctx = vps_dev_get_ctx(curthread); - */ - ctx = NULL; LIST_FOREACH(ctx2, &vps_dev_ctx_head, list) if (ctx2->td == curthread) { @@ -370,28 +360,26 @@ vps_dev_mmap(struct cdev *dev, vm_ooffse * Better return an empty page than let the * user cause a kernel panic. */ - printf("%s: ctx == NULL !\n", __func__); + DBGDEV("%s: ctx == NULL !\n", __func__); goto invalid; } if (ctx->data == NULL && ctx->cmd != VPS_IOC_SNAPST) { - printf("%s: ctx->data == NULL !\n", __func__); + DBGDEV("%s: ctx->data == NULL !\n", __func__); goto invalid; } error = 0; vps = TD_TO_VPS(curthread); - /* XXX assert vps != NULL */ - if (offset < 0) { - printf("%s: offset=%zu < 0\n", + DBGDEV("%s: offset=%zu < 0\n", __func__, (size_t)offset); goto invalid; } if (nprot != PROT_READ) { - printf("%s: nprot=%d != PROT_READ\n", + DBGDEV("%s: nprot=%d != PROT_READ\n", __func__, nprot); goto invalid; } @@ -400,7 +388,7 @@ vps_dev_mmap(struct cdev *dev, vm_ooffse /* VPS_IOC_LIST */ if (offset > ctx->length) { - printf("%s: offset=%zu > ctx->length=%zu\n", + DBGDEV("%s: offset=%zu > ctx->length=%zu\n", __func__, (size_t)offset, ctx->length); goto invalid; } Modified: projects/vps/sys/vps/vps_libdump.c ============================================================================== --- projects/vps/sys/vps/vps_libdump.c Wed Oct 23 16:59:00 2013 (r256986) +++ projects/vps/sys/vps/vps_libdump.c Wed Oct 23 17:04:09 2013 (r256987) @@ -199,7 +199,6 @@ struct vps_snapst_ctx; #include -/* XXX remove again from declarations */ static void __vps_dumpobj_printtree(struct vps_snapst_ctx *ctx, struct vps_dumpobj *o); @@ -208,7 +207,8 @@ static void __vps_dumpobj_printtree(stru int test01(void); int checkfile(const char *); -int main(int argc, char **argv, char **envv) +int +main(int argc, char **argv, char **envv) { int error; @@ -231,7 +231,8 @@ int main(int argc, char **argv, char **e (sizeof(struct s) % 8) ? "NOT 64bit aligned" : "ok" \ ); -int structsizes(void) +int +structsizes(void) { PRINT_STRUCT_SIZE(vps_dump_sysinfo); @@ -292,7 +293,8 @@ int structsizes(void) return (0); } -int checkfile(const char *path) +int +checkfile(const char *path) { int fd; int size; @@ -334,7 +336,8 @@ int checkfile(const char *path) return (0); } -int test01(void) +int +test01(void) { void *data; long size; @@ -439,7 +442,7 @@ int test01(void) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 17:10:46 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C022970E; Wed, 23 Oct 2013 17:10:46 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AD1CB2E63; Wed, 23 Oct 2013 17:10:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NHAkhr062560; Wed, 23 Oct 2013 17:10:46 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NHAjgj062554; Wed, 23 Oct 2013 17:10:45 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231710.r9NHAjgj062554@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 17:10:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256989 - in projects/vps/sys: kern vps X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 17:10:46 -0000 Author: will Date: Wed Oct 23 17:10:45 2013 New Revision: 256989 URL: http://svnweb.freebsd.org/changeset/base/256989 Log: Sync with svn.7he.at/vps/trunk r190. r190 | klaus | 2013-07-15 09:36:26 -0600 (Mon, 15 Jul 2013) | 5 lines Some cleanup and style changes; Incremental filedesc restore; Changes to dump library. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/kern/kern_event.c projects/vps/sys/vps/vps_int.h projects/vps/sys/vps/vps_libdump.c projects/vps/sys/vps/vps_libdump.h projects/vps/sys/vps/vps_restore.c projects/vps/sys/vps/vps_snapst.c Modified: projects/vps/sys/kern/kern_event.c ============================================================================== --- projects/vps/sys/kern/kern_event.c Wed Oct 23 17:08:50 2013 (r256988) +++ projects/vps/sys/kern/kern_event.c Wed Oct 23 17:10:45 2013 (r256989) @@ -93,8 +93,8 @@ static int kevent_copyout(void *arg, str static int kevent_copyin(void *arg, struct kevent *kevp, int count); /* XXX static*/ int kqueue_register(struct kqueue *kq, struct kevent *kev, struct thread *td, int waitok); -static int kqueue_acquire(struct file *fp, struct kqueue **kqp); -static void kqueue_release(struct kqueue *kq, int locked); +/* XXX static*/ int kqueue_acquire(struct file *fp, struct kqueue **kqp); +/* XXX static*/ void kqueue_release(struct kqueue *kq, int locked); static int kqueue_expand(struct kqueue *kq, struct filterops *fops, uintptr_t ident, int waitok); static void kqueue_task(void *arg, int pending); @@ -1155,7 +1155,7 @@ done: return (error); } -static int +/* XXX static*/ int kqueue_acquire(struct file *fp, struct kqueue **kqp) { int error; @@ -1178,7 +1178,7 @@ kqueue_acquire(struct file *fp, struct k return error; } -static void +/* XXX static*/ void kqueue_release(struct kqueue *kq, int locked) { if (locked) Modified: projects/vps/sys/vps/vps_int.h ============================================================================== --- projects/vps/sys/vps/vps_int.h Wed Oct 23 17:08:50 2013 (r256988) +++ projects/vps/sys/vps/vps_int.h Wed Oct 23 17:10:45 2013 (r256989) @@ -59,8 +59,12 @@ void (*vps_dumpobj_discard)(struct vps struct vps_dumpobj *o); int (*vps_dumpobj_checkobj)(struct vps_snapst_ctx *ctx, struct vps_dumpobj *o); +void (*vps_dumpobj_setcur)(struct vps_snapst_ctx *ctx, + struct vps_dumpobj *o); struct vps_dumpobj * (*vps_dumpobj_next)(struct vps_snapst_ctx *ctx); struct vps_dumpobj * (*vps_dumpobj_prev)(struct vps_snapst_ctx *ctx); +struct vps_dumpobj * (*vps_dumpobj_peek)(struct vps_snapst_ctx *ctx); +struct vps_dumpobj * (*vps_dumpobj_getcur)(struct vps_snapst_ctx *ctx); int (*vps_dumpobj_typeofnext)(struct vps_snapst_ctx *ctx); int (*vps_dumpobj_nextischild)(struct vps_snapst_ctx @@ -168,8 +172,11 @@ extern struct vps_functions *vps_func; #define vdo_close vps_func->vps_dumpobj_close #define vdo_discard vps_func->vps_dumpobj_discard #define vdo_checkobj vps_func->vps_dumpobj_checkobj +#define vdo_setcur vps_func->vps_dumpobj_setcur #define vdo_next vps_func->vps_dumpobj_next #define vdo_prev vps_func->vps_dumpobj_prev +#define vdo_peek vps_func->vps_dumpobj_peek +#define vdo_getcur vps_func->vps_dumpobj_getcur #define vdo_typeofnext vps_func->vps_dumpobj_typeofnext #define vdo_nextischild vps_func->vps_dumpobj_nextischild #define vdo_recurse vps_func->vps_dumpobj_recurse Modified: projects/vps/sys/vps/vps_libdump.c ============================================================================== --- projects/vps/sys/vps/vps_libdump.c Wed Oct 23 17:08:50 2013 (r256988) +++ projects/vps/sys/vps/vps_libdump.c Wed Oct 23 17:10:45 2013 (r256989) @@ -161,8 +161,11 @@ int vps_dumpobj_append(struct vps_snapst void vps_dumpobj_close(struct vps_snapst_ctx *ctx); void vps_dumpobj_discard(struct vps_snapst_ctx *ctx, struct vps_dumpobj *o); int vps_dumpobj_checkobj(struct vps_snapst_ctx *ctx, struct vps_dumpobj *o); +void vps_dumpobj_setcur(struct vps_snapst_ctx *ctx, struct vps_dumpobj *o); struct vps_dumpobj *vps_dumpobj_next(struct vps_snapst_ctx *ctx); struct vps_dumpobj *vps_dumpobj_prev(struct vps_snapst_ctx *ctx); +struct vps_dumpobj *vps_dumpobj_peek(struct vps_snapst_ctx *ctx); +struct vps_dumpobj *vps_dumpobj_getcur(struct vps_snapst_ctx *ctx); int vps_dumpobj_typeofnext(struct vps_snapst_ctx *ctx); int vps_dumpobj_nextischild(struct vps_snapst_ctx *ctx, struct vps_dumpobj *op); @@ -487,6 +490,7 @@ vps_dumpobj_create(struct vps_snapst_ctx o->type = type; o->level = ++ctx->level; o->size = sizeof(*o); + o->prio = 0; o->next = ctx->cpos; o->parent = ctx->curobj; if (ctx->elements == 0) { @@ -701,6 +705,35 @@ vps_dumpobj_typeofnext(struct vps_snapst return (o->type); } +struct vps_dumpobj * +vps_dumpobj_peek(struct vps_snapst_ctx *ctx) +{ + struct vps_dumpobj *o; + + if (ctx->relative) + return (0); + + /* Assumes that the current object has been validated. */ + o = ctx->curobj->next; + if (o == ctx->rootobj) + return (0); + + if (vps_dumpobj_checkobj(ctx, o)) + return (0); + + return (o); +} + +struct vps_dumpobj * +vps_dumpobj_getcur(struct vps_snapst_ctx *ctx) +{ + + if (ctx->relative) + return (NULL); + + return (ctx->curobj); +} + int vps_dumpobj_nextischild(struct vps_snapst_ctx *ctx, struct vps_dumpobj *op) { @@ -733,6 +766,7 @@ vps_dumpobj_nextischild(struct vps_snaps struct vps_dumpobj * vps_dumpobj_prev(struct vps_snapst_ctx *ctx) { + if (ctx->relative) return (NULL); @@ -745,6 +779,22 @@ vps_dumpobj_prev(struct vps_snapst_ctx * return (ctx->curobj); } +void +vps_dumpobj_setcur(struct vps_snapst_ctx *ctx, struct vps_dumpobj *o) +{ + + if (ctx->relative) + return; + + /* XXX + if (vps_dumpobj_checkobj(ctx, o)) + */ + + ctx->curobj = o; + + /* NOTE: ctx->lastobj is invalid now */ +} + /* Check a single object for sanity. */ int vps_dumpobj_checkobj(struct vps_snapst_ctx *ctx, struct vps_dumpobj *o) @@ -1217,10 +1267,16 @@ vps_libdump_modevent(module_t mod, int t vps_dumpobj_discard; vps_func->vps_dumpobj_checkobj = vps_dumpobj_checkobj; + vps_func->vps_dumpobj_setcur = + vps_dumpobj_setcur; vps_func->vps_dumpobj_next = vps_dumpobj_next; vps_func->vps_dumpobj_prev = vps_dumpobj_prev; + vps_func->vps_dumpobj_peek = + vps_dumpobj_peek; + vps_func->vps_dumpobj_getcur = + vps_dumpobj_getcur; vps_func->vps_dumpobj_typeofnext = vps_dumpobj_typeofnext; vps_func->vps_dumpobj_nextischild = @@ -1251,8 +1307,11 @@ vps_libdump_modevent(module_t mod, int t vps_func->vps_dumpobj_close = NULL; vps_func->vps_dumpobj_discard = NULL; vps_func->vps_dumpobj_checkobj = NULL; + vps_func->vps_dumpobj_setcur = NULL; vps_func->vps_dumpobj_next = NULL; vps_func->vps_dumpobj_prev = NULL; + vps_func->vps_dumpobj_peek = NULL; + vps_func->vps_dumpobj_getcur = NULL; vps_func->vps_dumpobj_typeofnext = NULL; vps_func->vps_dumpobj_nextischild = NULL; vps_func->vps_dumpobj_recurse = NULL; Modified: projects/vps/sys/vps/vps_libdump.h ============================================================================== --- projects/vps/sys/vps/vps_libdump.h Wed Oct 23 17:08:50 2013 (r256988) +++ projects/vps/sys/vps/vps_libdump.h Wed Oct 23 17:10:45 2013 (r256989) @@ -60,8 +60,11 @@ int vps_dumpobj_append(struct vps_snapst void vps_dumpobj_close(struct vps_snapst_ctx *ctx); void vps_dumpobj_discard(struct vps_snapst_ctx *ctx, struct vps_dumpobj *o); int vps_dumpobj_checkobj(struct vps_snapst_ctx *ctx, struct vps_dumpobj *o); +void vps_dumpobj_setcur(struct vps_snapst_ctx *ctx, struct vps_dumpobj *o); struct vps_dumpobj *vps_dumpobj_next(struct vps_snapst_ctx *ctx); struct vps_dumpobj *vps_dumpobj_prev(struct vps_snapst_ctx *ctx); +struct vps_dumpobj *vps_dumpobj_peek(struct vps_snapst_ctx *ctx); +struct vps_dumpobj *vps_dumpobj_getcur(struct vps_snapst_ctx *ctx); int vps_dumpobj_typeofnext(struct vps_snapst_ctx *ctx); int vps_dumpobj_nextischild(struct vps_snapst_ctx *ctx, struct vps_dumpobj *op); @@ -128,7 +131,7 @@ void vps_libdump_printheader(struct vps_ #define VPS_DUMPOBJT_UCRED 120 #define VPS_DUMPH_MAGIC 0xc0debabe -#define VPS_DUMPH_VERSION 0x20130709 +#define VPS_DUMPH_VERSION 0x20130715 #define VPS_DUMPH_MSB 12 #define VPS_DUMPH_LSB 21 #define VPS_DUMPH_32BIT 32 @@ -233,7 +236,8 @@ struct vps_dumpobj { uint16 type; uint16 level; /* level this object is in */ uint32 size; /* size of this object including it's header */ - uint32 pad0; + sint16 prio; /* priority; 0 == any */ + uint16 pad0; PTR(parent); /* offset to parent object (from start of snapshot) */ PTR(next); /* offset to next object (from start of Modified: projects/vps/sys/vps/vps_restore.c ============================================================================== --- projects/vps/sys/vps/vps_restore.c Wed Oct 23 17:08:50 2013 (r256988) +++ projects/vps/sys/vps/vps_restore.c Wed Oct 23 17:10:45 2013 (r256989) @@ -179,7 +179,7 @@ static int vps_restore_mod_refcnt; * * * * * Restore functions. * * * * */ -static struct ucred * vps_restore_ucred_lookup(struct vps_snapst_ctx *ctx, +static struct ucred *vps_restore_ucred_lookup(struct vps_snapst_ctx *ctx, struct vps *vps, void *orig_ptr); VPSFUNC @@ -206,9 +206,12 @@ vps_restore_ucred(struct vps_snapst_ctx if ((ncr = vps_restore_ucred_lookup(ctx, vps, vdcr->cr_origptr)) != NULL) { - /* XXX debugging */ + /* debugging panic("%s: double restore, orig_ptr=%p !\n", __func__, vdcr->cr_origptr); + */ + DBGR("%s: double restore, orig_ptr=%p !\n", + __func__, vdcr->cr_origptr); /* Already restored. */ crfree(ncr); return (0); @@ -232,8 +235,13 @@ vps_restore_ucred(struct vps_snapst_ctx ncr->cr_uidinfo = uifind(vdcr->cr_uid); ncr->cr_ruidinfo = uifind(vdcr->cr_ruid); - /* XXX check that vdcr->cr_groups is big enough - (start of next object) */ + if ((caddr_t)vdcr->cr_groups + + (sizeof(vdcr->cr_groups[0]) * vdcr->cr_ngroups) > + (caddr_t)o1 + o1->size) { + ERRMSG(ctx, "%s: vdcr->cr_groups smaller than specified by " + "vdcr->cr_ngroups=%d\n", __func__, vdcr->cr_ngroups); + return (EINVAL); + } tmp_groups = malloc(sizeof(tmp_groups[0]) * vdcr->cr_ngroups, M_TEMP, M_WAITOK); for (i = 0; i < vdcr->cr_ngroups; i++) @@ -354,7 +362,7 @@ vps_restore_ucred_lookup(struct vps_snap if (ncr != NULL) { DBGR("%s: found ucred %p for %p, ncr->ref=%d\n", - __func__, ncr, orig_ptr, ncr->cr_ref+1); + __func__, ncr, orig_ptr, ncr->cr_ref+1); crhold(ncr); return (ncr); } else { @@ -462,7 +470,7 @@ vps_restore_vnet_route_one(struct vps_sn flags, &rt_entry, vdr->rt_fibnum); if (error) ERRMSG(ctx, "%s: rtrequest_fib: error=%d\n", - __func__, error); + __func__, error); CURVNET_RESTORE(); @@ -512,8 +520,6 @@ vps_restore_vnet_route(struct vps_snapst vnet, o2, rnh, fibnum, af))) goto out; } - - /* Next. */ } out: @@ -607,7 +613,8 @@ vps_restore_iface_ifaddr(struct vps_snap vdsaddr += 1; } - DBGR("%s: AF_INET: [%s] [%08x] [%08x] [%08x]\n", + DBGR("%s: AF_INET: if_name=[%s] addr=[%08x] " + "dst=[%08x] mask=[%08x]\n", __func__, in_alreq->ifra_name, in_alreq->ifra_addr.sin_addr.s_addr, in_alreq->ifra_dstaddr.sin_addr.s_addr, @@ -633,7 +640,6 @@ vps_restore_iface_ifaddr(struct vps_snap break; case AF_INET6: - DBGR("%s: AF_INET6\n", __func__); saddr_offset = offsetof(struct sockaddr_in6, sin6_port); @@ -642,7 +648,7 @@ vps_restore_iface_ifaddr(struct vps_snap memcpy(in6_alreq->ifra_name, ifp->if_xname, sizeof(in6_alreq->ifra_name)); - DBGR("%s: in6_aliasreq @ %p\n\tifra_name=[%s]\n", + DBGR("%s: AF_INET6 in6_aliasreq @ %p\n\tifra_name=[%s]\n", __func__, in6_alreq, in6_alreq->ifra_name); if (vdifaddr->have_addr && vdsaddr->sa_len == @@ -733,8 +739,8 @@ vps_restore_iface_ifaddr(struct vps_snap break; default: - DBGR("%s: unhandled address family %d\n", - __func__, vdsaddr->sa_family); + ERRMSG(ctx, "%s: unhandled address family %d\n", + __func__, vdsaddr->sa_family); error = EINVAL; goto out; } @@ -816,15 +822,16 @@ vps_restore_vnet_iface(struct vps_snapst ERRMSG(ctx, "%s: if_clone_create " "returned error = %d\n", __func__, error); - goto next_iface; + goto out; } nifnetp = ifunit(ifname); } if (nifnetp == NULL) { - DBGR("%s: ifunit ([%s]) == NULL !\n", - __func__, ifname); - goto next_iface; + ERRMSG(ctx, "%s: ifunit ([%s]) == NULL !\n", + __func__, ifname); + error = EINVAL; + goto out; } if (last_was_epair == 0) { @@ -835,7 +842,6 @@ vps_restore_vnet_iface(struct vps_snapst ERRMSG(ctx, "%s: if_vps_vmove() " "error = %d\n", __func__, error); - //goto next_iface; goto out; } if (strcmp(vdifnet->if_dname, "epair") == 0) @@ -860,10 +866,6 @@ vps_restore_vnet_iface(struct vps_snapst /* Next ifaddr. */ } - - next_iface: - /* Next iface. */ - ; } out: @@ -883,7 +885,7 @@ vps_restore_vnet(struct vps_snapst_ctx * o1 = vdo_next(ctx); if (o1->type != VPS_DUMPOBJT_VNET) { DBGR("%s: o1=%p o1->type=%d\n", - __func__, o1, o1->type); + __func__, o1, o1->type); error = EINVAL; goto out; } @@ -905,7 +907,7 @@ vps_restore_vnet(struct vps_snapst_ctx * if ((error = vps_restore_vnet_route(ctx, vps, nvnet))) goto out; - out: + out: if (error) *vnetp = NULL; return (error); @@ -930,7 +932,7 @@ vps_restore_sysentvec(struct vps_snapst_ if (vps_md_restore_sysentvec(vds->sv_type, &sv) != 0) { ERRMSG(ctx, "%s: unknown sysentvec type: %d\n", - __func__, vds->sv_type); + __func__, vds->sv_type); return (EINVAL); } @@ -939,17 +941,11 @@ vps_restore_sysentvec(struct vps_snapst_ return (0); } -#define KQ_LOCK(kq) do { \ - mtx_lock(&(kq)->kq_lock); \ -} while (0) - -#define KQ_UNLOCK(kq) do { \ - mtx_unlock(&(kq)->kq_lock); \ -} while (0) - -int -kqueue_register(struct kqueue *kq, struct kevent *kev, struct thread *td, - int waitok); +/* XXX */ +int kqueue_register(struct kqueue *kq, struct kevent *kev, + struct thread *td, int waitok); +int kqueue_acquire(struct file *fp, struct kqueue **kqp); +void kqueue_release(struct kqueue *kq, int locked); VPSFUNC static int @@ -958,11 +954,13 @@ vps_restore_kqueue(struct vps_snapst_ctx { struct vps_dumpobj *o1, *o2; struct vps_dump_knote *vdkn; + //struct filedesc *cfd; struct kevent *nkev; struct kqueue *kq; struct thread *td; struct file *fp; int error; + //int kq_fd; int dfl; o1 = vdo_next(ctx); @@ -976,15 +974,52 @@ vps_restore_kqueue(struct vps_snapst_ctx if ((error = sys_kqueue(td, NULL))) { ERRMSG(ctx, "%s: sys_kqueue(): %d\n", - __func__, error); + __func__, error); return (error); } fget(td, td->td_retval[0], 0, &fp); - kq = fp->f_data; + DBGR("%s: kqueue installed at fd %ld\n", + __func__, td->td_retval[0]); +#if 0 +// rubbish ... delete + DBGR("%s: fp=%p fp->f_data=%p fp->f_type=%d\n", + __func__, fp, fp->f_data, fp->f_type); - KQ_LOCK(kq); - kq->kq_refcnt++; - KQ_UNLOCK(kq); + KASSERT(td->td_retval[0] == 0, ("%s: fd != 0\n", __func__)); + + if (vdo_typeofnext(ctx) != VPS_DUMPOBJT_KNOTE) + return (0); + + o2 = vdo_next(ctx); + vdkn = (struct vps_dump_knote *)o2->data; + kq_fd = vdkn->ke_ident; + vdo_prev(ctx); + + /* Temporarily move kqueue fd to match vdkn->ke_ident. */ + cfd = td->td_proc->p_fd; + FILEDESC_XLOCK(cfd); + /* fdisused() is static + KASSERT(fdisused(cfd, kq_fd) == 0, + ("%s: fdisused(cfd, kq_fd) != 0\n", __func__)); + */ + fdused(cfd, kq_fd); + cfd->fd_ofiles[kq_fd].fde_file = cfd->fd_ofiles[0].fde_file; + cfd->fd_ofiles[kq_fd].fde_flags = cfd->fd_ofiles[0].fde_flags; + cfd->fd_ofiles[kq_fd].fde_rights = cfd->fd_ofiles[0].fde_rights; + cfd->fd_ofiles[0].fde_file = NULL; + cfd->fd_ofiles[0].fde_flags = 0; + cfd->fd_ofiles[0].fde_rights = 0; + fdunused(cfd, 0); + FILEDESC_XUNLOCK(cfd); + td->td_retval[0] = kq_fd; +#endif + + kq = NULL; + if ((error = kqueue_acquire(fp, &kq)) != 0) { + ERRMSG(ctx, "%s: kqueue_acquire(): error=%d\n", + __func__, error); + goto out; + } while (vdo_typeofnext(ctx) == VPS_DUMPOBJT_KNOTE) { @@ -1014,7 +1049,7 @@ vps_restore_kqueue(struct vps_snapst_ctx if (dfl & KN_DISABLED) nkev->flags |= EV_DISABLE; - // XXX ?! kevp->flags &= ~EV_SYSFLAGS; + /* XXX ?! kevp->flags &= ~EV_SYSFLAGS; */ DBGR("kevent: ident = 0x%016zx\n", (size_t)nkev->ident); DBGR("kevent: filter = 0x%04hx\n", nkev->filter); @@ -1025,9 +1060,12 @@ vps_restore_kqueue(struct vps_snapst_ctx (long unsigned int)nkev->udata); error = kqueue_register(kq, nkev, td, 1); - if (error) - ERRMSG(ctx, "%s: kqueue_register: %d\n", - __func__, error); + if (error) { + ERRMSG(ctx, "%s: kqueue_register(): error=%d\n", + __func__, error); + free(nkev, M_TEMP); + goto out; + } free(nkev, M_TEMP); @@ -1038,21 +1076,14 @@ vps_restore_kqueue(struct vps_snapst_ctx //knote_enqueue() */ - /* Next */ - //vdo2 = (struct vps_dumpobj *)ctx->cpos; - ; } -// out2: - KQ_LOCK(kq); - kq->kq_refcnt--; - if (kq->kq_refcnt == 1) - wakeup(&kq->kq_refcnt); - KQ_UNLOCK(kq); -// out1: + out: + if (kq != NULL) + kqueue_release(kq, 0); fdrop(fp, td); - return (0); + return (error); } /* @@ -1104,7 +1135,6 @@ vps_restore_pipe(struct vps_snapst_ctx * * in another run. */ - /* XXX CAP_ */ fget(curthread, filedes[0], 0, &fp); npp = (struct pipepair *) ((struct pipe *)fp->f_data)->pipe_pair; @@ -1116,10 +1146,8 @@ vps_restore_pipe(struct vps_snapst_ctx * ro->orig_ptr = vdp->pi_pair; ro->new_ptr = npp; /* These references have to be released later. */ - /* XXX CAP_ */ fget(curthread, filedes[0], 0, &fp); ro->spare[0] = fp; - /* XXX CAP_ */ fget(curthread, filedes[1], 0, &fp); ro->spare[1] = fp; SLIST_INSERT_HEAD(&ctx->obj_list, ro, list); @@ -1127,13 +1155,11 @@ vps_restore_pipe(struct vps_snapst_ctx * if (vdp->pi_localend == vdp->pi_rpipe) { /* We want the read endpoint. */ - /* XXX CAP_ */ fget(curthread, filedes[0], 0, &fp); fp->f_data = &npp->pp_rpipe; fdrop(fp, curthread); /* Close the write endpoint. */ - /* XXX CAP_ */ fget(curthread, filedes[1], 0, &fp); fdclose(curthread->td_proc->p_fd, fp, filedes[1], curthread); @@ -1144,13 +1170,11 @@ vps_restore_pipe(struct vps_snapst_ctx * } else if (vdp->pi_localend == vdp->pi_wpipe) { /* We want the write endpoint. */ - /* XXX CAP_ */ fget(curthread, filedes[1], 0, &fp); fp->f_data = &npp->pp_wpipe; fdrop(fp, curthread); /* Close the read endpoint. */ - /* XXX CAP_ */ fget(curthread, filedes[0], 0, &fp); fdclose(curthread->td_proc->p_fd, fp, filedes[0], curthread); @@ -1159,9 +1183,9 @@ vps_restore_pipe(struct vps_snapst_ctx * curthread->td_retval[0] = filedes[1]; } else { - DBGR("%s: vdp->pi_localend != vdp->pi_rpipe && " - "vdp->pi_localend != vdp->pi_wpipe\n", - __func__); + ERRMSG(ctx, "%s: vdp->pi_localend != vdp->pi_rpipe " + "&& vdp->pi_localend != vdp->pi_wpipe\n", + __func__); /* XXX Clean up. */ error = EINVAL; goto out; @@ -1221,7 +1245,7 @@ vps_restore_pipe(struct vps_snapst_ctx * curthread->td_retval[0] = filedes[0]; } - out: + out: return (error); } @@ -1232,8 +1256,6 @@ vps_restore_cleanup_pipe(struct vps_snap { struct vps_restore_obj *obj, *obj2; - /* XXX Is it safe to fdrop() in different vps context ? */ - SLIST_FOREACH_SAFE(obj, obj_list, list, obj2) { if (obj->type != VPS_DUMPOBJT_PIPE) continue; @@ -1294,6 +1316,7 @@ vps_sbcheck(struct sockbuf *sb) mbcnt, sb->sb_mbcnt); panic("sbcheck"); */ + /* debugging */ printf("cc %ld != %u || mbcnt %ld != %u\n", len, sb->sb_cc, mbcnt, sb->sb_mbcnt); kdb_enter(KDB_WHY_BREAK, "VPS break to debugger"); @@ -1350,7 +1373,9 @@ vps_restore_mbufchain(struct vps_snapst_ if (vdmb->mb_have_data==1) nm->m_data = nm->m_dat + vdmb->mb_data_off; - //vps_print_ascii(nm->m_dat, nm->m_len); + /* + vps_print_ascii(nm->m_dat, nm->m_len); + */ } else if (vdmb->mb_have_ext==1) { @@ -1372,7 +1397,7 @@ vps_restore_mbufchain(struct vps_snapst_ */ /* checksum */ - { + if (1) { int sum = 0, i; for (i = 0; i < nm->m_ext.ext_size; i++) @@ -1381,14 +1406,14 @@ vps_restore_mbufchain(struct vps_snapst_ "original checksum=%08x\n", __func__, sum, vdmb->mb_checksum); if (sum != vdmb->mb_checksum) { - DBGR("%s: checksum failure !\n", - __func__); + ERRMSG(ctx, "%s: checksum " + "failure !\n", __func__); return (-1); } } } else { - DBGR("%s: DON'T KNOW HOW TO HANDLE MBUF\n", + ERRMSG(ctx, "%s: DON'T KNOW HOW TO HANDLE MBUF\n", __func__); DBGR("%s: vdmb->mb_have_dat=%d " "vdmb->mb_have_ext=%d\n", @@ -1480,7 +1505,7 @@ vps_restore_sockbuf(struct vps_snapst_ct mptrs[4] = NULL; DBGR("%s: mptrs[]: 0=%p 1=%p 2=%p 3=%p\n", - __func__, mptrs[0], mptrs[1], mptrs[2], mptrs[3]); + __func__, mptrs[0], mptrs[1], mptrs[2], mptrs[3]); if (vdo_typeofnext(ctx) == VPS_DUMPOBJT_MBUFCHAIN) rc = vps_restore_mbufchain(ctx, vps, mptrs); @@ -1494,7 +1519,7 @@ vps_restore_sockbuf(struct vps_snapst_ct } DBGR("%s: mptrs[]: 0=%p 1=%p 2=%p 3=%p\n", - __func__, mptrs[0], mptrs[1], mptrs[2], mptrs[3]); + __func__, mptrs[0], mptrs[1], mptrs[2], mptrs[3]); nsb->sb_mb = mptrs[0]; nsb->sb_mbtail = mptrs[1]; @@ -1513,7 +1538,7 @@ vps_restore_sockbuf(struct vps_snapst_ct nsb->sb_hiwat = vdsb->sb_hiwat; nsb->sb_timeo = vdsb->sb_timeo; nsb->sb_flags = vdsb->sb_flags; - /* + /* XXX nsb->sb_upcall = vdsb->sb_upcall; nsb->sb_upcallarg = vdsb->sb_upcallarg; */ @@ -1560,13 +1585,10 @@ vps_restore_fixup_unixsockets(struct vps } if (srvso_new == NULL) { - DBGR("%s: srvso_new == NULL for srvso_old=%p\n", - __func__, srvso_old); - /* + ERRMSG(ctx, "%s: srvso_new == NULL for " + "srvso_old=%p\n", __func__, srvso_old); error = EINVAL; break; - */ - continue; } cltunp = sotounpcb((struct socket *)obj1->new_ptr); @@ -1640,7 +1662,7 @@ vps_restore_socket(struct vps_snapst_ctx cpos += sizeof(*vds); if (vdo_typeofnext(ctx) == VPS_DUMPOBJT_UCRED) { - vdo_next(ctx);//vps_restore_ucred(ctx, vps); + vdo_next(ctx); /* XXX don't put child objects in the middle of data ! */ cpos = ctx->cpos; } @@ -1648,7 +1670,7 @@ vps_restore_socket(struct vps_snapst_ctx curthread->td_ucred = ncr; DBGR("%s: family=%d protocol=%d type=%d\n", - __func__, vds->so_family, vds->so_protocol, vds->so_type); + __func__, vds->so_family, vds->so_protocol, vds->so_type); sockargs.domain = vds->so_family; sockargs.type = vds->so_type; @@ -1955,12 +1977,6 @@ vps_restore_socket(struct vps_snapst_ctx if (vdinpcb->inp_have_ppcb != 0) { - /* - * XXX For now panic, otherwise we never know - * if this case can happen. - * Later just return EINVAL, user might - * made up rubbish. - */ KASSERT(ninpcb->inp_ppcb != NULL, ("%s: ninpcb->inp_ppcb == NULL", __func__)); if (ninpcb->inp_ppcb == NULL) { @@ -2040,7 +2056,7 @@ vps_restore_socket(struct vps_snapst_ctx default: ERRMSG(ctx, "%s: unhandled protocol family %d\n", - __func__, vds->so_family); + __func__, vds->so_family); error = EINVAL; goto out_unlock; break; @@ -2058,7 +2074,7 @@ vps_restore_socket(struct vps_snapst_ctx * in curthread->td_retval[0]. */ - out_unlock: + out_unlock: SOCKBUF_UNLOCK(&nso->so_snd); SOCKBUF_UNLOCK(&nso->so_rcv); @@ -2067,7 +2083,7 @@ vps_restore_socket(struct vps_snapst_ctx fdrop(fp, curthread); - out: + out: if (error) { /* XXX destroy socket. */ @@ -2080,8 +2096,6 @@ vps_restore_socket(struct vps_snapst_ctx crfree(ncr); CURVNET_RESTORE(); - //ctx->cpos = (caddr_t)o1->data + o1->size; - /* Sockets that were on the accept queue of this socket. */ if (vds->so_qlen > 0 || vds->so_incqlen > 0) { DBGR("%s: so_qlen=%d so_incqlen=%d\n", @@ -2091,7 +2105,7 @@ vps_restore_socket(struct vps_snapst_ctx cfd = curthread->td_proc->p_fd; for (i = 0; i < (vds->so_qlen + vds->so_incqlen); i++) { - //o2 = (struct vps_dumpobj *)ctx->cpos; + if ((error = vps_restore_socket(ctx, vps, p))) return (error); /* @@ -2225,7 +2239,7 @@ vps_restore_file_vnode(struct vps_snapst /* Returning new fd index in curthread->td_retval[0]. */ - out: + out: return (error); } @@ -2260,7 +2274,7 @@ vps_restore_file_pts(struct vps_snapst_c vdp = (struct vps_dump_pts *)o1->data; if (vdo_typeofnext(ctx) == VPS_DUMPOBJT_UCRED) - vdo_next(ctx);//vps_restore_ucred(ctx, vps); + vdo_next(ctx); o2 = vdo_next(ctx); if (o2->type != VPS_DUMPOBJT_FILE_PATH) { @@ -2295,7 +2309,7 @@ vps_restore_file_pts(struct vps_snapst_c if (found == 0) { ERRMSG(ctx, "%s: pts [%s] not found !\n", - __func__, vdfp->fp_path); + __func__, vdfp->fp_path); error = EINVAL; goto out; } @@ -2315,7 +2329,7 @@ vps_restore_file_pts(struct vps_snapst_c free(termiosp, M_TEMP); if (error) ERRMSG(ctx, "%s: ttydev_ioctl() error=%d\n", - __func__, error); + __func__, error); ttyp->t_pgrp = (void*)(size_t)vdp->pt_pgrp_id; /* ID */ psc = tty_softc(ttyp); psc->pts_flags = vdp->pt_flags; @@ -2333,7 +2347,7 @@ vps_restore_file_pts(struct vps_snapst_c ro->new_ptr = ttyp; SLIST_INSERT_HEAD(&ctx->obj_list, ro, list); - out: + out: return (error); } @@ -2371,20 +2385,29 @@ vps_restore_file_kqueue(struct vps_snaps FILEDESC_XUNLOCK(nfd); FILEDESC_XLOCK(cfd); +#if 0 +//delete /* XXX idx = fd_first_free(cfd, 0, 100); XXX */ idx = 10; fdgrowtable(cfd, idx); +#endif + /* fdalloc() calls fdused() for the new descriptor. */ + if ((error = fdalloc(curtd, 0, &idx))) { + ERRMSG(ctx, "%s: fdalloc(): %d\n", __func__, error); + fdrop(nfp, curtd); + FILEDESC_XUNLOCK(cfd); + goto out; + } cfd->fd_ofiles[idx].fde_file = nfp; cfd->fd_ofiles[idx].fde_flags = tmpflags; fdrop(nfp, curtd); - fdused(cfd, idx); FILEDESC_XUNLOCK(cfd); curtd->td_retval[0] = idx; - out: + out: return (error); } @@ -2429,8 +2452,8 @@ vps_restore_file(struct vps_snapst_ctx * ncr = NULL; DBGR("%s: index= origidx= origptr=%p type=%d flag=%08x offset=%d\n", - __func__, /*vdf->index, vdf->orig_index, */vdf->orig_ptr, - vdf->f_type, vdf->f_flag, (int)vdf->f_offset); + __func__, vdf->orig_ptr, vdf->f_type, vdf->f_flag, + (int)vdf->f_offset); /* Lookup in list of restored file objects. */ SLIST_FOREACH(ro, &ctx->obj_list, list) @@ -2452,7 +2475,7 @@ vps_restore_file(struct vps_snapst_ctx * } if (vdo_typeofnext(ctx) == VPS_DUMPOBJT_UCRED) { - vdo_next(ctx);//vps_restore_ucred(ctx, vps); + vdo_next(ctx); } ncr = vps_restore_ucred_lookup(ctx, vps, vdf->f_cred); save_ucred = curtd->td_ucred; @@ -2531,10 +2554,7 @@ vps_restore_file(struct vps_snapst_ctx * FILEDESC_XUNLOCK(cfd); fhold(nfp); - /* Skip for pseudo ttys for now. - if (strncmp((char *)o2->data, "/dev/pts/", strlen("/dev/pts/"))) - */ - nfp->f_offset = vdf->f_offset; + nfp->f_offset = vdf->f_offset; fdrop(nfp, curtd); /* Restore f_flag XXX */ @@ -2550,7 +2570,7 @@ vps_restore_file(struct vps_snapst_ctx * SLIST_INSERT_HEAD(&ctx->obj_list, ro, list); fdrop(nfp, curtd); - out: + out: curtd->td_vps = save_vps; curtd->td_proc->p_fd->fd_rdir = save_rdir; curtd->td_proc->p_fd->fd_cdir = save_cdir; @@ -2565,20 +2585,81 @@ vps_restore_file(struct vps_snapst_ctx * VPSFUNC static int +vps_restore_fdset_linkup(struct vps_snapst_ctx *ctx, struct vps *vps, + struct vps_dump_filedesc *vdfd, struct proc *p, char is_final) +{ + struct vps_restore_obj *ro; + struct filedesc *nfd; + struct file *nfp; + int i; + int error = 0; + + nfd = p->p_fd; + + /* Now all files should exist, so link them into fdset. */ + for (i = 0; i < vdfd->fd_nfiles; i++) { + + DBGR("%s: vdfd->fd_entries[%d].fp = %p\n", + __func__, i, vdfd->fd_entries[i].fp); + if (vdfd->fd_entries[i].fp == NULL) + continue; + + /* Look if already restored in a previous run. */ + if (i <= nfd->fd_nfiles && + nfd->fd_ofiles[i].fde_file != NULL) + continue; + + /* Lookup in list of restored file objects. */ + SLIST_FOREACH(ro, &ctx->obj_list, list) + if (ro->type == VPS_DUMPOBJT_FILE && + ro->orig_ptr == vdfd->fd_entries[i].fp) + break; + + /* Only return error if this is the final run. */ + if (is_final != 0 && ro == NULL) { + ERRMSG(ctx, "%s: can't find file fp=%p\n", + __func__, vdfd->fd_entries[i].fp); + error = EINVAL; + goto out; + } else if (ro == NULL) { + continue; + } + nfp = (struct file *)ro->new_ptr; + fhold(nfp); + + FILEDESC_XLOCK(nfd); + if (i >= nfd->fd_nfiles) + fdgrowtable(nfd, i); + nfd->fd_ofiles[i].fde_file = nfp; + nfd->fd_ofiles[i].fde_flags = vdfd->fd_entries[i].flags; + nfd->fd_ofiles[i].fde_rights = vdfd->fd_entries[i].rights; + fdused(nfd, i); + FILEDESC_XUNLOCK(nfd); + + DBGR("%s: linked up fp: idx=%d new=%p orig=%p\n", + __func__, i, ro->new_ptr, ro->orig_ptr); + } + + out: + return (error); +} + +VPSFUNC +static int vps_restore_fdset(struct vps_snapst_ctx *ctx, struct vps *vps, struct proc *p, struct filedesc *orig_fdp) { struct vps_dumpobj *o1; + struct vps_dumpobj *o2; + struct vps_dumpobj *o3; struct vps_dump_filedesc *vdfd; struct vps_restore_obj *ro; struct filedesc *nfd, *cfd; - struct file *nfp; struct vps *save_vps; struct ucred *save_ucred; struct vnode *save_rdir; struct vnode *save_cdir; int error = 0; - int i; if (vdo_typeofnext(ctx) != VPS_DUMPOBJT_FDSET) { /* Lookup in list of restored file objects. */ @@ -2587,13 +2668,13 @@ vps_restore_fdset(struct vps_snapst_ctx ro->orig_ptr == orig_fdp) break; if (ro == NULL) { - DBGR("%s: fdset orig_ptr=%p not found !\n", + ERRMSG(ctx, "%s: fdset orig_ptr=%p not found !\n", __func__, orig_fdp); return (EINVAL); } p->p_fd = fdshare(ro->new_ptr); DBGR("%s: linked shared fdset %p (orig %p) to proc %p/%d\n", - __func__, p->p_fd, orig_fdp, p, p->p_pid); + __func__, p->p_fd, orig_fdp, p, p->p_pid); return (0); } @@ -2637,47 +2718,45 @@ vps_restore_fdset(struct vps_snapst_ctx curthread->td_proc->p_fd->fd_rdir = p->p_fd->fd_rdir; curthread->td_proc->p_fd->fd_cdir = p->p_fd->fd_cdir; + /* + * First only restore file objects with priority >= 0, + * then the ones with priority < 0. + */ + + o2 = vdo_getcur(ctx); + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 17:11:53 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3C13180D; Wed, 23 Oct 2013 17:11:53 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 28BE72E6D; Wed, 23 Oct 2013 17:11:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NHBrD1064436; Wed, 23 Oct 2013 17:11:53 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NHBq5a064434; Wed, 23 Oct 2013 17:11:52 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231711.r9NHBq5a064434@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 17:11:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256990 - in projects/vps/sys: cddl/compat/opensolaris/kern vps X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 17:11:53 -0000 Author: will Date: Wed Oct 23 17:11:52 2013 New Revision: 256990 URL: http://svnweb.freebsd.org/changeset/base/256990 Log: Sync with svn.7he.at/vps/trunk r191. r191 | klaus | 2013-07-16 04:52:13 -0600 (Tue, 16 Jul 2013) | 4 lines Some more cleanup/style; fixed crash when opensolaris.ko loaded by boot loader. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c projects/vps/sys/vps/vps_restore.c Modified: projects/vps/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c ============================================================================== --- projects/vps/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c Wed Oct 23 17:10:45 2013 (r256989) +++ projects/vps/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c Wed Oct 23 17:11:52 2013 (r256990) @@ -50,5 +50,5 @@ opensolaris_utsname_init(void *arg) utsname.release = osrelease; snprintf(utsname.version, sizeof(utsname.version), "%d", osreldate); } -SYSINIT(opensolaris_utsname_init, SI_SUB_TUNABLES, SI_ORDER_ANY, +SYSINIT(opensolaris_utsname_init, SI_SUB_OPENSOLARIS, SI_ORDER_ANY, opensolaris_utsname_init, NULL); Modified: projects/vps/sys/vps/vps_restore.c ============================================================================== --- projects/vps/sys/vps/vps_restore.c Wed Oct 23 17:10:45 2013 (r256989) +++ projects/vps/sys/vps/vps_restore.c Wed Oct 23 17:11:52 2013 (r256990) @@ -954,13 +954,11 @@ vps_restore_kqueue(struct vps_snapst_ctx { struct vps_dumpobj *o1, *o2; struct vps_dump_knote *vdkn; - //struct filedesc *cfd; struct kevent *nkev; struct kqueue *kq; struct thread *td; struct file *fp; int error; - //int kq_fd; int dfl; o1 = vdo_next(ctx); @@ -980,39 +978,6 @@ vps_restore_kqueue(struct vps_snapst_ctx fget(td, td->td_retval[0], 0, &fp); DBGR("%s: kqueue installed at fd %ld\n", __func__, td->td_retval[0]); -#if 0 -// rubbish ... delete - DBGR("%s: fp=%p fp->f_data=%p fp->f_type=%d\n", - __func__, fp, fp->f_data, fp->f_type); - - KASSERT(td->td_retval[0] == 0, ("%s: fd != 0\n", __func__)); - - if (vdo_typeofnext(ctx) != VPS_DUMPOBJT_KNOTE) - return (0); - - o2 = vdo_next(ctx); - vdkn = (struct vps_dump_knote *)o2->data; - kq_fd = vdkn->ke_ident; - vdo_prev(ctx); - - /* Temporarily move kqueue fd to match vdkn->ke_ident. */ - cfd = td->td_proc->p_fd; - FILEDESC_XLOCK(cfd); - /* fdisused() is static - KASSERT(fdisused(cfd, kq_fd) == 0, - ("%s: fdisused(cfd, kq_fd) != 0\n", __func__)); - */ - fdused(cfd, kq_fd); - cfd->fd_ofiles[kq_fd].fde_file = cfd->fd_ofiles[0].fde_file; - cfd->fd_ofiles[kq_fd].fde_flags = cfd->fd_ofiles[0].fde_flags; - cfd->fd_ofiles[kq_fd].fde_rights = cfd->fd_ofiles[0].fde_rights; - cfd->fd_ofiles[0].fde_file = NULL; - cfd->fd_ofiles[0].fde_flags = 0; - cfd->fd_ofiles[0].fde_rights = 0; - fdunused(cfd, 0); - FILEDESC_XUNLOCK(cfd); - td->td_retval[0] = kq_fd; -#endif kq = NULL; if ((error = kqueue_acquire(fp, &kq)) != 0) { @@ -2266,7 +2231,7 @@ vps_restore_file_pts(struct vps_snapst_c o1 = vdo_next(ctx); if (o1->type != VPS_DUMPOBJT_PTS) { ERRMSG(ctx, "%s: DTYPE_PTS without VPS_DUMPOBJT_PTS\n", - __func__); + __func__); error = EINVAL; goto out; } @@ -2362,7 +2327,6 @@ vps_restore_file_kqueue(struct vps_snaps int idx; int error = 0; - /* XXX kqueue has to be last (after all other fds) */ if ((error = vps_restore_kqueue(ctx, vps, p))) { ERRMSG(ctx, "%s: vps_restore_kqueue() error: %d\n", __func__, error); @@ -2385,15 +2349,6 @@ vps_restore_file_kqueue(struct vps_snaps FILEDESC_XUNLOCK(nfd); FILEDESC_XLOCK(cfd); -#if 0 -//delete - /* XXX - idx = fd_first_free(cfd, 0, 100); - XXX - */ - idx = 10; - fdgrowtable(cfd, idx); -#endif /* fdalloc() calls fdused() for the new descriptor. */ if ((error = fdalloc(curtd, 0, &idx))) { ERRMSG(ctx, "%s: fdalloc(): %d\n", __func__, error); @@ -2721,6 +2676,8 @@ vps_restore_fdset(struct vps_snapst_ctx /* * First only restore file objects with priority >= 0, * then the ones with priority < 0. + * This is necessary because kqueue has to be restored + * after all other file descriptors. */ o2 = vdo_getcur(ctx); @@ -2935,7 +2892,7 @@ vps_restore_vmobject(struct vps_snapst_c o2 = vdo_next(ctx); if (o2->type != VPS_DUMPOBJT_FILE_PATH) { ERRMSG(ctx, "%s: wrong object, expected " - "VPS_DUMPOBJT_FILE_PATH\n", __func__); + "VPS_DUMPOBJT_FILE_PATH\n", __func__); error = EINVAL; goto out; } @@ -2945,13 +2902,13 @@ vps_restore_vmobject(struct vps_snapst_c vdfp->fp_path, curthread); if ((error = namei(&nd))) { ERRMSG(ctx, "%s: namei([%s]): error = %d\n", - __func__, vdfp->fp_path, error); + __func__, vdfp->fp_path, error); goto out; } if ((error = VOP_OPEN(nd.ni_vp, FREAD, curthread->td_ucred, curthread, NULL))) { ERRMSG(ctx, "%s: VOP_OPEN(...): error = %d\n", - __func__, error); + __func__, error); VOP_UNLOCK(nd.ni_vp, 0); NDFREE(&nd, NDF_ONLY_PNBUF); goto out; @@ -2963,11 +2920,11 @@ vps_restore_vmobject(struct vps_snapst_c NDFREE(&nd, NDF_ONLY_PNBUF); KASSERT(nvo->cred == NULL, - ("%s: nvo=%p ->cred=%p\n", - __func__, nvo, nvo->cred)); + ("%s: nvo=%p ->cred=%p\n", + __func__, nvo, nvo->cred)); DBGR("%s: path [%s] got vnode %p v_object %p\n", - __func__, vdfp->fp_path, nd.ni_vp, nvo); + __func__, vdfp->fp_path, nd.ni_vp, nvo); } else if (vdvmo->type == OBJT_DEFAULT || vdvmo->type == OBJT_SWAP) { @@ -2993,14 +2950,14 @@ vps_restore_vmobject(struct vps_snapst_c */ ERRMSG(ctx, "%s: unsupported vm object: vdvmo=%p type=%d\n", - __func__, vdvmo, vdvmo->type); + __func__, vdvmo, vdvmo->type); /* XXX missing the sibling list here */ error = EINVAL; goto out; } if (vdvmo->cred != NULL && vdo_typeofnext(ctx) == - VPS_DUMPOBJT_UCRED) { + VPS_DUMPOBJT_UCRED) { vdo_next(ctx); } if (vdo_typeofnext(ctx) == VPS_DUMPOBJT_UCRED && @@ -3012,7 +2969,7 @@ vps_restore_vmobject(struct vps_snapst_c nvo->flags = vdvmo->flags; nvo->charge = vdvmo->charge; KASSERT(nvo->cred == NULL, - ("%s: nvo->cred = %p\n", __func__, nvo->cred)); + ("%s: nvo->cred = %p\n", __func__, nvo->cred)); /*DBGR("%s: charge=%lu\n", __func__, nvo->charge);*/ if (vdvmo->cred != NULL) { ncr = vps_restore_ucred_lookup(ctx, vps, @@ -3031,7 +2988,7 @@ vps_restore_vmobject(struct vps_snapst_c /* DBGR("%s: o2=%p: type=VMPAGE size=%d (pindex=%08x)\n", - __func__, o2, o2->size, *((int*)o2->data) ); + __func__, o2, o2->size, *((int*)o2->data) ); */ o2 = vdo_next(ctx); @@ -3055,13 +3012,13 @@ vps_restore_vmobject(struct vps_snapst_c pmap_remove_all(m); KASSERT((m->oflags & VPO_SWAPINPROG) == 0, - ("%s: m=%p oflags 0x%x & VPO_SWAPINPROG\n", - __func__, m, m->oflags)); + ("%s: m=%p oflags 0x%x & VPO_SWAPINPROG\n", + __func__, m, m->oflags)); KASSERT(vdvmpr->pr_vmobject == vdvmo->orig_ptr, - ("%s: object mismatch ! " - "(vdvmpr->pr_vmobject=%p)\n", - __func__, vdvmpr->pr_vmobject)); + ("%s: object mismatch ! " + "(vdvmpr->pr_vmobject=%p)\n", + __func__, vdvmpr->pr_vmobject)); vm_page_rename(m, nvo, vdvmpr->pr_pindex); @@ -3262,10 +3219,10 @@ vps_restore_vmspace(struct vps_snapst_ct vm_map_lock(&ns->vm_map); if ((error = vm_map_insert(&ns->vm_map, nvo, vdvme->offset, - vdvme->start, vdvme->end, vdvme->protection, - vdvme->max_protection, cow))) { + vdvme->start, vdvme->end, vdvme->protection, + vdvme->max_protection, cow))) { ERRMSG(ctx, "%s: vm_map_insert(): error %d\n", - __func__, error); + __func__, error); error = EINVAL; if (nvo) vm_object_deallocate(nvo); @@ -3324,7 +3281,7 @@ vps_restore_vmspace(struct vps_snapst_ct SLIST_INSERT_HEAD(&ctx->obj_list, ro, list); DBGR("%s: restored vmspace orig=%p new=%p\n", - __func__, vdvms->vm_orig_ptr, ns); + __func__, vdvms->vm_orig_ptr, ns); p->p_vmspace = ns; @@ -3405,7 +3362,7 @@ vps_restore_thread(struct vps_snapst_ctx tidhash_add(ntd); memset(&ntd->td_startzero, 0, - __rangeof(struct thread, td_startzero, td_endzero)); + __rangeof(struct thread, td_startzero, td_endzero)); memset(&ntd->td_rux, 0, sizeof(ntd->td_rux)); ntd->td_rqindex = vdtd->td_rqindex; @@ -3502,7 +3459,7 @@ vps_restore_proc_one(struct vps_snapst_c /* DBGR("%s: dtd->td_tid=%d dtd->td_ucred=%p dp->p_ucred=%p\n", - __func__, dtd->td_tid, dtd->td_ucred, dp->p_ucred); + __func__, dtd->td_tid, dtd->td_ucred, dp->p_ucred); */ /* @@ -3522,7 +3479,7 @@ vps_restore_proc_one(struct vps_snapst_c } bzero(&np->p_startzero, __rangeof(struct proc, - p_startzero, p_endzero)); + p_startzero, p_endzero)); /* assemble proc */ np->p_magic = P_MAGIC; @@ -3667,8 +3624,6 @@ vps_restore_proc_one(struct vps_snapst_c if ((error = vps_restore_thread(ctx, vps, np))) goto out; vps_account(vps, VPS_ACC_THREADS, VPS_ACC_ALLOC, 1); - /* Next. */ - ; } /* XXX lookup by id */ /* @@ -3779,7 +3734,7 @@ vps_restore_proc_one(struct vps_snapst_c curthread); } else ERRMSG(ctx, "%s: ktrace / vn_open error: %d\n", - __func__, error1); + __func__, error1); } out: @@ -4243,11 +4198,11 @@ vps_restore_mounts(struct vps_snapst_ctx /* Only do root fs mount now. */ if (vps == NULL && strcmp(dvm->mnton, rootfspath)) - goto next; + continue; /* Do all mounts now except root fs. */ if (vps != NULL && !strcmp(dvm->mnton, rootfspath)) - goto next; + continue; if (vdo_typeofnext(ctx) == VPS_DUMPOBJT_UCRED) { vdo_next(ctx); @@ -4324,10 +4279,6 @@ vps_restore_mounts(struct vps_snapst_ctx if (ncr != NULL) crfree(ncr); } - - next: - /* Next. */ - ; } out: @@ -4365,11 +4316,6 @@ vps_restore_prison_lookup(struct vps_sna struct vps_restore_obj *obj1; struct prison *new_pr; - /* - if (old_pr == NULL) - return (VPS_VPS(vps, prison0)); - */ - new_pr = NULL; SLIST_FOREACH(obj1, &ctx->obj_list, list) { if (obj1->type != VPS_DUMPOBJT_PRISON) @@ -4377,12 +4323,12 @@ vps_restore_prison_lookup(struct vps_sna if (obj1->orig_ptr == old_pr) { new_pr = obj1->new_ptr; DBGR("%s: found new prison ptr: orig=%p new=%p\n", - __func__, obj1->orig_ptr, obj1->new_ptr); + __func__, obj1->orig_ptr, obj1->new_ptr); break; } } KASSERT(new_pr != NULL, - ("%s: old_pr=%p new_pr==NULL\n", __func__, old_pr)); + ("%s: old_pr=%p new_pr==NULL\n", __func__, old_pr)); return (new_pr); } @@ -4455,10 +4401,6 @@ vps_restore_prison_one(struct vps_snapst npr->pr_securelevel = vdpr->pr_securelevel; npr->pr_childmax = vdpr->pr_childmax; - /* - npr->pr_allow = dpr->pr_allow; - npr->pr_enforce_statfs = dpr->pr_enforce_statfs; - */ npr->pr_allow = vdpr->pr_allow; npr->pr_enforce_statfs = vdpr->pr_enforce_statfs; @@ -4576,7 +4518,7 @@ vps_restore_vps(struct vps_snapst_ctx *c o1 = vdo_next(ctx); if (o1->type != VPS_DUMPOBJT_VPS) { ERRMSG(ctx, "%s: wrong object type: %p type=%d\n", - __func__, o1, o1->type); + __func__, o1, o1->type); error = EINVAL; goto out; } @@ -4823,7 +4765,7 @@ vps_restore_copyin(struct vps_snapst_ctx __func__, cnt.v_free_min, cnt.v_free_count, cnt.v_cache_count); ERRMSG(ctx, "%s: cnt.v_inactive_count=%u\n", - __func__, cnt.v_inactive_count); + __func__, cnt.v_inactive_count); error = ENOMEM; goto fail; } @@ -4919,9 +4861,9 @@ vps_restore_copyin(struct vps_snapst_ctx } if (vm_map_insert(kernel_map, ctx->vmobj, - kvaddr - VM_MIN_KERNEL_ADDRESS, - kvaddr, kvaddr + (ctx->vmobj->size << PAGE_SHIFT), - VM_PROT_ALL, VM_PROT_ALL, 0) != KERN_SUCCESS) { + kvaddr - VM_MIN_KERNEL_ADDRESS, + kvaddr, kvaddr + (ctx->vmobj->size << PAGE_SHIFT), + VM_PROT_ALL, VM_PROT_ALL, 0) != KERN_SUCCESS) { vm_map_unlock(kernel_map); vm_object_deallocate(ctx->vmobj); ctx->vmobj = NULL; @@ -4969,8 +4911,8 @@ vps_restore_copyin(struct vps_snapst_ctx checksum2 = vps_cksum(ctx->data, ctx->dsize); if (checksum1 != checksum2) { ERRMSG(ctx, "%s: CHECKSUM mismatch: snapshot info: " - "%08x calculated: %08x\n", - __func__, checksum1, checksum2); + "%08x calculated: %08x\n", + __func__, checksum1, checksum2); error = EINVAL; goto fail; } else @@ -4994,8 +4936,8 @@ vps_restore_copyin(struct vps_snapst_ctx /* XXX maybe link together wil lists/tailqs ... */ vm_map_protect(kernel_map, kvaddr, kvaddr + - (ctx->vmobj->size << PAGE_SHIFT), - VM_PROT_READ, 0); + (ctx->vmobj->size << PAGE_SHIFT), + VM_PROT_READ, 0); DBGR("%s: set map entry to readonly\n", __func__); From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 17:13:08 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 51EA0919; Wed, 23 Oct 2013 17:13:08 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2F00B2E7F; Wed, 23 Oct 2013 17:13:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NHD8Ox064684; Wed, 23 Oct 2013 17:13:08 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NHD7gc064675; Wed, 23 Oct 2013 17:13:07 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231713.r9NHD7gc064675@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 17:13:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256991 - in projects/vps/sys: kern rpc X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 17:13:08 -0000 Author: will Date: Wed Oct 23 17:13:07 2013 New Revision: 256991 URL: http://svnweb.freebsd.org/changeset/base/256991 Log: Sync with svn.7he.at/vps/trunk r192. r192 | klaus | 2013-07-18 06:18:16 -0600 (Thu, 18 Jul 2013) | 3 lines Fixed missing ucred->cr_vps pointers for nfs server. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/kern/kern_prot.c projects/vps/sys/kern/vfs_export.c projects/vps/sys/rpc/svc_auth.c Modified: projects/vps/sys/kern/kern_prot.c ============================================================================== --- projects/vps/sys/kern/kern_prot.c Wed Oct 23 17:11:52 2013 (r256990) +++ projects/vps/sys/kern/kern_prot.c Wed Oct 23 17:13:07 2013 (r256991) @@ -1863,8 +1863,11 @@ crfree(struct ucred *cr) struct vps *vps_save; vps_save = curthread->td_vps; - KASSERT(cr->cr_vps != NULL, ("%s: cr->cr_vps == NULL", __func__)); - KASSERT((cr->cr_ref & 0xffff0000) != 0xdead0000, ("dangling reference to ucred 2: cr=%p cr_ref=%08x", cr, cr->cr_ref)); + KASSERT(cr->cr_vps != NULL, + ("%s: cr->cr_vps == NULL, cr=%p", __func__, cr)); + KASSERT((cr->cr_ref & 0xffff0000) != 0xdead0000, + ("%s: dangling reference to ucred 2: cr=%p cr_ref=%08x", + __func__, cr, cr->cr_ref)); #endif KASSERT(cr->cr_ref > 0, ("bad ucred refcount: %d", cr->cr_ref)); Modified: projects/vps/sys/kern/vfs_export.c ============================================================================== --- projects/vps/sys/kern/vfs_export.c Wed Oct 23 17:11:52 2013 (r256990) +++ projects/vps/sys/kern/vfs_export.c Wed Oct 23 17:13:07 2013 (r256991) @@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include @@ -129,6 +130,10 @@ vfs_hang_addrlist(struct mount *mp, stru argp->ex_anon.cr_groups); np->netc_anon->cr_prison = V_prison0; prison_hold(np->netc_anon->cr_prison); +#ifdef VPS + np->netc_anon->cr_vps = curthread->td_vps; + vps_ref(np->netc_anon->cr_vps, np->netc_anon); +#endif np->netc_numsecflavors = argp->ex_numsecflavors; bcopy(argp->ex_secflavors, np->netc_secflavors, sizeof(np->netc_secflavors)); @@ -215,6 +220,10 @@ vfs_hang_addrlist(struct mount *mp, stru argp->ex_anon.cr_groups); np->netc_anon->cr_prison = V_prison0; prison_hold(np->netc_anon->cr_prison); +#ifdef VPS + np->netc_anon->cr_vps = curthread->td_vps; + vps_ref(np->netc_anon->cr_vps, np->netc_anon); +#endif np->netc_numsecflavors = argp->ex_numsecflavors; bcopy(argp->ex_secflavors, np->netc_secflavors, sizeof(np->netc_secflavors)); Modified: projects/vps/sys/rpc/svc_auth.c ============================================================================== --- projects/vps/sys/rpc/svc_auth.c Wed Oct 23 17:11:52 2013 (r256990) +++ projects/vps/sys/rpc/svc_auth.c Wed Oct 23 17:13:07 2013 (r256991) @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include @@ -185,6 +186,10 @@ svc_getcred(struct svc_req *rqst, struct cr->cr_rgid = cr->cr_svgid = cr->cr_groups[0]; cr->cr_prison = V_prison0; prison_hold(cr->cr_prison); +#ifdef VPS + cr->cr_vps = curthread->td_vps; + vps_ref(cr->cr_vps, cr); +#endif *crp = cr; return (TRUE); From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 17:17:58 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5B68ABD9; Wed, 23 Oct 2013 17:17:58 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 37DAA2ECD; Wed, 23 Oct 2013 17:17:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NHHw9A065286; Wed, 23 Oct 2013 17:17:58 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NHHvQv065280; Wed, 23 Oct 2013 17:17:57 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231717.r9NHHvQv065280@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 17:17:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256992 - in projects/vps: sys/vps usr.sbin/vpsctl X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 17:17:58 -0000 Author: will Date: Wed Oct 23 17:17:57 2013 New Revision: 256992 URL: http://svnweb.freebsd.org/changeset/base/256992 Log: Sync with svn.7he.at/vps/trunk r193. r193 | klaus | 2013-07-19 09:26:49 -0600 (Fri, 19 Jul 2013) | 3 lines Some modifications in order to allow migration of vps with nfs root. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/vps/vps_libdump.h projects/vps/sys/vps/vps_restore.c projects/vps/sys/vps/vps_snapst.c projects/vps/usr.sbin/vpsctl/vpsctl.c Modified: projects/vps/sys/vps/vps_libdump.h ============================================================================== --- projects/vps/sys/vps/vps_libdump.h Wed Oct 23 17:13:07 2013 (r256991) +++ projects/vps/sys/vps/vps_libdump.h Wed Oct 23 17:17:57 2013 (r256992) @@ -131,7 +131,7 @@ void vps_libdump_printheader(struct vps_ #define VPS_DUMPOBJT_UCRED 120 #define VPS_DUMPH_MAGIC 0xc0debabe -#define VPS_DUMPH_VERSION 0x20130715 +#define VPS_DUMPH_VERSION 0x20130719 #define VPS_DUMPH_MSB 12 #define VPS_DUMPH_LSB 21 #define VPS_DUMPH_32BIT 32 @@ -318,11 +318,19 @@ struct vps_dump_mount { char mnton[0x80]; char fstype[0x10]; uint8 vpsmount; - uint8 _pad0[7]; + uint8 optcnt; + uint8 _pad0[6]; uint64 flags; PTR(mnt_cred); }; +struct vps_dump_mount_opt { + char name[0x40]; + char value[0x100]; + uint16 len; + uint16 _pad0[3]; +}; + struct vps_dump_vnet { PTR(orig_ptr); }; Modified: projects/vps/sys/vps/vps_restore.c ============================================================================== --- projects/vps/sys/vps/vps_restore.c Wed Oct 23 17:13:07 2013 (r256991) +++ projects/vps/sys/vps/vps_restore.c Wed Oct 23 17:17:57 2013 (r256992) @@ -4161,6 +4161,7 @@ static int vps_restore_mounts(struct vps_snapst_ctx *ctx, struct vps *vps, char *rootfspath) { + struct vps_dump_mount_opt *dvmopt; struct vps_dump_mount *dvm; struct vps_dumpobj *o1; struct vps *savevps; @@ -4171,6 +4172,7 @@ vps_restore_mounts(struct vps_snapst_ctx char *fspath; char *errmsg; int error = 0; + int i; ncr = NULL; @@ -4185,7 +4187,7 @@ vps_restore_mounts(struct vps_snapst_ctx save_rdir = save_cdir = NULL; } - errmsg_len = 0x100; + errmsg_len = 0xf0; errmsg = malloc(errmsg_len, M_TEMP, M_WAITOK); while (vdo_typeofnext(ctx) == VPS_DUMPOBJT_MOUNT) { @@ -4204,6 +4206,34 @@ vps_restore_mounts(struct vps_snapst_ctx if (vps != NULL && !strcmp(dvm->mnton, rootfspath)) continue; + ma = NULL; + + if (dvm->optcnt * sizeof(*dvmopt) > + (o1->size - sizeof(*dvm))) { + ERRMSG(ctx, "%s: dvm->optcnt=%d seems invalid !\n", + __func__, dvm->optcnt); + error = EINVAL; + goto out; + } + dvmopt = (struct vps_dump_mount_opt *)(dvm+1); + for (i = 0; i < dvm->optcnt; i++) { + DBGR("%s: opt name=[%s] value=%p len=%u\n", + __func__, dvmopt->name, dvmopt->value, + dvmopt->len); + + if (!strcmp(dvm->fstype, "nfs")) { + /* + if (!strcmp(dvmopt->name, "addr") || + !strcmp(dvmopt->name, "fh") || + !strcmp(dvmopt->name, "hostname")) + */ + if (1) + ma = mount_arg(ma, dvmopt->name, + dvmopt->value, dvmopt->len); + } + dvmopt += 1; + } + if (vdo_typeofnext(ctx) == VPS_DUMPOBJT_UCRED) { vdo_next(ctx); } @@ -4236,24 +4266,11 @@ vps_restore_mounts(struct vps_snapst_ctx if (dvm->vpsmount) /* dvm->mnton is always absolute, so we have to strip it. */ - fspath = dvm->mnton + strlen (rootfspath); + fspath = dvm->mnton + strlen(rootfspath); else fspath = dvm->mnton; + /*DBGR("%s: fspath=[%s]\n", __func__, fspath);*/ -#if 0 - error = kernel_vmount( - dvm->flags, - "fstype", dvm->fstype, - /* "fspath", dvm->mnton, */ - "fspath", fspath, - /* --> nullfs */ - "target", dvm->mntfrom, - "from", dvm->mntfrom, - "errmsg", errmsg, - NULL - ); -#endif - ma = NULL; ma = mount_arg(ma, "fstype", dvm->fstype, -1); ma = mount_arg(ma, "fspath", fspath, -1); if (!strcmp(dvm->fstype, "nullfs") || @@ -4262,11 +4279,11 @@ vps_restore_mounts(struct vps_snapst_ctx ma = mount_arg(ma, "from", dvm->mntfrom, -1); ma = mount_arg(ma, "errmsg", errmsg, errmsg_len); memset(errmsg, 0, errmsg_len); - error = kernel_mount(ma, dvm->flags); + error = kernel_mount(ma, dvm->flags); if (error) { ERRMSG(ctx, "%s: kernel_mount() error: %d [%s]\n", - __func__, error, errmsg); + __func__, error, errmsg); goto out; } Modified: projects/vps/sys/vps/vps_snapst.c ============================================================================== --- projects/vps/sys/vps/vps_snapst.c Wed Oct 23 17:13:07 2013 (r256991) +++ projects/vps/sys/vps/vps_snapst.c Wed Oct 23 17:17:57 2013 (r256992) @@ -677,6 +677,8 @@ vps_snapshot_vnodepath(struct vps_snapst if (error != 0) { free(buf, M_TEMP); vrele(vp); + ERRMSG(ctx, "%s: vn_fullpath1() failed for vp=%p\n", + __func__, vp); return (error); } @@ -907,8 +909,10 @@ static int vps_snapshot_mounts(struct vps_snapst_ctx *ctx, struct vps *vps) { int error = 0; - struct vps_dumpobj *o1; + struct vps_dumpobj *o1, *o2; struct vps_dump_mount *vdm; + struct vps_dump_mount_opt *vdmopt; + struct vfsopt *opt; struct mount *mp; char *mntfrom, *mnton, *fstype, *vpsroot; int len; @@ -924,7 +928,7 @@ vps_snapshot_mounts(struct vps_snapst_ct */ DBGS("%s: vps's rootpath=[%s] vnode=%p\n", - __func__, vps->_rootpath, vps->_rootvnode); + __func__, vps->_rootpath, vps->_rootvnode); vpsroot = strdup(vps->_rootpath, M_TEMP); if (vpsroot[strlen(vpsroot) - 1] == '/') @@ -932,7 +936,8 @@ vps_snapshot_mounts(struct vps_snapst_ct len = strlen(vpsroot); /* If we ran out of memory previously, we try again. */ - again: + again: + o1 = NULL; mtx_lock(&mountlist_mtx); TAILQ_FOREACH(mp, &mountlist, mnt_list) { @@ -958,11 +963,20 @@ vps_snapshot_mounts(struct vps_snapst_ct return (EINVAL); } #endif - o1 = vdo_create(ctx, VPS_DUMPOBJT_MOUNT, M_WAITOK); + if ((o2 = vdo_create(ctx, VPS_DUMPOBJT_MOUNT, M_NOWAIT)) + == NULL) { + mtx_unlock(&mountlist_mtx); + if (o1 != NULL) + vdo_discard(ctx, o1); + goto again; + } + /* Remember the dump object of the first mount. */ + if (o1 == NULL) + o1 = o2; vdm = vdo_space(ctx, sizeof(*vdm), M_NOWAIT); - if (vdm == NULL) { + mtx_unlock(&mountlist_mtx); vdo_discard(ctx, o1); goto again; } @@ -970,12 +984,35 @@ vps_snapshot_mounts(struct vps_snapst_ct strlcpy(vdm->mnton, mnton, sizeof(vdm->mnton)); strlcpy(vdm->fstype, fstype, sizeof(vdm->fstype)); vdm->flags = mp->mnt_flag; + vdm->optcnt = 0; /* Mounted from inside vps ? */ if (mp->mnt_cred->cr_vps == vps) vdm->vpsmount = 1; else vdm->vpsmount = 0; + TAILQ_FOREACH(opt, mp->mnt_opt, link) { + vdmopt = vdo_space(ctx, sizeof(*vdmopt), M_NOWAIT); + if (vdmopt == NULL) { + mtx_unlock(&mountlist_mtx); + vdo_discard(ctx, o1); + goto again; + } + if (opt->len >= sizeof(vdmopt->value)) { + ERRMSG(ctx, "%s: opt->len=%d (name=[%s]) too big\n", + __func__, opt->len, opt->name); + mtx_unlock(&mountlist_mtx); + free(vpsroot, M_TEMP); + return (EINVAL); + } + strlcpy(vdmopt->name, opt->name, sizeof(vdmopt->name)); + memcpy(vdmopt->value, opt->value, opt->len); + vdmopt->len = opt->len; + vdm->optcnt += 1; + DBGS("%s: opt name=[%s] value=%p len=%d\n", + __func__, opt->name, opt->value, opt->len); + } + if (vdm->vpsmount) { vdm->mnt_cred = mp->mnt_cred; Modified: projects/vps/usr.sbin/vpsctl/vpsctl.c ============================================================================== --- projects/vps/usr.sbin/vpsctl/vpsctl.c Wed Oct 23 17:13:07 2013 (r256991) +++ projects/vps/usr.sbin/vpsctl/vpsctl.c Wed Oct 23 17:17:57 2013 (r256992) @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -308,7 +309,7 @@ vc_usage(FILE *out) " snapshot \n" " abort \n" " restore \n" - " migrate [norsync|onersync]\n" + " migrate [norsync|onersync|tworsync]\n" " \n" " argshow \n" " ipnet add
\n" @@ -1297,8 +1298,7 @@ vc_migrate(int argc, char **argv) char *fsroot; char cmd[0x100]; char file_n[MAXPATHLEN]; - char f_norsync = 0; - char f_onersync = 0; + char cnt_rsync; char str_suspend[] = "suspend"; char str_abort[] = "abort"; int pid, rfd, wfd; @@ -1309,12 +1309,6 @@ vc_migrate(int argc, char **argv) if (argc < 2) return (vc_usage(stderr)); - if (argc > 2 && strcmp(argv[2], "norsync") == 0) - f_norsync = 1; - - if (argc > 2 && strcmp(argv[2], "onersync") == 0) - f_onersync = 1; - mig_did_suspend = 0; mig_did_revoke = 0; signal(SIGINT, vc_migrate_sighandler); @@ -1341,6 +1335,28 @@ vc_migrate(int argc, char **argv) else fsroot = vc.fsroot; + if (1) { + struct statfs stf; + + if ((error = statfs(fsroot, &stf)) != 0) { + fprintf(stderr, "statfs([%s]): error: %s\n", + fsroot, strerror(errno)); + return (1); + } + + if (stf.f_flags & MNT_LOCAL) + cnt_rsync = 2; + else + cnt_rsync = 0; + } + + if (argc > 2 && strcmp(argv[2], "norsync") == 0) + cnt_rsync = 0; + else if (argc > 2 && strcmp(argv[2], "onersync") == 0) + cnt_rsync = 1; + else if (argc > 2 && strcmp(argv[2], "tworsync") == 0) + cnt_rsync = 2; + fprintf(stderr, "Opening ssh transport ... "); if ((error = vc_get_ssh_transport(host, &pid, &rfd, &wfd))) @@ -1348,43 +1364,44 @@ vc_migrate(int argc, char **argv) fprintf(stderr, "done\n"); - if (f_norsync == 0) { - - fprintf(stderr, "Copying config file ... "); - snprintf(cmd, sizeof(cmd), "vpsctl rsyncserver %s/\n", _PATH_CONFDIR); - write(wfd, cmd, strlen(cmd)); - if ((error = vc_rsync(RSYNC_MODE_CLIENT, rfd, wfd, file_n))) - goto resume; + /* Always syncing config file. */ +#if 1 + fprintf(stderr, "Copying config file ... "); + snprintf(cmd, sizeof(cmd), "vpsctl rsyncserver %s/\n", _PATH_CONFDIR); + write(wfd, cmd, strlen(cmd)); + if ((error = vc_rsync(RSYNC_MODE_CLIENT, rfd, wfd, file_n))) + goto resume; - fprintf(stderr, "done\n"); + fprintf(stderr, "done\n"); +#else + /* XXX transfer without using rsync */ +#endif - /* Always create directories. */ - if (vc.fsroot_priv[0] != '\0') { - /* Create vps' private root directory. */ - snprintf(cmd, sizeof(cmd), "mkdir -p %s\n", vc.fsroot_priv); - write(wfd, cmd, strlen(cmd)); - //len = read(rfd, cmd, sizeof(cmd)); - } - /* Create vps' mountpoint directory. */ - snprintf(cmd, sizeof(cmd), "mkdir -p %s\n", vc.fsroot); + /* Always create directories. */ + if (vc.fsroot_priv[0] != '\0') { + /* Create vps' private root directory. */ + snprintf(cmd, sizeof(cmd), "mkdir -p %s\n", vc.fsroot_priv); write(wfd, cmd, strlen(cmd)); //len = read(rfd, cmd, sizeof(cmd)); + } + /* Create vps' mountpoint directory. */ + snprintf(cmd, sizeof(cmd), "mkdir -p %s\n", vc.fsroot); + write(wfd, cmd, strlen(cmd)); + //len = read(rfd, cmd, sizeof(cmd)); - if (f_onersync == 0) { - - /* Start a first filesystem sync while vps is still running. */ + if (cnt_rsync == 2) { - fprintf(stderr, "Performing first filesystem sync ... "); + /* Start a first filesystem sync while vps is still running. */ - snprintf(cmd, sizeof(cmd), "vpsctl rsyncserver %s/\n", fsroot); - write(wfd, cmd, strlen(cmd)); - snprintf(cmd, sizeof(cmd), "%s/", fsroot); - if ((error = vc_rsync(RSYNC_MODE_CLIENT, rfd, wfd, cmd))) - goto resume; + fprintf(stderr, "Performing first filesystem sync ... "); - fprintf(stderr, "done\n"); + snprintf(cmd, sizeof(cmd), "vpsctl rsyncserver %s/\n", fsroot); + write(wfd, cmd, strlen(cmd)); + snprintf(cmd, sizeof(cmd), "%s/", fsroot); + if ((error = vc_rsync(RSYNC_MODE_CLIENT, rfd, wfd, cmd))) + goto resume; - } + fprintf(stderr, "done\n"); } @@ -1401,18 +1418,18 @@ vc_migrate(int argc, char **argv) fprintf(stderr, "done\n"); - if (f_norsync == 0) { + if (cnt_rsync > 0) { - fprintf(stderr, "Performing final filesystem sync ... "); + fprintf(stderr, "Performing final filesystem sync ... "); - /* After suspending do the final filesystem sync. */ - snprintf(cmd, sizeof(cmd), "vpsctl rsyncserver %s/\n", fsroot); - write(wfd, cmd, strlen(cmd)); - snprintf(cmd, sizeof(cmd), "%s/", fsroot); - if ((error = vc_rsync(RSYNC_MODE_CLIENT, rfd, wfd, cmd))) - goto resume; + /* After suspending do the final filesystem sync. */ + snprintf(cmd, sizeof(cmd), "vpsctl rsyncserver %s/\n", fsroot); + write(wfd, cmd, strlen(cmd)); + snprintf(cmd, sizeof(cmd), "%s/", fsroot); + if ((error = vc_rsync(RSYNC_MODE_CLIENT, rfd, wfd, cmd))) + goto resume; - fprintf(stderr, "done\n"); + fprintf(stderr, "done\n"); } From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 17:18:55 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6D3ACCC6; Wed, 23 Oct 2013 17:18:55 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4A8D82ED5; Wed, 23 Oct 2013 17:18:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NHItqS065435; Wed, 23 Oct 2013 17:18:55 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NHIso4065429; Wed, 23 Oct 2013 17:18:54 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231718.r9NHIso4065429@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 17:18:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256993 - in projects/vps/sys: fs/vpsfs kern sys vps X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 17:18:55 -0000 Author: will Date: Wed Oct 23 17:18:53 2013 New Revision: 256993 URL: http://svnweb.freebsd.org/changeset/base/256993 Log: Sync with svn.7he.at/vps/trunk r194. r194 | klaus | 2013-07-26 13:49:49 -0600 (Fri, 26 Jul 2013) | 4 lines Added a failsafe vn_fullpath1() version, that still needs a little bit of work. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/fs/vpsfs/vpsfs_quota.c projects/vps/sys/kern/vfs_cache.c projects/vps/sys/kern/vfs_default.c projects/vps/sys/sys/vnode.h projects/vps/sys/vps/vps_snapst.c projects/vps/sys/vps/vps_suspend.c Modified: projects/vps/sys/fs/vpsfs/vpsfs_quota.c ============================================================================== --- projects/vps/sys/fs/vpsfs/vpsfs_quota.c Wed Oct 23 17:17:57 2013 (r256992) +++ projects/vps/sys/fs/vpsfs/vpsfs_quota.c Wed Oct 23 17:18:53 2013 (r256993) @@ -67,10 +67,6 @@ static int vpsfs_readdir(struct thread * int dirbuflen, struct vpsfs_limits *, void (*cbfunc)(struct vnode *, struct vpsfs_limits *, struct thread *)); -static int get_next_dirent(struct vnode *vp, struct dirent **dpp, - char *dirbuf, int dirbuflen, off_t *off, char **cpos, int *len, - int *eofflag, struct thread *td); - static void vpsfs_calcvnode(struct vnode *vp, struct vpsfs_limits *limits, struct thread *td); @@ -610,63 +606,6 @@ vpsfs_readdir(struct thread *td, struct return (error); } -/* copied from kern/vfs_default.c */ -static int -get_next_dirent(struct vnode *vp, struct dirent **dpp, char *dirbuf, - int dirbuflen, off_t *off, char **cpos, int *len, - int *eofflag, struct thread *td) -{ - int error, reclen; - struct uio uio; - struct iovec iov; - struct dirent *dp; - - KASSERT(VOP_ISLOCKED(vp), ("vp %p is not locked", vp)); - KASSERT(vp->v_type == VDIR, ("vp %p is not a directory", vp)); - - if (*len == 0) { - iov.iov_base = dirbuf; - iov.iov_len = dirbuflen; - - uio.uio_iov = &iov; - uio.uio_iovcnt = 1; - uio.uio_offset = *off; - uio.uio_resid = dirbuflen; - uio.uio_segflg = UIO_SYSSPACE; - uio.uio_rw = UIO_READ; - uio.uio_td = td; - - *eofflag = 0; - -#ifdef MAC - error = mac_vnode_check_readdir(td->td_ucred, vp); - if (error == 0) -#endif - error = VOP_READDIR(vp, &uio, td->td_ucred, eofflag, - NULL, NULL); - if (error) - return (error); - - *off = uio.uio_offset; - - *cpos = dirbuf; - *len = (dirbuflen - uio.uio_resid); - } - - dp = (struct dirent *)(*cpos); - reclen = dp->d_reclen; - *dpp = dp; - - /* check for malformed directory.. */ - if (reclen < DIRENT_MINSIZE) - return (EINVAL); - - *cpos += reclen; - *len -= reclen; - - return (0); -} - #endif /* VPS */ /* EOF */ Modified: projects/vps/sys/kern/vfs_cache.c ============================================================================== --- projects/vps/sys/kern/vfs_cache.c Wed Oct 23 17:17:57 2013 (r256992) +++ projects/vps/sys/kern/vfs_cache.c Wed Oct 23 17:18:53 2013 (r256993) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -309,13 +310,8 @@ SYSCTL_OPAQUE(_vfs_cache, OID_AUTO, nchs static void cache_zap(struct namecache *ncp); static int vn_vptocnp_locked(struct vnode **vp, struct ucred *cred, char *buf, u_int *buflen); -#ifdef VPS -int vn_fullpath1(struct thread *td, struct vnode *vp, struct vnode *rdir, - char *buf, char **retbuf, u_int buflen); -#else static int vn_fullpath1(struct thread *td, struct vnode *vp, struct vnode *rdir, char *buf, char **retbuf, u_int buflen); -#endif static MALLOC_DEFINE(M_VFSCACHE, "vfscache", "VFS name cache entries"); @@ -1269,11 +1265,7 @@ vn_vptocnp_locked(struct vnode **vp, str /* * The magic behind kern___getcwd() and vn_fullpath(). */ -#ifdef VPS -int -#else static int -#endif vn_fullpath1(struct thread *td, struct vnode *vp, struct vnode *rdir, char *buf, char **retbuf, u_int buflen) { @@ -1368,6 +1360,357 @@ vn_fullpath1(struct thread *td, struct v return (0); } + +/* ----------------------------------------------------------- */ + +/* + XXX lookup for /dev/console doesn't work, altough td->td_vps and + td->td_ucred->cr_vps are right. + XXX for this failure no error is returned + XXX limit recursion depth !!! + */ + +/* + * Search a directory for a given inode number, recursing into + * subdirectories. + */ +static int +vn_fullpath1_findparentdir_recurse(struct vnode *dvp, struct ucred *cred, + int inodenum, struct vnode **retvp) +{ + struct componentname cnp; + struct dirent *dp; + struct vnode *vp; + char *dirbuf; + char *cpos; + off_t off; + int dirbuflen; + int eofflag; + int error; + int len; + + dirbuflen = PATH_MAX; + dirbuf = malloc(dirbuflen, M_TEMP, M_WAITOK); + + cpos = NULL; + off = 0; + len = 0; + + do { + error = get_next_dirent(dvp, &dp, dirbuf, dirbuflen, + &off, &cpos, &len, &eofflag, curthread); + if (error != 0) + goto out; + + if (!strcmp(dp->d_name, ".") || + !strcmp(dp->d_name, "..") || + dp->d_fileno == 0) + continue; + + cnp.cn_pnbuf = NULL; + cnp.cn_consume = 0; + cnp.cn_nameptr = dp->d_name; + cnp.cn_namelen = strlen(dp->d_name); + cnp.cn_lkflags = LK_SHARED | LK_RETRY; + cnp.cn_thread = curthread; + cnp.cn_cred = cred; + error = VOP_LOOKUP(dvp, &vp, &cnp); + if (error != 0) + goto out; + + if (dp->d_fileno == inodenum) { + *retvp = dvp; + vunref(vp); + VOP_UNLOCK(vp, 0); + error = 0; + goto out; + } + + if (vp->v_type == VDIR) { + error = vn_fullpath1_findparentdir_recurse(vp, cred, + inodenum, retvp); + if (error != ENOENT) { + vunref(vp); + VOP_UNLOCK(vp, 0); + error = 0; + goto out; + } + } + + vunref(vp); + VOP_UNLOCK(vp, 0); + + } while (len > 0 || !eofflag); + + error = ENOENT; + + out: + free(dirbuf, M_TEMP); + + return (error); +} + +/* + * Search through the filesystem that owns 'vp' for (one of) its + * parent directories. + */ +static int +vn_fullpath1_findparentdir(struct vnode *vp, struct ucred *cred, + struct vnode **outvp) +{ + struct vattr vattr; + struct vnode *rootvp; + struct vnode *dvp; + int error; + + if (VOP_ISLOCKED(vp) == 0) + vn_lock(vp, LK_SHARED | LK_RETRY); + + /* Get inode number of file. */ + error = VOP_GETATTR(vp, &vattr, cred); + VOP_UNLOCK(vp, 0); + if (error != 0) + return (error); + + error = VFS_ROOT(vp->v_mount, LK_EXCLUSIVE | LK_RETRY, &rootvp); + if (error != 0) + return (error); + + error = vn_fullpath1_findparentdir_recurse(rootvp, cred, + vattr.va_fileid, &dvp); + if (error == 0) + *outvp = dvp; + + vunref(rootvp); + VOP_UNLOCK(rootvp, 0); + + return (error); +} + +static int +vn_fullpath1_fallback(struct thread *td, struct vnode *vp, + struct vnode *rdir, char *buf, char **retbuf, u_int buflen) +{ + struct componentname cnp; + struct vattr vattr; + struct vnode *dvp2; + struct vnode *dvp; + struct dirent *dp; + char *dirbuf; + char *cpos; + off_t off; + int dirbuflen; + int inodenum; + int eofflag; + int error; + int len; + + dirbuflen = PATH_MAX; + dirbuf = malloc(dirbuflen, M_TEMP, M_WAITOK); + + buflen -= 1; + buf[buflen] = 0; + + if (vp->v_type == VDIR) { + dvp = vp; + + if (VOP_ISLOCKED(dvp) == 0) + vn_lock(dvp, LK_SHARED | LK_RETRY); + + } else { + char buf2[MAXPATHLEN]; + int buflen2; + + /* Get the parent directory. */ + + buflen2 = sizeof(buf2); + memset(buf2, 0, sizeof(buf2)); + + /* + * Since this step is the most expensive one, + * try the namecache for this one. + */ + vref(vp); + CACHE_RLOCK(); + error = vn_vptocnp_locked(&vp, td->td_ucred, buf2, &buflen2); + if (error == 0) + CACHE_RUNLOCK(); + vrele(vp); + dvp = vp; + /* + // debugging + dvp = NULL; + error = ENOENT; + */ + + if (error == 0) { + buflen -= sizeof(buf2)-buflen2; + memcpy(buf+buflen, buf2+buflen2, sizeof(buf2)-buflen2); + + } else { + /* Do it the *expensive* way. */ + + printf("%s: WARNING: looking up by " + "vn_fullpath1_findparentdir(vp=%p, ...)\n", + __func__, vp); + error = vn_fullpath1_findparentdir(vp, td->td_ucred, &dvp); + if (error != 0) + goto out; + + vn_lock(dvp, LK_SHARED | LK_RETRY); + + /* Get inode number of file. */ + if (VOP_ISLOCKED(vp) == 0) + vn_lock(vp, LK_SHARED | LK_RETRY); + error = VOP_GETATTR(vp, &vattr, td->td_ucred); + VOP_UNLOCK(vp, 0); + if (error != 0) { + VOP_UNLOCK(dvp, 0); + goto out; + } + inodenum = vattr.va_fileid; + + /* Now we know the parent directory so search it for the file. */ + cpos = NULL; + off = 0; + len = 0; + error = ENOENT; + + do { + error = get_next_dirent(dvp, &dp, dirbuf, dirbuflen, + &off, &cpos, &len, &eofflag, td); + if (error != 0) { + VOP_UNLOCK(dvp, 0); + goto out; + } + + if (dp->d_fileno == inodenum) { + /* Found it ! */ + if (buflen < strlen(dp->d_name)) { + error = ENOMEM; + VOP_UNLOCK(dvp, 0); + goto out; + } + buflen -= strlen(dp->d_name); + memcpy(buf+buflen, dp->d_name, strlen(dp->d_name)); + error = 0; + break; + } + error = ENOENT; + } while (len > 0 || !eofflag); + + if (error != 0) { + printf("%s: line %d\n", __func__, __LINE__); + VOP_UNLOCK(dvp, 0); + goto out; + } + } + + } + + for (;;) { + + /* Separate component names with '/'. */ + if (buflen < 1) { + error = ENOMEM; + VOP_UNLOCK(dvp, 0); + goto out; + } + buflen -= 1; + memcpy(buf+buflen, "/", 1); + *retbuf = buf+buflen; + + if (dvp == rdir) { + /* Reached (relative) root directory. */ + VOP_UNLOCK(dvp, 0); + break; + } + + if (dvp->v_vflag & VV_ROOT) { + /* Crossing filesystems. */ + dvp2 = dvp->v_mount->mnt_vnodecovered; + VOP_UNLOCK(dvp, 0); + vn_lock(dvp2, LK_SHARED | LK_RETRY); + dvp = dvp2; + } + + /* Get inode number of directory. */ + error = VOP_GETATTR(dvp, &vattr, td->td_ucred); + if (error != 0) { + VOP_UNLOCK(dvp, 0); + goto out; + } + inodenum = vattr.va_fileid; + + /* Lookup "..". */ + cnp.cn_pnbuf = NULL; + cnp.cn_consume = 0; + cnp.cn_nameptr = ".."; + cnp.cn_namelen = 2; + cnp.cn_lkflags = LK_SHARED; + cnp.cn_thread = curthread; + cnp.cn_cred = td->td_ucred; + error = VOP_LOOKUP(dvp, &dvp2, &cnp); + if (error != 0) { + VOP_UNLOCK(dvp, 0); + goto out; + } + + vunref(dvp2); + VOP_UNLOCK(dvp, 0); + dvp = dvp2; + + cpos = NULL; + off = 0; + len = 0; + error = ENOENT; + + do { + error = get_next_dirent(dvp2, &dp, dirbuf, dirbuflen, + &off, &cpos, &len, &eofflag, td); + if (error != 0) { + VOP_UNLOCK(dvp2, 0); + goto out; + } + + if (dp->d_fileno == inodenum) { + /* Found it ! */ + if (buflen < strlen(dp->d_name)) { + error = ENOMEM; + VOP_UNLOCK(dvp2, 0); + goto out; + } + buflen -= strlen(dp->d_name); + memcpy(buf+buflen, dp->d_name, strlen(dp->d_name)); + break; + } + error = ENOENT; + } while (len > 0 || !eofflag); + } + + out: + free(dirbuf, M_TEMP); + + return (error); +} + +int +vn_fullpath1_failsafe(struct thread *td, struct vnode *vp, + struct vnode *rdir, char *buf, char **retbuf, u_int buflen) +{ + int error; + + error = vn_fullpath1(td, vp, rdir, buf, retbuf, buflen); + if (error != ENOENT) + return (error); + + error = vn_fullpath1_fallback(td, vp, rdir, buf, retbuf, buflen); + + return (error); +} + +/* ----------------------------------------------------------- */ + struct vnode * vn_dir_dd_ino(struct vnode *vp) { Modified: projects/vps/sys/kern/vfs_default.c ============================================================================== --- projects/vps/sys/kern/vfs_default.c Wed Oct 23 17:17:57 2013 (r256992) +++ projects/vps/sys/kern/vfs_default.c Wed Oct 23 17:18:53 2013 (r256993) @@ -69,10 +69,6 @@ __FBSDID("$FreeBSD$"); static int vop_nolookup(struct vop_lookup_args *); static int vop_norename(struct vop_rename_args *); static int vop_nostrategy(struct vop_strategy_args *); -static int get_next_dirent(struct vnode *vp, struct dirent **dpp, - char *dirbuf, int dirbuflen, off_t *off, - char **cpos, int *len, int *eofflag, - struct thread *td); static int dirent_exists(struct vnode *vp, const char *dirname, struct thread *td); @@ -261,7 +257,7 @@ vop_nostrategy (struct vop_strategy_args return (EOPNOTSUPP); } -static int +int get_next_dirent(struct vnode *vp, struct dirent **dpp, char *dirbuf, int dirbuflen, off_t *off, char **cpos, int *len, int *eofflag, struct thread *td) Modified: projects/vps/sys/sys/vnode.h ============================================================================== --- projects/vps/sys/sys/vnode.h Wed Oct 23 17:17:57 2013 (r256992) +++ projects/vps/sys/sys/vnode.h Wed Oct 23 17:18:53 2013 (r256993) @@ -577,6 +577,7 @@ vn_canvmio(struct vnode *vp) * Public vnode manipulation functions. */ struct componentname; +struct dirent; struct file; struct mount; struct nameidata; @@ -609,6 +610,10 @@ int getnewvnode(const char *tag, struct struct vnode **vpp); void getnewvnode_reserve(u_int count); void getnewvnode_drop_reserve(void); +int get_next_dirent(struct vnode *vp, struct dirent **dpp, + char *dirbuf, int dirbuflen, off_t *off, + char **cpos, int *len, int *eofflag, + struct thread *td); int insmntque1(struct vnode *vp, struct mount *mp, void (*dtr)(struct vnode *, void *), void *dtr_arg); int insmntque(struct vnode *vp, struct mount *mp); @@ -659,6 +664,8 @@ int vn_close(struct vnode *vp, int flags, struct ucred *file_cred, struct thread *td); void vn_finished_write(struct mount *mp); void vn_finished_secondary_write(struct mount *mp); +int vn_fullpath1_failsafe(struct thread *td, struct vnode *vp, + struct vnode *rdir, char *buf, char **retbuf, u_int buflen); int vn_isdisk(struct vnode *vp, int *errp); int _vn_lock(struct vnode *vp, int flags, char *file, int line); #define vn_lock(vp, flags) _vn_lock(vp, flags, __FILE__, __LINE__) Modified: projects/vps/sys/vps/vps_snapst.c ============================================================================== --- projects/vps/sys/vps/vps_snapst.c Wed Oct 23 17:17:57 2013 (r256992) +++ projects/vps/sys/vps/vps_snapst.c Wed Oct 23 17:18:53 2013 (r256993) @@ -656,6 +656,11 @@ vps_snapshot_vnodepath(struct vps_snapst { struct vps_dumpobj *o1; struct vps_dump_filepath *vdfp; + /* + struct ucred *save_ucred; + struct vps *save_vps; + struct thread *td; + */ char *retbuf, *buf; int error; @@ -671,9 +676,29 @@ vps_snapshot_vnodepath(struct vps_snapst vrele(vp); return (ENOMEM); } + +#if 0 +// not yet ... for devfs lookups + td = curthread; + save_ucred = td->td_ucred; + save_vps = td->td_vps; + td->td_ucred = crdup(save_ucred); + vps_deref(td->td_ucred->cr_vps, td->td_ucred); + td->td_ucred->cr_vps = vps; + vps_ref(td->td_ucred->cr_vps, td->td_ucred); + td->td_vps = vps; +#endif + retbuf = "-"; - error = vn_fullpath1(curthread, vp, vps->_rootvnode, + error = vn_fullpath1_failsafe(curthread, vp, vps->_rootvnode, buf, &retbuf, MAXPATHLEN); + +#if 0 + crfree(td->td_ucred); + td->td_ucred = save_ucred; + td->td_vps = save_vps; +#endif + if (error != 0) { free(buf, M_TEMP); vrele(vp); Modified: projects/vps/sys/vps/vps_suspend.c ============================================================================== --- projects/vps/sys/vps/vps_suspend.c Wed Oct 23 17:17:57 2013 (r256992) +++ projects/vps/sys/vps/vps_suspend.c Wed Oct 23 17:18:53 2013 (r256993) @@ -118,9 +118,6 @@ static int vps_access_vmspace(struct vms size_t len, void *buf, int prot); static int vps_resume_relinkvnodes(struct vps *vps); -static int get_next_dirent(struct vnode *vp, struct dirent **dpp, - char *dirbuf, int dirbuflen, off_t *off, char **cpos, - int *len, int *eofflag, struct thread *td); static int vps_suspend_relink_delete(struct vnode *vp); static int vps_suspend_mod_refcnt; @@ -981,65 +978,6 @@ vps_suspend_relink_delete(struct vnode * return (error); } -#define DIRENT_MINSIZE (sizeof(struct dirent) - (MAXNAMLEN+1) + 4) - -/* copied from kern/vfs_default.c */ -static int -get_next_dirent(struct vnode *vp, struct dirent **dpp, char *dirbuf, - int dirbuflen, off_t *off, char **cpos, int *len, - int *eofflag, struct thread *td) -{ - int error, reclen; - struct uio uio; - struct iovec iov; - struct dirent *dp; - - KASSERT(VOP_ISLOCKED(vp), ("vp %p is not locked", vp)); - KASSERT(vp->v_type == VDIR, ("vp %p is not a directory", vp)); - - if (*len == 0) { - iov.iov_base = dirbuf; - iov.iov_len = dirbuflen; - - uio.uio_iov = &iov; - uio.uio_iovcnt = 1; - uio.uio_offset = *off; - uio.uio_resid = dirbuflen; - uio.uio_segflg = UIO_SYSSPACE; - uio.uio_rw = UIO_READ; - uio.uio_td = td; - - *eofflag = 0; - -#ifdef MAC - error = mac_vnode_check_readdir(td->td_ucred, vp); - if (error == 0) -#endif - error = VOP_READDIR(vp, &uio, td->td_ucred, eofflag, - NULL, NULL); - if (error) - return (error); - - *off = uio.uio_offset; - - *cpos = dirbuf; - *len = (dirbuflen - uio.uio_resid); - } - - dp = (struct dirent *)(*cpos); - reclen = dp->d_reclen; - *dpp = dp; - - /* check for malformed directory.. */ - if (reclen < DIRENT_MINSIZE) - return (EINVAL); - - *cpos += reclen; - *len -= reclen; - - return (0); -} - static int vps_suspend_modevent(module_t mod, int type, void *data) { From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 18:32:26 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 57E46848; Wed, 23 Oct 2013 18:32:26 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 360A323F8; Wed, 23 Oct 2013 18:32:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NIWQg4093497; Wed, 23 Oct 2013 18:32:26 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NIWP0H093494; Wed, 23 Oct 2013 18:32:25 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231832.r9NIWP0H093494@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 18:32:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257000 - projects/vps/sys/vps X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 18:32:26 -0000 Author: will Date: Wed Oct 23 18:32:25 2013 New Revision: 257000 URL: http://svnweb.freebsd.org/changeset/base/257000 Log: Sync with svn.7he.at/vps/trunk r195. r195 | klaus | 2013-07-29 06:35:25 -0600 (Mon, 29 Jul 2013) | 3 lines Added support for dumping fsid+fileid instead of path for vnodes. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/vps/vps_libdump.h projects/vps/sys/vps/vps_restore.c projects/vps/sys/vps/vps_snapst.c Modified: projects/vps/sys/vps/vps_libdump.h ============================================================================== --- projects/vps/sys/vps/vps_libdump.h Wed Oct 23 18:22:27 2013 (r256999) +++ projects/vps/sys/vps/vps_libdump.h Wed Oct 23 18:32:25 2013 (r257000) @@ -127,11 +127,12 @@ void vps_libdump_printheader(struct vps_ #define VPS_DUMPOBJT_KNOTE 81 #define VPS_DUMPOBJT_KEVENT 82 #define VPS_DUMPOBJT_UMTX 90 +#define VPS_DUMPOBJT_FILE_INODENUM 95 #define VPS_DUMPOBJT_PRISON 100 #define VPS_DUMPOBJT_UCRED 120 #define VPS_DUMPH_MAGIC 0xc0debabe -#define VPS_DUMPH_VERSION 0x20130719 +#define VPS_DUMPH_VERSION 0x20130729 #define VPS_DUMPH_MSB 12 #define VPS_DUMPH_LSB 21 #define VPS_DUMPH_32BIT 32 @@ -639,6 +640,12 @@ struct vps_dump_filepath { char fp_path[0]; /* always padded to 64 bit alignment */ }; +struct vps_dump_fileinodenum { + uint64 fsid; + sint32 fileid; + uint32 _pad0; +}; + struct vps_dump_pts { sint32 pt_index; sint32 pt_pgrp_id; Modified: projects/vps/sys/vps/vps_restore.c ============================================================================== --- projects/vps/sys/vps/vps_restore.c Wed Oct 23 18:22:27 2013 (r256999) +++ projects/vps/sys/vps/vps_restore.c Wed Oct 23 18:32:25 2013 (r257000) @@ -2153,6 +2153,94 @@ vps_restore_pathtovnode(struct vps_snaps return (0); } +/* EXPERIMENTAL - nfs doesn't support vfs_vget() :-( */ +VPSFUNC +static int +vps_restore_inodenumtovnode(struct vps_snapst_ctx *ctx, struct vps *vps, + struct vnode **vnp) +{ + struct vps_dump_fileinodenum *vdfi; + struct vps_dumpobj *o1; + struct mount *mp; + struct vnode *vp; + char *vpsroot; + char *mnton; + int len; + int error; + + o1 = vdo_next(ctx); + + if (o1->type != VPS_DUMPOBJT_FILE_INODENUM) + return (EINVAL); + + vdfi = (struct vps_dump_fileinodenum *)o1->data; + + DBGR("%s: fsid=%lu fileid=%d\n", __func__, vdfi->fsid, vdfi->fileid); + + DBGR("%s: vps's rootpath=[%s] vnode=%p\n", + __func__, vps->_rootpath, vps->_rootvnode); + + vpsroot = strdup(vps->_rootpath, M_TEMP); + if (vpsroot[strlen(vpsroot) - 1] == '/') + vpsroot[strlen(vpsroot) - 1] = '\0'; + len = strlen(vpsroot); + + mtx_lock(&mountlist_mtx); + TAILQ_FOREACH(mp, &mountlist, mnt_list) { + mnton = mp->mnt_stat.f_mntonname; + if (!(strncmp(vpsroot, mnton, len) == 0 && + (mnton[len] == '\0' || mnton[len] == '/'))) + continue; + + if (mp->mnt_stat.f_fsid.val[0] == vdfi->fsid) + break; + } + mtx_unlock(&mountlist_mtx); + + free(vpsroot, M_TEMP); + + if (mp == NULL) { + ERRMSG(ctx, "%s: no mount found for fsid [%16x]\n", + __func__, vdfi->fsid); + return (ENOENT); + } else + DBGR("%s: got mount=%p for fsid\n", __func__, mp); + + error = VFS_VGET(mp, vdfi->fileid, LK_SHARED | LK_RETRY, &vp); + if (error != 0) { + ERRMSG(ctx, "%s: VFS_VGET() error=%d\n", + __func__, error); + return (error); + } + + *vnp = vp; + + vref(vp); + VOP_UNLOCK(vp, 0); + + return (0); +} + +VPSFUNC +static int +vps_restore_vnode(struct vps_snapst_ctx *ctx, struct vps *vps, + struct vnode **vnp) +{ + int error; + + if (vdo_typeofnext(ctx) == VPS_DUMPOBJT_FILE_INODENUM) + error = vps_restore_inodenumtovnode(ctx, vps, vnp); + else if (vdo_typeofnext(ctx) == VPS_DUMPOBJT_FILE_PATH) + error = vps_restore_pathtovnode(ctx, vps, vnp); + else { + ERRMSG(ctx, "%s: vdo_typeofnext(ctx)=%d\n", + __func__, vdo_typeofnext(ctx)); + return (EINVAL); + } + + return (error); +} + VPSFUNC static int vps_restore_file_vnode(struct vps_snapst_ctx *ctx, struct vps *vps, @@ -2650,17 +2738,17 @@ vps_restore_fdset(struct vps_snapst_ctx cfd = curthread->td_proc->p_fd; if (vdfd->fd_have_cdir != 0) { - if ((error = vps_restore_pathtovnode(ctx, vps, + if ((error = vps_restore_vnode(ctx, vps, &p->p_fd->fd_cdir))) return (error); } if (vdfd->fd_have_rdir != 0) { - if ((error = vps_restore_pathtovnode(ctx, vps, + if ((error = vps_restore_vnode(ctx, vps, &p->p_fd->fd_rdir))) return (error); } if (vdfd->fd_have_jdir != 0) { - if ((error = vps_restore_pathtovnode(ctx, vps, + if ((error = vps_restore_vnode(ctx, vps, &p->p_fd->fd_jdir))) return (error); } @@ -3589,7 +3677,7 @@ vps_restore_proc_one(struct vps_snapst_c /* ktrace */ if (vdp->p_have_tracevp) { - if ((error = vps_restore_pathtovnode(ctx, vps, + if ((error = vps_restore_vnode(ctx, vps, &np->p_tracevp))) goto out; /* @@ -3608,7 +3696,7 @@ vps_restore_proc_one(struct vps_snapst_c /* textvp */ if (vdp->p_have_textvp) { - if ((error = vps_restore_pathtovnode(ctx, vps, + if ((error = vps_restore_vnode(ctx, vps, &np->p_textvp))) goto out; DBGR("%s: p_textvp: path [...] got vnode %p\n", @@ -4387,7 +4475,7 @@ vps_restore_prison_one(struct vps_snapst */ strlcpy(npr->pr_path, vdpr->pr_path, sizeof(vdpr->pr_path)); - if ((error = vps_restore_pathtovnode(ctx, vps, + if ((error = vps_restore_vnode(ctx, vps, &npr->pr_root))) return (error); Modified: projects/vps/sys/vps/vps_snapst.c ============================================================================== --- projects/vps/sys/vps/vps_snapst.c Wed Oct 23 18:22:27 2013 (r256999) +++ projects/vps/sys/vps/vps_snapst.c Wed Oct 23 18:32:25 2013 (r257000) @@ -652,7 +652,7 @@ vps_snapshot(struct vps_dev_ctx *dev_ctx VPSFUNC static int vps_snapshot_vnodepath(struct vps_snapst_ctx *ctx, struct vps *vps, - struct vnode *vp, int howalloc) + struct vnode *vp, int howalloc) { struct vps_dumpobj *o1; struct vps_dump_filepath *vdfp; @@ -667,10 +667,11 @@ vps_snapshot_vnodepath(struct vps_snapst if (vp == NULL) return (0); - vref(vp); howalloc &= (M_WAITOK|M_NOWAIT); if (howalloc == 0) return (EINVAL); + + vref(vp); buf = malloc(MAXPATHLEN, M_TEMP, howalloc|M_ZERO); if (buf == NULL) { vrele(vp); @@ -734,6 +735,91 @@ vps_snapshot_vnodepath(struct vps_snapst return (0); } +VPSFUNC +static int +vps_snapshot_vnodeinodenum(struct vps_snapst_ctx *ctx, struct vps *vps, + struct vnode *vp, int howalloc) +{ + struct vps_dump_fileinodenum *vdfi; + struct vps_dumpobj *o1; + struct vattr vattr; + int error; + + if (vp == NULL) + return (0); + + howalloc &= (M_WAITOK|M_NOWAIT); + if (howalloc == 0) + return (EINVAL); + + vref(vp); + vn_lock(vp, LK_SHARED | LK_RETRY); + error = VOP_GETATTR(vp, &vattr, curthread->td_ucred); + VOP_UNLOCK(vp, 0); + + if (error != 0) { + DBGS("%s: vnode=%p VOP_GETATTR(): error=%d\n", + __func__, vp, error); + vrele(vp); + return (error); + } + + DBGS("%s: vnode=%p fsid=%u fileid=%ld error=%d\n", + __func__, vp, vattr.va_fsid, vattr.va_fileid, error); + + o1 = vdo_create(ctx, VPS_DUMPOBJT_FILE_INODENUM, howalloc); + if (o1 == NULL) { + vrele(vp); + return (ENOMEM); + } + if ((vdfi = vdo_space(ctx, sizeof(*vdfi), howalloc)) == NULL) { + vdo_discard(ctx, o1); + vrele(vp); + return (ENOMEM); + } + + vdfi->fsid = vattr.va_fsid; + vdfi->fileid = vattr.va_fileid; + + vdo_close(ctx); + vrele(vp); + + return (0); +} + +/* + * EXPERIMENTAL: + * Depending of kind of filesystem choose whether we snapshot + * a path to the vnode (unreliable and sometimes slow) or + * the inode number (aka file id). + */ +VPSFUNC +static int +vps_snapshot_vnode(struct vps_snapst_ctx *ctx, struct vps *vps, + struct vnode *vp, int howalloc) +{ + int error; + + if (vp == NULL) + return (0); + + vref(vp); + + /* + nfs doesn't support vfs_vget() + if (!strcmp(vp->v_tag, "newnfs")) { + */ + if (0) { + error = vps_snapshot_vnodeinodenum(ctx, vps, vp, howalloc); + } else { + error = vps_snapshot_vnodepath(ctx, vps, vp, howalloc); + } + + vrele(vp); + + return (error); +} + /* * Pseudo teletype device. */ @@ -1602,9 +1688,9 @@ vps_snapshot_prison_one(struct vps_snaps pr->pr_ref++; prison_unlock(pr); - if ((error = vps_snapshot_vnodepath(ctx, vps, rootvp, M_WAITOK))) { + if ((error = vps_snapshot_vnode(ctx, vps, rootvp, M_WAITOK))) { vrele(rootvp); - DBGS("%s: vps_snapshot_vnodepath: %d\n", __func__, error); + DBGS("%s: vps_snapshot_vnode: %d\n", __func__, error); goto out; } vrele(rootvp); @@ -1726,7 +1812,7 @@ vps_snapshot_proc(struct vps_snapst_ctx sizeof(sess->s_login)); if (sess->s_ttyvp) - vps_snapshot_vnodepath(ctx, vps, + vps_snapshot_vnode(ctx, vps, sess->s_ttyvp, M_WAITOK); vdo_close(ctx); @@ -2129,7 +2215,7 @@ vps_snapshot_socket_unix(struct vps_snap if (un_pcb->unp_vnode != NULL) { vdunpcb->unp_have_vnode = 1; /* - if ((error = vps_snapshot_vnodepath(ctx, vps, + if ((error = vps_snapshot_vnode(ctx, vps, un_pcb->unp_vnode, M_NOWAIT))) goto drop; */ @@ -2521,13 +2607,13 @@ vps_snapshot_fdset(struct vps_snapst_ctx vdo_space(ctx, sizeof(vdfd->fd_entries[0]) * vdfd->fd_nfiles, M_WAITOK); - if ((error = vps_snapshot_vnodepath(ctx, vps, fdp->fd_cdir, + if ((error = vps_snapshot_vnode(ctx, vps, fdp->fd_cdir, M_WAITOK))) goto out; - if ((error = vps_snapshot_vnodepath(ctx, vps, fdp->fd_rdir, + if ((error = vps_snapshot_vnode(ctx, vps, fdp->fd_rdir, M_WAITOK))) goto out; - if ((error = vps_snapshot_vnodepath(ctx, vps, fdp->fd_jdir, + if ((error = vps_snapshot_vnode(ctx, vps, fdp->fd_jdir, M_WAITOK))) goto out; @@ -2575,9 +2661,9 @@ vps_snapshot_fdset(struct vps_snapst_ctx do refer to a vnode ? */ if (fp->f_vnode == NULL) break; - if ((error = vps_snapshot_vnodepath(ctx, vps, + if ((error = vps_snapshot_vnode(ctx, vps, fp->f_vnode, M_WAITOK))) { - ERRMSG(ctx, "%s: vps_snapshot_vnodepath(): " + ERRMSG(ctx, "%s: vps_snapshot_vnode(): " "%d\n", __func__, error); goto out; } @@ -2975,7 +3061,7 @@ vps_snapshot_vmobject(struct vps_snapst_ goto out; } #endif - error = vps_snapshot_vnodepath(ctx, vps, vp, + error = vps_snapshot_vnode(ctx, vps, vp, M_WAITOK); if (error != 0) { vdo_discard(ctx, o1); @@ -3438,7 +3524,7 @@ vps_snapshot_proc_one(struct vps_snapst_ /* ktrace */ if (p->p_tracevp != NULL) { - if ((error = vps_snapshot_vnodepath(ctx, vps, p->p_tracevp, + if ((error = vps_snapshot_vnode(ctx, vps, p->p_tracevp, M_WAITOK))) goto out; vdp->p_have_tracevp = 1; @@ -3446,7 +3532,7 @@ vps_snapshot_proc_one(struct vps_snapst_ /* Executable vnode. */ if (p->p_textvp != NULL) { - if ((error = vps_snapshot_vnodepath(ctx, vps, p->p_textvp, + if ((error = vps_snapshot_vnode(ctx, vps, p->p_textvp, M_WAITOK))) goto out; vdp->p_have_textvp = 1; From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 18:33:09 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DF917940; Wed, 23 Oct 2013 18:33:09 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CDEA32401; Wed, 23 Oct 2013 18:33:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NIX9kC093662; Wed, 23 Oct 2013 18:33:09 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NIX95g093661; Wed, 23 Oct 2013 18:33:09 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231833.r9NIX95g093661@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 18:33:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257001 - projects/vps/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 18:33:09 -0000 Author: will Date: Wed Oct 23 18:33:09 2013 New Revision: 257001 URL: http://svnweb.freebsd.org/changeset/base/257001 Log: Sync with svn.7he.at/vps/trunk r196. r196 | klaus | 2013-07-29 07:29:32 -0600 (Mon, 29 Jul 2013) | 3 lines Fixed a bug where an already deleted vps was referenced in deadlkres(). Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/kern/kern_clock.c Modified: projects/vps/sys/kern/kern_clock.c ============================================================================== --- projects/vps/sys/kern/kern_clock.c Wed Oct 23 18:32:25 2013 (r257000) +++ projects/vps/sys/kern/kern_clock.c Wed Oct 23 18:33:09 2013 (r257001) @@ -214,6 +214,7 @@ deadlkres(void) save_vps = curthread->td_vps; sx_slock(&vps_all_lock); LIST_FOREACH_SAFE(vps, &vps_head, vps_all, vps_tmp) { + vps_ref(vps, (struct ucred *)&deadlkres); sx_sunlock(&vps_all_lock); curthread->td_vps = vps; #endif /* VPS */ @@ -233,6 +234,7 @@ deadlkres(void) tryl++; pause("allproc", sleepfreq * hz); #ifdef VPS + vps_deref(vps, (struct ucred *)&deadlkres); sx_slock(&vps_all_lock); #endif /* VPS */ continue; @@ -330,6 +332,7 @@ deadlkres(void) } sx_sunlock(&V_allproc_lock); #ifdef VPS + vps_deref(vps, (struct ucred *)&deadlkres); sx_slock(&vps_all_lock); } sx_sunlock(&vps_all_lock); From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 18:34:06 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D84B2A3B; Wed, 23 Oct 2013 18:34:06 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B6C04240A; Wed, 23 Oct 2013 18:34:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NIY6tw093798; Wed, 23 Oct 2013 18:34:06 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NIY6BE093797; Wed, 23 Oct 2013 18:34:06 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231834.r9NIY6BE093797@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 18:34:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257002 - projects/vps/usr.sbin/vpsctl X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 18:34:06 -0000 Author: will Date: Wed Oct 23 18:34:06 2013 New Revision: 257002 URL: http://svnweb.freebsd.org/changeset/base/257002 Log: Sync with svn.7he.at/vps/trunk r197. r197 | klaus | 2013-07-29 08:51:41 -0600 (Mon, 29 Jul 2013) | 4 lines Implemented ''savefile'' command in vpsctl, no rsync is not needed anymore when network filesystem is used. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/usr.sbin/vpsctl/vpsctl.c Modified: projects/vps/usr.sbin/vpsctl/vpsctl.c ============================================================================== --- projects/vps/usr.sbin/vpsctl/vpsctl.c Wed Oct 23 18:33:09 2013 (r257001) +++ projects/vps/usr.sbin/vpsctl/vpsctl.c Wed Oct 23 18:34:06 2013 (r257002) @@ -147,6 +147,7 @@ int vc_arg_limit(int, char **); int vc_quota_recalc(int, char **); int vc_showdump(int, char **); int vc_console(int, char **); +int vc_savefile(int, char **); static int vc_ttyloop(int ptsmfd, const char *esc_pattern); int @@ -220,6 +221,9 @@ main(int argc, char **argv, char **envv) return (-1); rc = vc_rsync(RSYNC_MODE_SERVER, 0, 1, argv[2]); } else + if (strcmp(argv[1], "savefile") == 0) { + rc = vc_savefile(argc-2, &argv[2]); + } else if (strcmp(argv[1], "argshow") == 0) { rc = vc_arg_show(argc-2, &argv[2]); } else @@ -1293,6 +1297,8 @@ int vc_migrate(int argc, char **argv) { struct vps_conf vc; + struct statfs stf; + struct stat st; char *argv2[5]; char *host, *vps; char *fsroot; @@ -1335,21 +1341,17 @@ vc_migrate(int argc, char **argv) else fsroot = vc.fsroot; - if (1) { - struct statfs stf; - - if ((error = statfs(fsroot, &stf)) != 0) { - fprintf(stderr, "statfs([%s]): error: %s\n", - fsroot, strerror(errno)); - return (1); - } - - if (stf.f_flags & MNT_LOCAL) - cnt_rsync = 2; - else - cnt_rsync = 0; + if ((error = statfs(fsroot, &stf)) != 0) { + fprintf(stderr, "statfs([%s]): error: %s\n", + fsroot, strerror(errno)); + return (1); } + if (stf.f_flags & MNT_LOCAL) + cnt_rsync = 2; + else + cnt_rsync = 0; + if (argc > 2 && strcmp(argv[2], "norsync") == 0) cnt_rsync = 0; else if (argc > 2 && strcmp(argv[2], "onersync") == 0) @@ -1365,7 +1367,8 @@ vc_migrate(int argc, char **argv) fprintf(stderr, "done\n"); /* Always syncing config file. */ -#if 1 +#if 0 +/* Don't use rsync here ... */ fprintf(stderr, "Copying config file ... "); snprintf(cmd, sizeof(cmd), "vpsctl rsyncserver %s/\n", _PATH_CONFDIR); write(wfd, cmd, strlen(cmd)); @@ -1374,7 +1377,36 @@ vc_migrate(int argc, char **argv) fprintf(stderr, "done\n"); #else - /* XXX transfer without using rsync */ + if ((error = stat(file_n, &st)) != 0) { + fprintf(stderr, "stat([%s]): error: %s\n", + file_n, strerror(errno)); + return (1); + } + snprintf(cmd, sizeof(cmd), "vpsctl savefile %s %ld %d\n", + file_n, st.st_size, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); + write(wfd, cmd, strlen(cmd)); + /* vc_savefile() sends '\n' when ready */ + len = read(rfd, cmd, 1); + { + char file_buf[0x1000]; + int file_fd; + + /* + * Assume config file is no larger than buf and + * can be written in one go. + * XXX fix that + */ + + if ((file_fd = open(file_n, O_RDONLY)) == -1) { + fprintf(stderr, "stat([%s]): error: %s\n", + file_n, strerror(errno)); + return (1); + } + read(file_fd, file_buf, sizeof(file_buf)); + close(file_fd); + + write(wfd, file_buf, st.st_size); + } #endif /* Always create directories. */ @@ -1437,8 +1469,6 @@ vc_migrate(int argc, char **argv) vc_net_revoke(&vc); mig_did_revoke = 1; - //fprintf(stderr, "Starting snapshot and remote restore ... "); - /* Start restore on other side ... */ snprintf(cmd, sizeof(cmd), "vpsctl restore %s - remote\n", vps); write(wfd, cmd, strlen(cmd)); @@ -2924,6 +2954,70 @@ vc_showdump(int argc, char **argv) return (0); } +int +vc_savefile(int argc, char **argv) +{ + char buf[0x1000]; + char *path; + long size; + long done; + int mode; + int fd; + int rc; + + if (argc < 3) + return (1); + + size = atoi(argv[1]); + if (size < 1) + return (1); + + path = argv[0]; + if (strlen(path) == 0) + return (1); + + mode = atoi(argv[2]); + + write(1, "\n", 1); + + if ((fd = open(path, O_CREAT|O_TRUNC|O_WRONLY)) == -1) { + fprintf(stderr, "open([%s], O_CREAT|O_TRUNC): error: %s\n", + path, strerror(errno)); + return (1); + } + + if (fchmod(fd, mode) == -1) { + fprintf(stderr, "fchmod(%d, %d): error: %s\n", + fd, mode, strerror(errno)); + close(fd); + return (1); + } + + done = 0; + while (done < size) { + rc = size-done; + if (rc > sizeof(buf)) + rc = sizeof(buf); + rc = read(0, buf, rc); + if (rc == -1) { + fprintf(stderr, "read(0, ...): error: %s\n", + strerror(errno)); + close(fd); + return (-1); + } + done += rc; + rc = write(fd, buf, rc); + if (rc == -1) { + fprintf(stderr, "write(%d, ...): error: %s\n", + fd, strerror(errno)); + close(fd); + return (-1); + } + } + close(fd); + + return (0); +} static int vc_ttyloop(int ptsmfd, const char *esc_pattern) From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 18:35:07 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 89276B5D; Wed, 23 Oct 2013 18:35:07 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 773A22417; Wed, 23 Oct 2013 18:35:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NIZ7LO093965; Wed, 23 Oct 2013 18:35:07 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NIZ7YN093963; Wed, 23 Oct 2013 18:35:07 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231835.r9NIZ7YN093963@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 18:35:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257003 - in projects/vps/sys: kern vps X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 18:35:07 -0000 Author: will Date: Wed Oct 23 18:35:06 2013 New Revision: 257003 URL: http://svnweb.freebsd.org/changeset/base/257003 Log: Sync with svn.7he.at/vps/trunk r198. r198 | klaus | 2013-07-30 03:17:00 -0600 (Tue, 30 Jul 2013) | 4 lines Added check in deadlkres() for dead vps instances; and added locking in vps_deref() where the destroy task is initialized. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/kern/kern_clock.c projects/vps/sys/vps/vps_core.c Modified: projects/vps/sys/kern/kern_clock.c ============================================================================== --- projects/vps/sys/kern/kern_clock.c Wed Oct 23 18:34:06 2013 (r257002) +++ projects/vps/sys/kern/kern_clock.c Wed Oct 23 18:35:06 2013 (r257003) @@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$"); #include #include +#define _VPS_USER_H__ONLY_FLAGS +#include #ifdef GPROF #include @@ -214,6 +216,8 @@ deadlkres(void) save_vps = curthread->td_vps; sx_slock(&vps_all_lock); LIST_FOREACH_SAFE(vps, &vps_head, vps_all, vps_tmp) { + if (vps->vps_status == VPS_ST_DEAD) + continue; vps_ref(vps, (struct ucred *)&deadlkres); sx_sunlock(&vps_all_lock); curthread->td_vps = vps; Modified: projects/vps/sys/vps/vps_core.c ============================================================================== --- projects/vps/sys/vps/vps_core.c Wed Oct 23 18:34:06 2013 (r257002) +++ projects/vps/sys/vps/vps_core.c Wed Oct 23 18:35:06 2013 (r257003) @@ -848,6 +848,7 @@ vps_deref(struct vps *vps, struct ucred #endif if (last) { + sx_xlock(&vps->vps_lock); KASSERT(vps->vps_status == VPS_ST_DEAD, ("%s: vps=%p; released last reference but " "vps_status = %d\n", __func__, vps, vps->vps_status)); @@ -875,6 +876,7 @@ vps_deref(struct vps *vps, struct ucred vps_destroy_task, vps); taskqueue_enqueue_timeout(taskqueue_thread, &vps->vps_task, 1 * hz /* ticks */); + sx_xunlock(&vps->vps_lock); } } From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 18:36:06 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F08B1C48; Wed, 23 Oct 2013 18:36:06 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CEA13241E; Wed, 23 Oct 2013 18:36:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NIa6s5094101; Wed, 23 Oct 2013 18:36:06 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NIa6nn094098; Wed, 23 Oct 2013 18:36:06 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231836.r9NIa6nn094098@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 18:36:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257004 - in projects/vps/sys: kern vps X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 18:36:07 -0000 Author: will Date: Wed Oct 23 18:36:05 2013 New Revision: 257004 URL: http://svnweb.freebsd.org/changeset/base/257004 Log: Sync with svn.7he.at/vps/trunk r199. r199 | klaus | 2013-07-30 04:29:38 -0600 (Tue, 30 Jul 2013) | 3 lines Showing relative paths for mountpoints in vps. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/kern/vfs_syscalls.c projects/vps/sys/vps/vps2.h projects/vps/sys/vps/vps_priv.c Modified: projects/vps/sys/kern/vfs_syscalls.c ============================================================================== --- projects/vps/sys/kern/vfs_syscalls.c Wed Oct 23 18:35:06 2013 (r257003) +++ projects/vps/sys/kern/vfs_syscalls.c Wed Oct 23 18:36:05 2013 (r257004) @@ -339,9 +339,18 @@ kern_statfs(struct thread *td, char *pat error = VFS_STATFS(mp, sp); if (error) goto out; - if (priv_check(td, PRIV_VFS_GENERATION)) { +#ifdef VPS + if (td->td_ucred->cr_vps != vps0) { bcopy(sp, &sb, sizeof(sb)); sb.f_fsid.val[0] = sb.f_fsid.val[1] = 0; + vps_statfs(td->td_ucred, mp, &sb); + sp = &sb; + } +#endif + if (priv_check(td, PRIV_VFS_GENERATION)) { + if (sp != &sb) + bcopy(sp, &sb, sizeof(sb)); + sb.f_fsid.val[0] = sb.f_fsid.val[1] = 0; prison_enforce_statfs(td->td_ucred, mp, &sb); sp = &sb; } @@ -423,9 +432,18 @@ kern_fstatfs(struct thread *td, int fd, error = VFS_STATFS(mp, sp); if (error) goto out; - if (priv_check(td, PRIV_VFS_GENERATION)) { +#ifdef VPS + if (td->td_ucred->cr_vps != vps0) { bcopy(sp, &sb, sizeof(sb)); sb.f_fsid.val[0] = sb.f_fsid.val[1] = 0; + vps_statfs(td->td_ucred, mp, &sb); + sp = &sb; + } +#endif + if (priv_check(td, PRIV_VFS_GENERATION)) { + if (sp != &sb) + bcopy(sp, &sb, sizeof(sb)); + sb.f_fsid.val[0] = sb.f_fsid.val[1] = 0; prison_enforce_statfs(td->td_ucred, mp, &sb); sp = &sb; } @@ -536,9 +554,18 @@ kern_getfsstat(struct thread *td, struct vfs_unbusy(mp); continue; } - if (priv_check(td, PRIV_VFS_GENERATION)) { +#ifdef VPS + if (td->td_ucred->cr_vps != vps0) { bcopy(sp, &sb, sizeof(sb)); sb.f_fsid.val[0] = sb.f_fsid.val[1] = 0; + vps_statfs(td->td_ucred, mp, &sb); + sp = &sb; + } +#endif + if (priv_check(td, PRIV_VFS_GENERATION)) { + if (sp != &sb) + bcopy(sp, &sb, sizeof(sb)); + sb.f_fsid.val[0] = sb.f_fsid.val[1] = 0; prison_enforce_statfs(td->td_ucred, mp, &sb); sp = &sb; } Modified: projects/vps/sys/vps/vps2.h ============================================================================== --- projects/vps/sys/vps/vps2.h Wed Oct 23 18:35:06 2013 (r257003) +++ projects/vps/sys/vps/vps2.h Wed Oct 23 18:36:05 2013 (r257004) @@ -162,7 +162,6 @@ int vps_free_locked(struct vps *); int vps_destroy(struct vps *); void vps_ref(struct vps *, struct ucred *); void vps_deref(struct vps *, struct ucred *); -int vps_canseemount(struct ucred *, struct mount *); int vps_devfs_ruleset_create(struct vps *vps); int vps_devfs_ruleset_destroy(struct vps *vps); @@ -219,6 +218,9 @@ int vps_ioc_getconsfd(struct vps *, stru struct in_addr; struct in6_addr; struct vps_arg_item; +struct ucred; +struct mount; +struct statfs; void vps_priv_setdefault(struct vps *, struct vps_param *); int vps_priv_setitem(struct vps *, struct vps *, struct vps_arg_item *); @@ -228,6 +230,8 @@ int vps_ip_getitemall(struct vps *, stru int vps_priv_check(struct ucred *, int); int vps_ip4_check(struct vps *, struct in_addr *, struct in_addr *); int vps_ip6_check(struct vps *, struct in6_addr *, u_int8_t); +int vps_canseemount(struct ucred *, struct mount *); +void vps_statfs(struct ucred *cred, struct mount *mp, struct statfs *sp); int vps_console_fdopen(struct cdev *, int, struct thread *, struct file *); int vps_console_init(void); Modified: projects/vps/sys/vps/vps_priv.c ============================================================================== --- projects/vps/sys/vps/vps_priv.c Wed Oct 23 18:35:06 2013 (r257003) +++ projects/vps/sys/vps/vps_priv.c Wed Oct 23 18:36:05 2013 (r257004) @@ -550,6 +550,37 @@ out: return (error); } +void +vps_statfs(struct ucred *cred, struct mount *mp, struct statfs *sp) +{ + char buf[MAXPATHLEN]; + struct vps *vps; + int len; + + vps = cred->cr_vps; + + if (vps == vps0) + return; + + if (vps->_rootpath[0] == 0) + return; + + memcpy(buf, sp->f_mntonname, sizeof(buf)); + bzero(sp->f_mntonname, sizeof(sp->f_mntonname)); + len = sizeof(buf) - strlen(vps->_rootpath); + if (len > sizeof(sp->f_mntonname)) + len = sizeof(sp->f_mntonname); + memcpy(sp->f_mntonname, buf + strlen(vps->_rootpath), len); + sp->f_mntonname[sizeof(sp->f_mntonname) - 1] = '\0'; + + if (sp->f_mntonname[0] == '\0') + /* This is the case where for the root fs. */ + strcpy(sp->f_mntonname, "/"); + + DBGCORE("%s: vps=%p [%s] --> [%s]\n", + __func__, vps, buf, sp->f_mntonname); +} + int vps_priv_setitem(struct vps *vpsp, struct vps *vps, struct vps_arg_item *item) From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 19:02:36 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5D3C13B8; Wed, 23 Oct 2013 19:02:36 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 45B3F25F0; Wed, 23 Oct 2013 19:02:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NJ2aN4004521; Wed, 23 Oct 2013 19:02:36 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NJ2VtK004496; Wed, 23 Oct 2013 19:02:31 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231902.r9NJ2VtK004496@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 19:02:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257008 - in projects/vps: . bin/ed bin/sh cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs cddl/contrib/opensolaris/cmd/dtr... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 19:02:36 -0000 Author: will Date: Wed Oct 23 19:02:26 2013 New Revision: 257008 URL: http://svnweb.freebsd.org/changeset/base/257008 Log: Sync with svn.7he.at/vps/trunk r200. Merge changes 251649:253795 from svn.freebsd.org/base/head/. to . Resolve merge conflict in sys/kern/kern_khelp.c: Remove vnet.h header file. r200 | klaus | 2013-07-30 10:21:26 -0600 (Tue, 30 Jul 2013) | 3 lines Updated from FreeBSD r251649 to r253795. Submitted by: Klaus P. Ohrhallinger Added: projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d.out - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d.out projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d.out - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d.out projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d.out - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d.out projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d.out - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d.out projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d.out - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d.out projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.dyn.d - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.dyn.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d.out - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d.out projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_AGG.bad.d - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_AGG.bad.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.dyn.d - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.dyn.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh.out - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh.out projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh.out - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh.out projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/types/tst.const.d - copied unchanged from r253795, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/types/tst.const.d - copied from r253795, head/contrib/apr/ - copied from r253795, head/contrib/apr-util/ projects/vps/contrib/dialog/buildlist.c - copied unchanged from r253795, head/contrib/dialog/buildlist.c projects/vps/contrib/dialog/po/an.po - copied unchanged from r253795, head/contrib/dialog/po/an.po projects/vps/contrib/dialog/po/ia.po - copied unchanged from r253795, head/contrib/dialog/po/ia.po projects/vps/contrib/dialog/rangebox.c - copied unchanged from r253795, head/contrib/dialog/rangebox.c projects/vps/contrib/dialog/samples/buildlist - copied unchanged from r253795, head/contrib/dialog/samples/buildlist projects/vps/contrib/dialog/samples/buildlist2 - copied unchanged from r253795, head/contrib/dialog/samples/buildlist2 projects/vps/contrib/dialog/samples/checklist12 - copied unchanged from r253795, head/contrib/dialog/samples/checklist12 projects/vps/contrib/dialog/samples/dft-cancel - copied unchanged from r253795, head/contrib/dialog/samples/dft-cancel projects/vps/contrib/dialog/samples/dft-extra - copied unchanged from r253795, head/contrib/dialog/samples/dft-extra projects/vps/contrib/dialog/samples/dft-help - copied unchanged from r253795, head/contrib/dialog/samples/dft-help projects/vps/contrib/dialog/samples/dft-no - copied unchanged from r253795, head/contrib/dialog/samples/dft-no projects/vps/contrib/dialog/samples/fselect0 - copied unchanged from r253795, head/contrib/dialog/samples/fselect0 projects/vps/contrib/dialog/samples/menubox12 - copied unchanged from r253795, head/contrib/dialog/samples/menubox12 projects/vps/contrib/dialog/samples/rangebox - copied unchanged from r253795, head/contrib/dialog/samples/rangebox projects/vps/contrib/dialog/samples/rangebox2 - copied unchanged from r253795, head/contrib/dialog/samples/rangebox2 projects/vps/contrib/dialog/samples/rangebox3 - copied unchanged from r253795, head/contrib/dialog/samples/rangebox3 projects/vps/contrib/dialog/samples/rangebox4 - copied unchanged from r253795, head/contrib/dialog/samples/rangebox4 projects/vps/contrib/dialog/samples/treeview - copied unchanged from r253795, head/contrib/dialog/samples/treeview projects/vps/contrib/dialog/samples/treeview2 - copied unchanged from r253795, head/contrib/dialog/samples/treeview2 projects/vps/contrib/dialog/samples/with-dquotes - copied unchanged from r253795, head/contrib/dialog/samples/with-dquotes projects/vps/contrib/dialog/samples/with-squotes - copied unchanged from r253795, head/contrib/dialog/samples/with-squotes projects/vps/contrib/dialog/treeview.c - copied unchanged from r253795, head/contrib/dialog/treeview.c projects/vps/contrib/llvm/include/llvm/DebugInfo/DWARFFormValue.h - copied unchanged from r253795, head/contrib/llvm/include/llvm/DebugInfo/DWARFFormValue.h projects/vps/contrib/llvm/include/llvm/ExecutionEngine/ObjectCache.h - copied unchanged from r253795, head/contrib/llvm/include/llvm/ExecutionEngine/ObjectCache.h projects/vps/contrib/llvm/include/llvm/Support/CBindingWrapping.h - copied unchanged from r253795, head/contrib/llvm/include/llvm/Support/CBindingWrapping.h projects/vps/contrib/llvm/include/llvm/Support/Compression.h - copied unchanged from r253795, head/contrib/llvm/include/llvm/Support/Compression.h projects/vps/contrib/llvm/lib/Support/Compression.cpp - copied unchanged from r253795, head/contrib/llvm/lib/Support/Compression.cpp projects/vps/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.cpp - copied unchanged from r253795, head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.cpp projects/vps/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.h - copied unchanged from r253795, head/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMUnwindOpAsm.h projects/vps/contrib/llvm/lib/Target/Mips/MicroMipsInstrFormats.td - copied unchanged from r253795, head/contrib/llvm/lib/Target/Mips/MicroMipsInstrFormats.td projects/vps/contrib/llvm/lib/Target/Mips/MicroMipsInstrInfo.td - copied unchanged from r253795, head/contrib/llvm/lib/Target/Mips/MicroMipsInstrInfo.td projects/vps/contrib/llvm/lib/Target/Mips/MipsModuleISelDAGToDAG.cpp - copied unchanged from r253795, head/contrib/llvm/lib/Target/Mips/MipsModuleISelDAGToDAG.cpp projects/vps/contrib/llvm/lib/Target/Mips/MipsModuleISelDAGToDAG.h - copied unchanged from r253795, head/contrib/llvm/lib/Target/Mips/MipsModuleISelDAGToDAG.h projects/vps/contrib/llvm/lib/Target/Mips/MipsOs16.cpp - copied unchanged from r253795, head/contrib/llvm/lib/Target/Mips/MipsOs16.cpp projects/vps/contrib/llvm/lib/Target/Mips/MipsOs16.h - copied unchanged from r253795, head/contrib/llvm/lib/Target/Mips/MipsOs16.h projects/vps/contrib/llvm/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp - copied unchanged from r253795, head/contrib/llvm/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp projects/vps/contrib/llvm/lib/Target/PowerPC/AsmParser/ - copied from r253795, head/contrib/llvm/lib/Target/PowerPC/AsmParser/ projects/vps/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp - copied unchanged from r253795, head/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp projects/vps/contrib/llvm/lib/Target/R600/R600Packetizer.cpp - copied unchanged from r253795, head/contrib/llvm/lib/Target/R600/R600Packetizer.cpp projects/vps/contrib/llvm/lib/Target/R600/SIDefines.h - copied unchanged from r253795, head/contrib/llvm/lib/Target/R600/SIDefines.h projects/vps/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcBaseInfo.h - copied unchanged from r253795, head/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcBaseInfo.h projects/vps/contrib/llvm/lib/Target/SystemZ/ - copied from r253795, head/contrib/llvm/lib/Target/SystemZ/ projects/vps/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp - copied unchanged from r253795, head/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp projects/vps/contrib/llvm/lib/Target/XCore/XCoreLowerThreadLocal.cpp - copied unchanged from r253795, head/contrib/llvm/lib/Target/XCore/XCoreLowerThreadLocal.cpp projects/vps/contrib/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp - copied unchanged from r253795, head/contrib/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp projects/vps/contrib/llvm/lib/Transforms/Vectorize/VecUtils.cpp - copied unchanged from r253795, head/contrib/llvm/lib/Transforms/Vectorize/VecUtils.cpp projects/vps/contrib/llvm/lib/Transforms/Vectorize/VecUtils.h - copied unchanged from r253795, head/contrib/llvm/lib/Transforms/Vectorize/VecUtils.h projects/vps/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsAArch64.def - copied unchanged from r253795, head/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsAArch64.def projects/vps/contrib/llvm/tools/clang/include/clang/Basic/CapturedStmt.h - copied unchanged from r253795, head/contrib/llvm/tools/clang/include/clang/Basic/CapturedStmt.h projects/vps/contrib/llvm/tools/clang/include/clang/Lex/MacroArgs.h - copied unchanged from r253795, head/contrib/llvm/tools/clang/include/clang/Lex/MacroArgs.h projects/vps/contrib/llvm/tools/clang/lib/Format/BreakableToken.cpp - copied unchanged from r253795, head/contrib/llvm/tools/clang/lib/Format/BreakableToken.cpp projects/vps/contrib/llvm/tools/clang/lib/Format/BreakableToken.h - copied unchanged from r253795, head/contrib/llvm/tools/clang/lib/Format/BreakableToken.h projects/vps/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.cpp - copied unchanged from r253795, head/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.cpp projects/vps/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.h - copied unchanged from r253795, head/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.h projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AllocationDiagnostics.cpp - copied unchanged from r253795, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AllocationDiagnostics.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AllocationDiagnostics.h - copied unchanged from r253795, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AllocationDiagnostics.h projects/vps/contrib/serf/ - copied from r253795, head/contrib/serf/ projects/vps/contrib/sqlite3/ - copied from r253795, head/contrib/sqlite3/ - copied from r253795, head/contrib/subversion/ projects/vps/contrib/wpa/hostapd/hlr_auc_gw.txt - copied unchanged from r253795, head/contrib/wpa/hostapd/hlr_auc_gw.txt projects/vps/contrib/wpa/hostapd/hostapd.eap_user_sqlite - copied unchanged from r253795, head/contrib/wpa/hostapd/hostapd.eap_user_sqlite projects/vps/contrib/wpa/patches/openssl-0.9.8x-tls-extensions.patch - copied unchanged from r253795, head/contrib/wpa/patches/openssl-0.9.8x-tls-extensions.patch projects/vps/contrib/wpa/src/ap/eap_user_db.c - copied unchanged from r253795, head/contrib/wpa/src/ap/eap_user_db.c projects/vps/contrib/wpa/src/ap/gas_serv.c - copied unchanged from r253795, head/contrib/wpa/src/ap/gas_serv.c projects/vps/contrib/wpa/src/ap/gas_serv.h - copied unchanged from r253795, head/contrib/wpa/src/ap/gas_serv.h projects/vps/contrib/wpa/src/ap/hs20.c - copied unchanged from r253795, head/contrib/wpa/src/ap/hs20.c projects/vps/contrib/wpa/src/ap/hs20.h - copied unchanged from r253795, head/contrib/wpa/src/ap/hs20.h projects/vps/contrib/wpa/src/ap/ieee802_11_shared.c - copied unchanged from r253795, head/contrib/wpa/src/ap/ieee802_11_shared.c projects/vps/contrib/wpa/src/ap/ieee802_11_vht.c - copied unchanged from r253795, head/contrib/wpa/src/ap/ieee802_11_vht.c projects/vps/contrib/wpa/src/ap/p2p_hostapd.c - copied unchanged from r253795, head/contrib/wpa/src/ap/p2p_hostapd.c projects/vps/contrib/wpa/src/ap/p2p_hostapd.h - copied unchanged from r253795, head/contrib/wpa/src/ap/p2p_hostapd.h projects/vps/contrib/wpa/src/ap/vlan_util.c - copied unchanged from r253795, head/contrib/wpa/src/ap/vlan_util.c projects/vps/contrib/wpa/src/ap/vlan_util.h - copied unchanged from r253795, head/contrib/wpa/src/ap/vlan_util.h projects/vps/contrib/wpa/src/ap/wnm_ap.c - copied unchanged from r253795, head/contrib/wpa/src/ap/wnm_ap.c projects/vps/contrib/wpa/src/ap/wnm_ap.h - copied unchanged from r253795, head/contrib/wpa/src/ap/wnm_ap.h projects/vps/contrib/wpa/src/common/gas.c - copied unchanged from r253795, head/contrib/wpa/src/common/gas.c projects/vps/contrib/wpa/src/common/gas.h - copied unchanged from r253795, head/contrib/wpa/src/common/gas.h projects/vps/contrib/wpa/src/crypto/aes-ccm.c - copied unchanged from r253795, head/contrib/wpa/src/crypto/aes-ccm.c projects/vps/contrib/wpa/src/crypto/aes-gcm.c - copied unchanged from r253795, head/contrib/wpa/src/crypto/aes-gcm.c projects/vps/contrib/wpa/src/crypto/random.c - copied unchanged from r253795, head/contrib/wpa/src/crypto/random.c projects/vps/contrib/wpa/src/crypto/random.h - copied unchanged from r253795, head/contrib/wpa/src/crypto/random.h projects/vps/contrib/wpa/src/crypto/sha1-prf.c - copied unchanged from r253795, head/contrib/wpa/src/crypto/sha1-prf.c projects/vps/contrib/wpa/src/crypto/sha256-prf.c - copied unchanged from r253795, head/contrib/wpa/src/crypto/sha256-prf.c projects/vps/contrib/wpa/src/crypto/sha256-tlsprf.c - copied unchanged from r253795, head/contrib/wpa/src/crypto/sha256-tlsprf.c projects/vps/contrib/wpa/src/crypto/sha256_i.h - copied unchanged from r253795, head/contrib/wpa/src/crypto/sha256_i.h projects/vps/contrib/wpa/src/drivers/driver_bsd.c - copied unchanged from r253795, head/contrib/wpa/src/drivers/driver_bsd.c projects/vps/contrib/wpa/src/drivers/driver_common.c - copied unchanged from r253795, head/contrib/wpa/src/drivers/driver_common.c projects/vps/contrib/wpa/src/drivers/driver_privsep.c - copied unchanged from r253795, head/contrib/wpa/src/drivers/driver_privsep.c projects/vps/contrib/wpa/src/eap_common/eap_pwd_common.c - copied unchanged from r253795, head/contrib/wpa/src/eap_common/eap_pwd_common.c projects/vps/contrib/wpa/src/eap_common/eap_pwd_common.h - copied unchanged from r253795, head/contrib/wpa/src/eap_common/eap_pwd_common.h projects/vps/contrib/wpa/src/eap_peer/eap_pwd.c - copied unchanged from r253795, head/contrib/wpa/src/eap_peer/eap_pwd.c projects/vps/contrib/wpa/src/eap_server/eap_server_pwd.c - copied unchanged from r253795, head/contrib/wpa/src/eap_server/eap_server_pwd.c projects/vps/contrib/wpa/src/l2_packet/l2_packet_privsep.c - copied unchanged from r253795, head/contrib/wpa/src/l2_packet/l2_packet_privsep.c projects/vps/contrib/wpa/src/p2p/ - copied from r253795, head/contrib/wpa/src/p2p/ projects/vps/contrib/wpa/src/radius/radius_das.c - copied unchanged from r253795, head/contrib/wpa/src/radius/radius_das.c projects/vps/contrib/wpa/src/radius/radius_das.h - copied unchanged from r253795, head/contrib/wpa/src/radius/radius_das.h projects/vps/contrib/wpa/src/rsn_supp/tdls.c - copied unchanged from r253795, head/contrib/wpa/src/rsn_supp/tdls.c projects/vps/contrib/wpa/src/utils/edit.c - copied unchanged from r253795, head/contrib/wpa/src/utils/edit.c projects/vps/contrib/wpa/src/utils/edit.h - copied unchanged from r253795, head/contrib/wpa/src/utils/edit.h projects/vps/contrib/wpa/src/utils/edit_readline.c - copied unchanged from r253795, head/contrib/wpa/src/utils/edit_readline.c projects/vps/contrib/wpa/src/utils/edit_simple.c - copied unchanged from r253795, head/contrib/wpa/src/utils/edit_simple.c projects/vps/contrib/wpa/src/utils/ext_password.c - copied unchanged from r253795, head/contrib/wpa/src/utils/ext_password.c projects/vps/contrib/wpa/src/utils/ext_password.h - copied unchanged from r253795, head/contrib/wpa/src/utils/ext_password.h projects/vps/contrib/wpa/src/utils/ext_password_i.h - copied unchanged from r253795, head/contrib/wpa/src/utils/ext_password_i.h projects/vps/contrib/wpa/src/utils/ext_password_test.c - copied unchanged from r253795, head/contrib/wpa/src/utils/ext_password_test.c projects/vps/contrib/wpa/src/wps/wps_attr_parse.h - copied unchanged from r253795, head/contrib/wpa/src/wps/wps_attr_parse.h projects/vps/contrib/wpa/src/wps/wps_validate.c - copied unchanged from r253795, head/contrib/wpa/src/wps/wps_validate.c projects/vps/contrib/wpa/wpa_supplicant/README-HS20 - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/README-HS20 projects/vps/contrib/wpa/wpa_supplicant/README-P2P - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/README-P2P projects/vps/contrib/wpa/wpa_supplicant/autoscan.c - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/autoscan.c projects/vps/contrib/wpa/wpa_supplicant/autoscan.h - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/autoscan.h projects/vps/contrib/wpa/wpa_supplicant/autoscan_exponential.c - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/autoscan_exponential.c projects/vps/contrib/wpa/wpa_supplicant/autoscan_periodic.c - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/autoscan_periodic.c projects/vps/contrib/wpa/wpa_supplicant/bgscan_learn.c - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/bgscan_learn.c projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.c - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.c projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.h - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.h projects/vps/contrib/wpa/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in projects/vps/contrib/wpa/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in projects/vps/contrib/wpa/wpa_supplicant/examples/dbus-listen-preq.py - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/examples/dbus-listen-preq.py projects/vps/contrib/wpa/wpa_supplicant/examples/p2p/ - copied from r253795, head/contrib/wpa/wpa_supplicant/examples/p2p/ projects/vps/contrib/wpa/wpa_supplicant/examples/p2p-action-udhcp.sh - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/examples/p2p-action-udhcp.sh projects/vps/contrib/wpa/wpa_supplicant/examples/p2p-action.sh - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/examples/p2p-action.sh projects/vps/contrib/wpa/wpa_supplicant/examples/udhcpd-p2p.conf - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/examples/udhcpd-p2p.conf projects/vps/contrib/wpa/wpa_supplicant/examples/wps-ap-cli - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/examples/wps-ap-cli projects/vps/contrib/wpa/wpa_supplicant/examples/wps-nfc.py - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/examples/wps-nfc.py projects/vps/contrib/wpa/wpa_supplicant/gas_query.c - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/gas_query.c projects/vps/contrib/wpa/wpa_supplicant/gas_query.h - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/gas_query.h projects/vps/contrib/wpa/wpa_supplicant/hs20_supplicant.c - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/hs20_supplicant.c projects/vps/contrib/wpa/wpa_supplicant/hs20_supplicant.h - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/hs20_supplicant.h projects/vps/contrib/wpa/wpa_supplicant/interworking.c - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/interworking.c projects/vps/contrib/wpa/wpa_supplicant/interworking.h - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/interworking.h projects/vps/contrib/wpa/wpa_supplicant/nfc_pw_token.c - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/nfc_pw_token.c projects/vps/contrib/wpa/wpa_supplicant/offchannel.c - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/offchannel.c projects/vps/contrib/wpa/wpa_supplicant/offchannel.h - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/offchannel.h projects/vps/contrib/wpa/wpa_supplicant/p2p_supplicant.c - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/p2p_supplicant.c projects/vps/contrib/wpa/wpa_supplicant/p2p_supplicant.h - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/p2p_supplicant.h projects/vps/contrib/wpa/wpa_supplicant/utils/ - copied from r253795, head/contrib/wpa/wpa_supplicant/utils/ projects/vps/contrib/wpa/wpa_supplicant/wifi_display.c - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/wifi_display.c projects/vps/contrib/wpa/wpa_supplicant/wifi_display.h - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/wifi_display.h projects/vps/contrib/wpa/wpa_supplicant/wnm_sta.c - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/wnm_sta.c projects/vps/contrib/wpa/wpa_supplicant/wnm_sta.h - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/wnm_sta.h projects/vps/contrib/wpa/wpa_supplicant/wpa_supplicant_conf.mk - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/wpa_supplicant_conf.mk projects/vps/contrib/wpa/wpa_supplicant/wpa_supplicant_conf.sh - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/wpa_supplicant_conf.sh projects/vps/contrib/wpa/wpa_supplicant/wpa_supplicant_template.conf - copied unchanged from r253795, head/contrib/wpa/wpa_supplicant/wpa_supplicant_template.conf projects/vps/etc/rc.d/swap - copied unchanged from r253795, head/etc/rc.d/swap projects/vps/etc/rc.d/swaplate - copied unchanged from r253795, head/etc/rc.d/swaplate projects/vps/lib/clang/include/clang/Parse/AttrExprArgs.inc - copied unchanged from r253795, head/lib/clang/include/clang/Parse/AttrExprArgs.inc projects/vps/lib/libc/libc.ldscript - copied unchanged from r253795, head/lib/libc/libc.ldscript projects/vps/lib/libusb/libusb-0.1.pc - copied unchanged from r253795, head/lib/libusb/libusb-0.1.pc projects/vps/lib/libusb/libusb-1.0.pc - copied unchanged from r253795, head/lib/libusb/libusb-1.0.pc projects/vps/lib/libusb/libusb-2.0.pc - copied unchanged from r253795, head/lib/libusb/libusb-2.0.pc projects/vps/release/release.conf.sample - copied unchanged from r253795, head/release/release.conf.sample projects/vps/release/release.sh - copied unchanged from r253795, head/release/release.sh projects/vps/sbin/mount/mount.conf.8 - copied unchanged from r253795, head/sbin/mount/mount.conf.8 projects/vps/sbin/nvmecontrol/devlist.c - copied unchanged from r253795, head/sbin/nvmecontrol/devlist.c projects/vps/sbin/nvmecontrol/firmware.c - copied unchanged from r253795, head/sbin/nvmecontrol/firmware.c projects/vps/sbin/nvmecontrol/identify.c - copied unchanged from r253795, head/sbin/nvmecontrol/identify.c projects/vps/sbin/nvmecontrol/logpage.c - copied unchanged from r253795, head/sbin/nvmecontrol/logpage.c projects/vps/sbin/nvmecontrol/nvmecontrol.h - copied unchanged from r253795, head/sbin/nvmecontrol/nvmecontrol.h projects/vps/sbin/nvmecontrol/perftest.c - copied unchanged from r253795, head/sbin/nvmecontrol/perftest.c projects/vps/sbin/nvmecontrol/reset.c - copied unchanged from r253795, head/sbin/nvmecontrol/reset.c projects/vps/share/doc/legal/realtek/ - copied from r253795, head/share/doc/legal/realtek/ projects/vps/share/man/man4/cc_cdg.4 - copied unchanged from r253795, head/share/man/man4/cc_cdg.4 projects/vps/share/man/man4/hptnr.4 - copied unchanged from r253795, head/share/man/man4/hptnr.4 projects/vps/share/man/man4/qlxge.4 - copied unchanged from r253795, head/share/man/man4/qlxge.4 projects/vps/share/man/man4/rsu.4 - copied unchanged from r253795, head/share/man/man4/rsu.4 projects/vps/share/man/man4/rsufw.4 - copied unchanged from r253795, head/share/man/man4/rsufw.4 projects/vps/share/man/man9/SDT.9 - copied unchanged from r253795, head/share/man/man9/SDT.9 projects/vps/share/man/man9/vmem.9 - copied unchanged from r253795, head/share/man/man9/vmem.9 projects/vps/share/monetdef/ca_ES.UTF-8.src - copied unchanged from r253795, head/share/monetdef/ca_ES.UTF-8.src projects/vps/share/monetdef/de_AT.UTF-8.src - copied unchanged from r253795, head/share/monetdef/de_AT.UTF-8.src projects/vps/share/monetdef/de_DE.UTF-8.src - copied unchanged from r253795, head/share/monetdef/de_DE.UTF-8.src projects/vps/share/monetdef/el_GR.UTF-8.src - copied unchanged from r253795, head/share/monetdef/el_GR.UTF-8.src projects/vps/share/monetdef/es_ES.UTF-8.src - copied unchanged from r253795, head/share/monetdef/es_ES.UTF-8.src projects/vps/share/monetdef/fi_FI.UTF-8.src - copied unchanged from r253795, head/share/monetdef/fi_FI.UTF-8.src projects/vps/share/monetdef/fr_BE.UTF-8.src - copied unchanged from r253795, head/share/monetdef/fr_BE.UTF-8.src projects/vps/share/monetdef/fr_FR.UTF-8.src - copied unchanged from r253795, head/share/monetdef/fr_FR.UTF-8.src projects/vps/share/monetdef/it_IT.UTF-8.src - copied unchanged from r253795, head/share/monetdef/it_IT.UTF-8.src projects/vps/share/monetdef/nl_BE.UTF-8.src - copied unchanged from r253795, head/share/monetdef/nl_BE.UTF-8.src projects/vps/share/monetdef/nl_NL.UTF-8.src - copied unchanged from r253795, head/share/monetdef/nl_NL.UTF-8.src projects/vps/sys/arm/arm/generic_timer.c - copied unchanged from r253795, head/sys/arm/arm/generic_timer.c projects/vps/sys/arm/arm/stdatomic.c - copied unchanged from r253795, head/sys/arm/arm/stdatomic.c projects/vps/sys/arm/broadcom/bcm2835/std.bcm2835 - copied unchanged from r253795, head/sys/arm/broadcom/bcm2835/std.bcm2835 projects/vps/sys/arm/broadcom/bcm2835/std.rpi - copied unchanged from r253795, head/sys/arm/broadcom/bcm2835/std.rpi projects/vps/sys/arm/conf/ARNDALE - copied unchanged from r253795, head/sys/arm/conf/ARNDALE projects/vps/sys/arm/freescale/imx/files.imx51 - copied unchanged from r253795, head/sys/arm/freescale/imx/files.imx51 projects/vps/sys/arm/freescale/imx/std.imx51 - copied unchanged from r253795, head/sys/arm/freescale/imx/std.imx51 projects/vps/sys/arm/samsung/ - copied from r253795, head/sys/arm/samsung/ projects/vps/sys/arm/ti/am335x/am335x_usbss.c - copied unchanged from r253795, head/sys/arm/ti/am335x/am335x_usbss.c projects/vps/sys/boot/fdt/dts/bcm2835.dtsi - copied unchanged from r253795, head/sys/boot/fdt/dts/bcm2835.dtsi projects/vps/sys/boot/fdt/dts/exynos5250-arndale.dts - copied unchanged from r253795, head/sys/boot/fdt/dts/exynos5250-arndale.dts projects/vps/sys/boot/fdt/dts/exynos5250.dtsi - copied unchanged from r253795, head/sys/boot/fdt/dts/exynos5250.dtsi projects/vps/sys/boot/fdt/dts/rpi.dts - copied unchanged from r253795, head/sys/boot/fdt/dts/rpi.dts projects/vps/sys/boot/i386/gptboot/gptboot.8 - copied unchanged from r253795, head/sys/boot/i386/gptboot/gptboot.8 projects/vps/sys/cam/cam_compat.c - copied unchanged from r253795, head/sys/cam/cam_compat.c projects/vps/sys/cam/cam_compat.h - copied unchanged from r253795, head/sys/cam/cam_compat.h projects/vps/sys/contrib/dev/rsu/ - copied from r253795, head/sys/contrib/dev/rsu/ projects/vps/sys/contrib/dev/urtwn/ - copied from r253795, head/sys/contrib/dev/urtwn/ projects/vps/sys/contrib/v4l/ - copied from r253795, head/sys/contrib/v4l/ projects/vps/sys/crypto/siphash/ - copied from r253795, head/sys/crypto/siphash/ projects/vps/sys/dev/ath/if_ath_lna_div.c - copied unchanged from r253795, head/sys/dev/ath/if_ath_lna_div.c projects/vps/sys/dev/ath/if_ath_lna_div.h - copied unchanged from r253795, head/sys/dev/ath/if_ath_lna_div.h projects/vps/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu - copied unchanged from r253795, head/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu projects/vps/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu - copied unchanged from r253795, head/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu projects/vps/sys/dev/cxgbe/firmware/t5fw_cfg.txt - copied unchanged from r253795, head/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/vps/sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt - copied unchanged from r253795, head/sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt projects/vps/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt - copied unchanged from r253795, head/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt projects/vps/sys/dev/cxgbe/t4_tracer.c - copied unchanged from r253795, head/sys/dev/cxgbe/t4_tracer.c projects/vps/sys/dev/etherswitch/arswitch/arswitch_vlans.c - copied unchanged from r253795, head/sys/dev/etherswitch/arswitch/arswitch_vlans.c projects/vps/sys/dev/etherswitch/arswitch/arswitch_vlans.h - copied unchanged from r253795, head/sys/dev/etherswitch/arswitch/arswitch_vlans.h projects/vps/sys/dev/hpt27xx/hpt27xx_os_bsd.c - copied unchanged from r253795, head/sys/dev/hpt27xx/hpt27xx_os_bsd.c projects/vps/sys/dev/hpt27xx/hpt27xx_osm_bsd.c - copied unchanged from r253795, head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c projects/vps/sys/dev/hptnr/ - copied from r253795, head/sys/dev/hptnr/ projects/vps/sys/dev/ixgbe/ixgbe_dcb.c - copied unchanged from r253795, head/sys/dev/ixgbe/ixgbe_dcb.c projects/vps/sys/dev/ixgbe/ixgbe_dcb.h - copied unchanged from r253795, head/sys/dev/ixgbe/ixgbe_dcb.h projects/vps/sys/dev/ixgbe/ixgbe_dcb_82598.c - copied unchanged from r253795, head/sys/dev/ixgbe/ixgbe_dcb_82598.c projects/vps/sys/dev/ixgbe/ixgbe_dcb_82598.h - copied unchanged from r253795, head/sys/dev/ixgbe/ixgbe_dcb_82598.h projects/vps/sys/dev/ixgbe/ixgbe_dcb_82599.c - copied unchanged from r253795, head/sys/dev/ixgbe/ixgbe_dcb_82599.c projects/vps/sys/dev/ixgbe/ixgbe_dcb_82599.h - copied unchanged from r253795, head/sys/dev/ixgbe/ixgbe_dcb_82599.h projects/vps/sys/dev/mbox/ - copied from r253795, head/sys/dev/mbox/ projects/vps/sys/dev/nvme/nvme_util.c - copied unchanged from r253795, head/sys/dev/nvme/nvme_util.c projects/vps/sys/dev/qlxge/ - copied from r253795, head/sys/dev/qlxge/ projects/vps/sys/dev/random/random_adaptors.c - copied unchanged from r253795, head/sys/dev/random/random_adaptors.c projects/vps/sys/dev/random/random_adaptors.h - copied unchanged from r253795, head/sys/dev/random/random_adaptors.h projects/vps/sys/dev/usb/gadget/ - copied from r253795, head/sys/dev/usb/gadget/ projects/vps/sys/dev/usb/wlan/if_rsu.c - copied unchanged from r253795, head/sys/dev/usb/wlan/if_rsu.c projects/vps/sys/dev/usb/wlan/if_rsureg.h - copied unchanged from r253795, head/sys/dev/usb/wlan/if_rsureg.h projects/vps/sys/fs/ext2fs/ext2_hash.c - copied unchanged from r253795, head/sys/fs/ext2fs/ext2_hash.c projects/vps/sys/fs/ext2fs/ext2_htree.c - copied unchanged from r253795, head/sys/fs/ext2fs/ext2_htree.c projects/vps/sys/fs/ext2fs/htree.h - copied unchanged from r253795, head/sys/fs/ext2fs/htree.h projects/vps/sys/kern/subr_vmem.c - copied unchanged from r253795, head/sys/kern/subr_vmem.c projects/vps/sys/libkern/flsll.c - copied unchanged from r253795, head/sys/libkern/flsll.c projects/vps/sys/mips/atheros/ar934x_chip.c - copied unchanged from r253795, head/sys/mips/atheros/ar934x_chip.c projects/vps/sys/mips/atheros/ar934x_chip.h - copied unchanged from r253795, head/sys/mips/atheros/ar934x_chip.h projects/vps/sys/mips/atheros/ar934xreg.h - copied unchanged from r253795, head/sys/mips/atheros/ar934xreg.h projects/vps/sys/mips/conf/AR934X_BASE - copied unchanged from r253795, head/sys/mips/conf/AR934X_BASE projects/vps/sys/mips/conf/AR934X_BASE.hints - copied unchanged from r253795, head/sys/mips/conf/AR934X_BASE.hints projects/vps/sys/mips/conf/DB120 - copied unchanged from r253795, head/sys/mips/conf/DB120 projects/vps/sys/mips/conf/DB120.hints - copied unchanged from r253795, head/sys/mips/conf/DB120.hints projects/vps/sys/mips/conf/ENH200 - copied unchanged from r253795, head/sys/mips/conf/ENH200 projects/vps/sys/mips/conf/ENH200.hints - copied unchanged from r253795, head/sys/mips/conf/ENH200.hints projects/vps/sys/modules/cc/cc_cdg/ - copied from r253795, head/sys/modules/cc/cc_cdg/ projects/vps/sys/modules/cxgbe/t5_firmware/ - copied from r253795, head/sys/modules/cxgbe/t5_firmware/ projects/vps/sys/modules/hptnr/ - copied from r253795, head/sys/modules/hptnr/ projects/vps/sys/modules/padlock_rng/ - copied from r253795, head/sys/modules/padlock_rng/ projects/vps/sys/modules/qlxge/ - copied from r253795, head/sys/modules/qlxge/ projects/vps/sys/modules/rdrand_rng/ - copied from r253795, head/sys/modules/rdrand_rng/ projects/vps/sys/modules/usb/g_audio/ - copied from r253795, head/sys/modules/usb/g_audio/ projects/vps/sys/modules/usb/g_keyboard/ - copied from r253795, head/sys/modules/usb/g_keyboard/ projects/vps/sys/modules/usb/g_modem/ - copied from r253795, head/sys/modules/usb/g_modem/ projects/vps/sys/modules/usb/g_mouse/ - copied from r253795, head/sys/modules/usb/g_mouse/ projects/vps/sys/modules/usb/rsu/ - copied from r253795, head/sys/modules/usb/rsu/ projects/vps/sys/modules/usb/rsufw/ - copied from r253795, head/sys/modules/usb/rsufw/ projects/vps/sys/modules/usb/runfw/ - copied from r253795, head/sys/modules/usb/runfw/ projects/vps/sys/modules/usb/urtwnfw/ - copied from r253795, head/sys/modules/usb/urtwnfw/ projects/vps/sys/modules/yarrow_rng/ - copied from r253795, head/sys/modules/yarrow_rng/ projects/vps/sys/netinet/cc/cc_cdg.c - copied unchanged from r253795, head/sys/netinet/cc/cc_cdg.c projects/vps/sys/sys/vmem.h - copied unchanged from r253795, head/sys/sys/vmem.h projects/vps/sys/xen/hvm.h - copied unchanged from r253795, head/sys/xen/hvm.h projects/vps/sys/xen/interface/arch-arm/ - copied from r253795, head/sys/xen/interface/arch-arm/ projects/vps/sys/xen/interface/arch-arm.h - copied unchanged from r253795, head/sys/xen/interface/arch-arm.h projects/vps/sys/xen/interface/arch-ia64/ - copied from r253795, head/sys/xen/interface/arch-ia64/ projects/vps/sys/xen/interface/io/fsif.h - copied unchanged from r253795, head/sys/xen/interface/io/fsif.h projects/vps/sys/xen/interface/io/libxenvchan.h - copied unchanged from r253795, head/sys/xen/interface/io/libxenvchan.h projects/vps/sys/xen/interface/io/usbif.h - copied unchanged from r253795, head/sys/xen/interface/io/usbif.h projects/vps/sys/xen/interface/io/vscsiif.h - copied unchanged from r253795, head/sys/xen/interface/io/vscsiif.h projects/vps/sys/xen/interface/mem_event.h - copied unchanged from r253795, head/sys/xen/interface/mem_event.h projects/vps/sys/xen/interface/tmem.h - copied unchanged from r253795, head/sys/xen/interface/tmem.h projects/vps/sys/xen/interface/xsm/ - copied from r253795, head/sys/xen/interface/xsm/ projects/vps/tools/build/options/WITHOUT_ARM_EABI - copied unchanged from r253795, head/tools/build/options/WITHOUT_ARM_EABI projects/vps/tools/build/options/WITHOUT_SVNLITE - copied unchanged from r253795, head/tools/build/options/WITHOUT_SVNLITE projects/vps/tools/build/options/WITH_GNU_PATCH - copied unchanged from r253795, head/tools/build/options/WITH_GNU_PATCH projects/vps/tools/build/options/WITH_PKGTOOLS - copied unchanged from r253795, head/tools/build/options/WITH_PKGTOOLS projects/vps/tools/build/options/WITH_SVN - copied unchanged from r253795, head/tools/build/options/WITH_SVN projects/vps/tools/regression/bin/sh/builtins/local2.0 - copied unchanged from r253795, head/tools/regression/bin/sh/builtins/local2.0 projects/vps/tools/regression/bin/sh/builtins/local3.0 - copied unchanged from r253795, head/tools/regression/bin/sh/builtins/local3.0 projects/vps/tools/regression/bin/sh/execution/int-cmd1.0 - copied unchanged from r253795, head/tools/regression/bin/sh/execution/int-cmd1.0 projects/vps/tools/tools/ath/ath_ee_9300_print/ - copied from r253795, head/tools/tools/ath/ath_ee_9300_print/ projects/vps/usr.bin/svn/ - copied from r253795, head/usr.bin/svn/ projects/vps/usr.sbin/bhyve/rtc.h - copied unchanged from r253795, head/usr.sbin/bhyve/rtc.h projects/vps/usr.sbin/bhyve/virtio.c - copied unchanged from r253795, head/usr.sbin/bhyve/virtio.c projects/vps/usr.sbin/bsdconfig/examples/browse_packages.sh - copied unchanged from r253795, head/usr.sbin/bsdconfig/examples/browse_packages.sh projects/vps/usr.sbin/bsdconfig/networking/share/services.subr - copied unchanged from r253795, head/usr.sbin/bsdconfig/networking/share/services.subr projects/vps/usr.sbin/bsdconfig/share/media/http.subr - copied unchanged from r253795, head/usr.sbin/bsdconfig/share/media/http.subr projects/vps/usr.sbin/wpa/wpa_priv/ - copied from r253795, head/usr.sbin/wpa/wpa_priv/ Directory Properties: projects/vps/contrib/apr/ (props changed) projects/vps/contrib/apr-util/ (props changed) projects/vps/contrib/subversion/ (props changed) Deleted: projects/vps/bin/sh/init.h projects/vps/bin/sh/mkinit.c projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_DYN.bad.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/man.TestTransStability.d projects/vps/contrib/cvs/ projects/vps/contrib/dialog/samples/copifuncs/admin.funcs projects/vps/contrib/dialog/samples/copifuncs/common.funcs projects/vps/contrib/dialog/samples/copifuncs/copi.funcs projects/vps/contrib/dialog/samples/copifuncs/copi.ifman1 projects/vps/contrib/dialog/samples/copifuncs/copi.ifman2 projects/vps/contrib/dialog/samples/copifuncs/copi.ifmcfg2 projects/vps/contrib/dialog/samples/copifuncs/copi.ifmcfg4 projects/vps/contrib/dialog/samples/copifuncs/copi.ifmcfg5 projects/vps/contrib/dialog/samples/copifuncs/copi.ifpoll1 projects/vps/contrib/dialog/samples/copifuncs/copi.ifpoll2 projects/vps/contrib/dialog/samples/copifuncs/copi.ifreq1 projects/vps/contrib/dialog/samples/copifuncs/copi.ifreq2 projects/vps/contrib/dialog/samples/copifuncs/copi.rcnews projects/vps/contrib/dialog/samples/copifuncs/copi.sendifm1 projects/vps/contrib/dialog/samples/copifuncs/copi.sendifm2 projects/vps/contrib/dialog/samples/copifuncs/copi.trnrc projects/vps/contrib/dialog/samples/copifuncs/copi.wheel projects/vps/contrib/dialog/samples/copifuncs/ifpatch projects/vps/contrib/dialog/samples/copismall projects/vps/contrib/dialog/samples/dselect projects/vps/contrib/dialog/samples/install/FDISK.TEST projects/vps/contrib/dialog/samples/install/makefile.in projects/vps/contrib/dialog/samples/install/setup.c projects/vps/contrib/dialog/samples/install/setup.help projects/vps/contrib/dialog/samples/valgrind.log projects/vps/contrib/llvm/include/llvm/ADT/InMemoryStruct.h projects/vps/contrib/llvm/include/llvm/Object/MachOObject.h projects/vps/contrib/llvm/lib/DebugInfo/DWARFFormValue.h projects/vps/contrib/llvm/lib/Linker/Linker.cpp projects/vps/contrib/llvm/lib/Object/MachOObject.cpp projects/vps/contrib/llvm/lib/Target/R600/AMDILPeepholeOptimizer.cpp projects/vps/contrib/llvm/tools/clang/lib/Lex/MacroArgs.h projects/vps/contrib/openbsm/m4/lt~obsolete.m4 projects/vps/contrib/smbfs/mount_smbfs/Makefile projects/vps/contrib/wpa/hostapd/.gitignore projects/vps/contrib/wpa/hostapd/Makefile projects/vps/contrib/wpa/src/Makefile projects/vps/contrib/wpa/src/ap/Makefile projects/vps/contrib/wpa/src/common/Makefile projects/vps/contrib/wpa/src/crypto/.gitignore projects/vps/contrib/wpa/src/crypto/Makefile projects/vps/contrib/wpa/src/crypto/md5-non-fips.c projects/vps/contrib/wpa/src/drivers/.gitignore projects/vps/contrib/wpa/src/drivers/Makefile projects/vps/contrib/wpa/src/drivers/driver_ndiswrapper.c projects/vps/contrib/wpa/src/drivers/drivers.mak projects/vps/contrib/wpa/src/eap_common/Makefile projects/vps/contrib/wpa/src/eap_peer/Makefile projects/vps/contrib/wpa/src/eap_server/Makefile projects/vps/contrib/wpa/src/eapol_auth/Makefile projects/vps/contrib/wpa/src/eapol_supp/Makefile projects/vps/contrib/wpa/src/l2_packet/Makefile projects/vps/contrib/wpa/src/lib.rules projects/vps/contrib/wpa/src/radius/.gitignore projects/vps/contrib/wpa/src/radius/Makefile projects/vps/contrib/wpa/src/rsn_supp/Makefile projects/vps/contrib/wpa/src/tls/.gitignore projects/vps/contrib/wpa/src/tls/Makefile projects/vps/contrib/wpa/src/utils/.gitignore projects/vps/contrib/wpa/src/utils/Makefile projects/vps/contrib/wpa/src/wps/Makefile projects/vps/contrib/wpa/src/wps/wps_nfc.c projects/vps/contrib/wpa/src/wps/wps_nfc_pn531.c projects/vps/contrib/wpa/src/wps/wps_ufd.c projects/vps/contrib/wpa/wpa_supplicant/.gitignore projects/vps/contrib/wpa/wpa_supplicant/Makefile projects/vps/contrib/wpa/wpa_supplicant/dbus/.gitignore projects/vps/contrib/wpa/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service projects/vps/contrib/wpa/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service projects/vps/contrib/wpa/wpa_supplicant/doc/ projects/vps/contrib/wpa/wpa_supplicant/mlme.c projects/vps/contrib/wpa/wpa_supplicant/mlme.h projects/vps/contrib/wpa/wpa_supplicant/wpa_supplicant.nsi projects/vps/etc/rc.d/encswap projects/vps/etc/rc.d/swap1 projects/vps/gnu/usr.bin/cvs/ projects/vps/gnu/usr.bin/gdb/libgdb/frame-unwind.diff projects/vps/lib/libcompiler_rt/__sync_fetch_and_add_4.c projects/vps/lib/libcompiler_rt/__sync_fetch_and_and_4.c projects/vps/lib/libcompiler_rt/__sync_fetch_and_op_n.h projects/vps/lib/libcompiler_rt/__sync_fetch_and_or_4.c projects/vps/lib/libcompiler_rt/__sync_fetch_and_sub_4.c projects/vps/lib/libcompiler_rt/__sync_fetch_and_xor_4.c projects/vps/lib/libcompiler_rt/__sync_lock_test_and_set_4.c projects/vps/lib/libcompiler_rt/__sync_synchronize.c projects/vps/lib/libcompiler_rt/__sync_val_compare_and_swap_4.c projects/vps/lib/libcompiler_rt/__sync_val_compare_and_swap_n.h projects/vps/share/doc/psd/28.cvs/ projects/vps/share/man/man9/vfs_mount.9 projects/vps/sys/arm/freescale/imx/imx.files projects/vps/sys/arm/freescale/imx/std.imx projects/vps/sys/boot/fdt/dts/bcm2835-rpi-b.dts projects/vps/sys/compat/linux/linux_videodev.h projects/vps/sys/compat/linux/linux_videodev2.h projects/vps/sys/dev/cxgbe/firmware/t4fw-1.8.4.0.bin.uu projects/vps/sys/dev/hpt27xx/os_bsd.c projects/vps/sys/dev/hpt27xx/osm_bsd.c projects/vps/sys/modules/runfw/ projects/vps/sys/xen/interface/hvm/vmx_assist.h projects/vps/tools/build/options/WITHOUT_PKGTOOLS projects/vps/tools/build/options/WITH_ARM_EABI projects/vps/tools/build/options/WITH_BSD_PATCH projects/vps/usr.bin/systat/mbufs.c projects/vps/usr.sbin/wpa/hostapd/driver_freebsd.c projects/vps/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c Modified: projects/vps/Makefile projects/vps/Makefile.inc1 projects/vps/ObsoleteFiles.inc projects/vps/UPDATING projects/vps/bin/ed/re.c projects/vps/bin/sh/Makefile projects/vps/bin/sh/TOUR projects/vps/bin/sh/eval.c projects/vps/bin/sh/eval.h projects/vps/bin/sh/exec.c projects/vps/bin/sh/input.c projects/vps/bin/sh/input.h projects/vps/bin/sh/jobs.c projects/vps/bin/sh/main.c projects/vps/bin/sh/output.c projects/vps/bin/sh/parser.c projects/vps/bin/sh/parser.h projects/vps/bin/sh/redir.c projects/vps/bin/sh/redir.h projects/vps/bin/sh/sh.1 projects/vps/bin/sh/shell.h projects/vps/bin/sh/trap.c projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.copyin.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d projects/vps/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/vps/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/vps/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c projects/vps/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c projects/vps/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c projects/vps/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c projects/vps/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c projects/vps/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c projects/vps/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h projects/vps/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h projects/vps/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c projects/vps/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c projects/vps/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c projects/vps/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c projects/vps/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/vps/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c projects/vps/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c projects/vps/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c projects/vps/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h projects/vps/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c projects/vps/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c projects/vps/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c projects/vps/contrib/binutils/binutils/readelf.c projects/vps/contrib/binutils/include/elf/common.h projects/vps/contrib/binutils/include/elf/dwarf2.h projects/vps/contrib/bmake/parse.c projects/vps/contrib/dialog/CHANGES projects/vps/contrib/dialog/VERSION projects/vps/contrib/dialog/aclocal.m4 projects/vps/contrib/dialog/argv.c projects/vps/contrib/dialog/arrows.c projects/vps/contrib/dialog/buttons.c projects/vps/contrib/dialog/calendar.c projects/vps/contrib/dialog/checklist.c projects/vps/contrib/dialog/columns.c projects/vps/contrib/dialog/config.guess projects/vps/contrib/dialog/config.sub projects/vps/contrib/dialog/configure projects/vps/contrib/dialog/configure.in projects/vps/contrib/dialog/dialog-config.in projects/vps/contrib/dialog/dialog.1 projects/vps/contrib/dialog/dialog.3 projects/vps/contrib/dialog/dialog.c projects/vps/contrib/dialog/dialog.h projects/vps/contrib/dialog/dlg_colors.h projects/vps/contrib/dialog/dlg_keys.c projects/vps/contrib/dialog/dlg_keys.h projects/vps/contrib/dialog/editbox.c projects/vps/contrib/dialog/formbox.c projects/vps/contrib/dialog/fselect.c projects/vps/contrib/dialog/guage.c projects/vps/contrib/dialog/headers-sh.in projects/vps/contrib/dialog/help.c projects/vps/contrib/dialog/inputbox.c projects/vps/contrib/dialog/inputstr.c projects/vps/contrib/dialog/makefile.in projects/vps/contrib/dialog/menubox.c projects/vps/contrib/dialog/mixedform.c projects/vps/contrib/dialog/mixedgauge.c projects/vps/contrib/dialog/mouse.c projects/vps/contrib/dialog/mousewget.c projects/vps/contrib/dialog/msgbox.c projects/vps/contrib/dialog/package/debian/changelog projects/vps/contrib/dialog/package/dialog.spec projects/vps/contrib/dialog/pause.c projects/vps/contrib/dialog/po/cs.po projects/vps/contrib/dialog/po/el.po projects/vps/contrib/dialog/po/gl.po projects/vps/contrib/dialog/po/hr.po projects/vps/contrib/dialog/po/sr.po projects/vps/contrib/dialog/po/zh_TW.po projects/vps/contrib/dialog/prgbox.c projects/vps/contrib/dialog/progressbox.c projects/vps/contrib/dialog/rc.c projects/vps/contrib/dialog/rename.sh projects/vps/contrib/dialog/samples/README projects/vps/contrib/dialog/samples/debian.rc projects/vps/contrib/dialog/samples/dialog.py projects/vps/contrib/dialog/samples/form1 projects/vps/contrib/dialog/samples/inputmenu projects/vps/contrib/dialog/samples/inputmenu-stdout projects/vps/contrib/dialog/samples/inputmenu1 projects/vps/contrib/dialog/samples/inputmenu2 projects/vps/contrib/dialog/samples/inputmenu3 projects/vps/contrib/dialog/samples/inputmenu4 projects/vps/contrib/dialog/samples/killall projects/vps/contrib/dialog/samples/prgbox projects/vps/contrib/dialog/samples/prgbox2 projects/vps/contrib/dialog/samples/report-button projects/vps/contrib/dialog/samples/report-edit projects/vps/contrib/dialog/samples/report-string projects/vps/contrib/dialog/samples/report-tempfile projects/vps/contrib/dialog/samples/report-yesno projects/vps/contrib/dialog/samples/setup-edit projects/vps/contrib/dialog/samples/setup-tempfile projects/vps/contrib/dialog/samples/setup-utf8 projects/vps/contrib/dialog/samples/setup-vars projects/vps/contrib/dialog/samples/slackware.rc projects/vps/contrib/dialog/samples/sourcemage.rc projects/vps/contrib/dialog/samples/suse.rc projects/vps/contrib/dialog/samples/tailboxbg projects/vps/contrib/dialog/samples/tailboxbg1 projects/vps/contrib/dialog/samples/tailboxbg2 projects/vps/contrib/dialog/samples/testdata-8bit projects/vps/contrib/dialog/samples/wheel projects/vps/contrib/dialog/samples/whiptail.rc projects/vps/contrib/dialog/tailbox.c projects/vps/contrib/dialog/textbox.c projects/vps/contrib/dialog/timebox.c projects/vps/contrib/dialog/trace.c projects/vps/contrib/dialog/ui_getc.c projects/vps/contrib/dialog/util.c projects/vps/contrib/dialog/yesno.c projects/vps/contrib/gcc/config.gcc projects/vps/contrib/gcc/gthr-posix95.h projects/vps/contrib/gcc/opts.c projects/vps/contrib/gcc/unwind-dw2.c projects/vps/contrib/gdb/gdb/dwarf2read.c projects/vps/contrib/gdb/gdb/frame-unwind.c projects/vps/contrib/libc++/include/__bit_reference projects/vps/contrib/libc++/include/__config projects/vps/contrib/libc++/include/__functional_base projects/vps/contrib/libc++/include/__hash_table projects/vps/contrib/libc++/include/__locale projects/vps/contrib/libc++/include/__split_buffer projects/vps/contrib/libc++/include/__std_stream projects/vps/contrib/libc++/include/__tree projects/vps/contrib/libc++/include/algorithm projects/vps/contrib/libc++/include/atomic projects/vps/contrib/libc++/include/deque projects/vps/contrib/libc++/include/forward_list projects/vps/contrib/libc++/include/functional projects/vps/contrib/libc++/include/future projects/vps/contrib/libc++/include/istream projects/vps/contrib/libc++/include/iterator projects/vps/contrib/libc++/include/list projects/vps/contrib/libc++/include/locale projects/vps/contrib/libc++/include/map projects/vps/contrib/libc++/include/memory projects/vps/contrib/libc++/include/random projects/vps/contrib/libc++/include/regex projects/vps/contrib/libc++/include/string projects/vps/contrib/libc++/include/type_traits projects/vps/contrib/libc++/include/unordered_map projects/vps/contrib/libc++/include/utility projects/vps/contrib/libc++/include/vector projects/vps/contrib/libc++/src/debug.cpp projects/vps/contrib/libc++/src/hash.cpp projects/vps/contrib/libc++/src/iostream.cpp projects/vps/contrib/libc++/src/locale.cpp projects/vps/contrib/libc++/src/stdexcept.cpp projects/vps/contrib/libc++/src/string.cpp projects/vps/contrib/libc++/src/thread.cpp projects/vps/contrib/libcxxrt/atomic.h projects/vps/contrib/libcxxrt/auxhelper.cc projects/vps/contrib/libcxxrt/cxxabi.h projects/vps/contrib/libcxxrt/dwarf_eh.h projects/vps/contrib/libcxxrt/exception.cc projects/vps/contrib/libcxxrt/guard.cc projects/vps/contrib/libcxxrt/memory.cc projects/vps/contrib/libstdc++/include/c_std/std_cmath.h projects/vps/contrib/libstdc++/libsupc++/unwind-cxx.h projects/vps/contrib/llvm/include/llvm-c/Core.h projects/vps/contrib/llvm/include/llvm-c/ExecutionEngine.h projects/vps/contrib/llvm/include/llvm-c/Object.h projects/vps/contrib/llvm/include/llvm-c/Target.h projects/vps/contrib/llvm/include/llvm-c/TargetMachine.h projects/vps/contrib/llvm/include/llvm-c/Transforms/PassManagerBuilder.h projects/vps/contrib/llvm/include/llvm-c/Transforms/Vectorize.h projects/vps/contrib/llvm/include/llvm/ADT/ArrayRef.h projects/vps/contrib/llvm/include/llvm/ADT/DenseMap.h projects/vps/contrib/llvm/include/llvm/ADT/Hashing.h projects/vps/contrib/llvm/include/llvm/ADT/PointerIntPair.h projects/vps/contrib/llvm/include/llvm/ADT/StringRef.h projects/vps/contrib/llvm/include/llvm/ADT/Triple.h projects/vps/contrib/llvm/include/llvm/ADT/Twine.h projects/vps/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h projects/vps/contrib/llvm/include/llvm/Analysis/RegionInfo.h projects/vps/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h projects/vps/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h projects/vps/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h projects/vps/contrib/llvm/include/llvm/CodeGen/FastISel.h projects/vps/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h projects/vps/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h projects/vps/contrib/llvm/include/llvm/CodeGen/LiveInterval.h projects/vps/contrib/llvm/include/llvm/CodeGen/LiveRangeEdit.h projects/vps/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h projects/vps/contrib/llvm/include/llvm/CodeGen/MachineFunction.h projects/vps/contrib/llvm/include/llvm/CodeGen/MachineMemOperand.h projects/vps/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h projects/vps/contrib/llvm/include/llvm/CodeGen/MachineScheduler.h projects/vps/contrib/llvm/include/llvm/CodeGen/MachineTraceMetrics.h projects/vps/contrib/llvm/include/llvm/CodeGen/Passes.h projects/vps/contrib/llvm/include/llvm/CodeGen/RegAllocPBQP.h projects/vps/contrib/llvm/include/llvm/CodeGen/ScheduleDAG.h projects/vps/contrib/llvm/include/llvm/CodeGen/ScheduleDAGInstrs.h projects/vps/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h projects/vps/contrib/llvm/include/llvm/CodeGen/SelectionDAGISel.h projects/vps/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h projects/vps/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h projects/vps/contrib/llvm/include/llvm/CodeGen/ValueTypes.td projects/vps/contrib/llvm/include/llvm/DIBuilder.h projects/vps/contrib/llvm/include/llvm/DebugInfo.h projects/vps/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h projects/vps/contrib/llvm/include/llvm/ExecutionEngine/RuntimeDyld.h projects/vps/contrib/llvm/include/llvm/ExecutionEngine/SectionMemoryManager.h projects/vps/contrib/llvm/include/llvm/IR/Argument.h projects/vps/contrib/llvm/include/llvm/IR/Attributes.h projects/vps/contrib/llvm/include/llvm/IR/BasicBlock.h projects/vps/contrib/llvm/include/llvm/IR/Constants.h projects/vps/contrib/llvm/include/llvm/IR/DataLayout.h projects/vps/contrib/llvm/include/llvm/IR/DerivedTypes.h projects/vps/contrib/llvm/include/llvm/IR/GlobalValue.h projects/vps/contrib/llvm/include/llvm/IR/IRBuilder.h projects/vps/contrib/llvm/include/llvm/IR/Intrinsics.h projects/vps/contrib/llvm/include/llvm/IR/IntrinsicsMips.td projects/vps/contrib/llvm/include/llvm/IR/IntrinsicsNVVM.td projects/vps/contrib/llvm/include/llvm/IR/IntrinsicsPowerPC.td projects/vps/contrib/llvm/include/llvm/IR/LLVMContext.h projects/vps/contrib/llvm/include/llvm/IR/MDBuilder.h projects/vps/contrib/llvm/include/llvm/IR/Module.h projects/vps/contrib/llvm/include/llvm/IR/Type.h projects/vps/contrib/llvm/include/llvm/IR/Use.h projects/vps/contrib/llvm/include/llvm/IR/Value.h projects/vps/contrib/llvm/include/llvm/InitializePasses.h projects/vps/contrib/llvm/include/llvm/LinkAllPasses.h projects/vps/contrib/llvm/include/llvm/Linker.h projects/vps/contrib/llvm/include/llvm/MC/MCAsmInfo.h projects/vps/contrib/llvm/include/llvm/MC/MCAssembler.h projects/vps/contrib/llvm/include/llvm/MC/MCELFObjectWriter.h projects/vps/contrib/llvm/include/llvm/MC/MCELFStreamer.h projects/vps/contrib/llvm/include/llvm/MC/MCExpr.h projects/vps/contrib/llvm/include/llvm/MC/MCInst.h projects/vps/contrib/llvm/include/llvm/MC/MCObjectFileInfo.h projects/vps/contrib/llvm/include/llvm/MC/MCObjectStreamer.h projects/vps/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h projects/vps/contrib/llvm/include/llvm/MC/MCParser/MCParsedAsmOperand.h projects/vps/contrib/llvm/include/llvm/MC/MCSection.h projects/vps/contrib/llvm/include/llvm/MC/MCSectionCOFF.h projects/vps/contrib/llvm/include/llvm/MC/MCSectionELF.h projects/vps/contrib/llvm/include/llvm/MC/MCSectionMachO.h projects/vps/contrib/llvm/include/llvm/MC/MCStreamer.h projects/vps/contrib/llvm/include/llvm/MC/MCTargetAsmParser.h projects/vps/contrib/llvm/include/llvm/MC/MCWinCOFFObjectWriter.h projects/vps/contrib/llvm/include/llvm/MC/MachineLocation.h projects/vps/contrib/llvm/include/llvm/MC/SubtargetFeature.h projects/vps/contrib/llvm/include/llvm/Object/Binary.h projects/vps/contrib/llvm/include/llvm/Object/ELF.h projects/vps/contrib/llvm/include/llvm/Object/MachO.h projects/vps/contrib/llvm/include/llvm/Object/ObjectFile.h projects/vps/contrib/llvm/include/llvm/Object/RelocVisitor.h projects/vps/contrib/llvm/include/llvm/PassManager.h projects/vps/contrib/llvm/include/llvm/PassRegistry.h projects/vps/contrib/llvm/include/llvm/Support/CodeGen.h projects/vps/contrib/llvm/include/llvm/Support/CommandLine.h projects/vps/contrib/llvm/include/llvm/Support/ELF.h projects/vps/contrib/llvm/include/llvm/Support/Endian.h projects/vps/contrib/llvm/include/llvm/Support/Host.h projects/vps/contrib/llvm/include/llvm/Support/MemoryBuffer.h projects/vps/contrib/llvm/include/llvm/Support/PatternMatch.h projects/vps/contrib/llvm/include/llvm/Support/Program.h projects/vps/contrib/llvm/include/llvm/Support/SourceMgr.h projects/vps/contrib/llvm/include/llvm/Target/Target.td projects/vps/contrib/llvm/include/llvm/Target/TargetCallingConv.h projects/vps/contrib/llvm/include/llvm/Target/TargetInstrInfo.h projects/vps/contrib/llvm/include/llvm/Target/TargetLowering.h projects/vps/contrib/llvm/include/llvm/Target/TargetMachine.h projects/vps/contrib/llvm/include/llvm/Target/TargetOptions.h projects/vps/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td projects/vps/contrib/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h projects/vps/contrib/llvm/include/llvm/Transforms/Utils/BlackList.h projects/vps/contrib/llvm/include/llvm/Transforms/Utils/Local.h projects/vps/contrib/llvm/include/llvm/Transforms/Vectorize.h projects/vps/contrib/llvm/lib/Analysis/Analysis.cpp projects/vps/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp projects/vps/contrib/llvm/lib/Analysis/ConstantFolding.cpp projects/vps/contrib/llvm/lib/Analysis/IPA/IPA.cpp projects/vps/contrib/llvm/lib/Analysis/InstructionSimplify.cpp projects/vps/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp projects/vps/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp projects/vps/contrib/llvm/lib/Analysis/RegionInfo.cpp projects/vps/contrib/llvm/lib/Analysis/ScalarEvolution.cpp projects/vps/contrib/llvm/lib/Analysis/TypeBasedAliasAnalysis.cpp projects/vps/contrib/llvm/lib/AsmParser/LLLexer.cpp projects/vps/contrib/llvm/lib/AsmParser/LLParser.cpp projects/vps/contrib/llvm/lib/AsmParser/LLToken.h projects/vps/contrib/llvm/lib/Bitcode/Reader/BitReader.cpp projects/vps/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp projects/vps/contrib/llvm/lib/Bitcode/Writer/BitWriter.cpp projects/vps/contrib/llvm/lib/CodeGen/Analysis.cpp projects/vps/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp projects/vps/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp projects/vps/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.cpp projects/vps/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.h projects/vps/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp projects/vps/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h projects/vps/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp projects/vps/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h projects/vps/contrib/llvm/lib/CodeGen/BasicTargetTransformInfo.cpp projects/vps/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp projects/vps/contrib/llvm/lib/CodeGen/CallingConvLower.cpp projects/vps/contrib/llvm/lib/CodeGen/CodeGen.cpp projects/vps/contrib/llvm/lib/CodeGen/IfConversion.cpp projects/vps/contrib/llvm/lib/CodeGen/InlineSpiller.cpp projects/vps/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp projects/vps/contrib/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp projects/vps/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp projects/vps/contrib/llvm/lib/CodeGen/MachineBlockPlacement.cpp projects/vps/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp projects/vps/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp projects/vps/contrib/llvm/lib/CodeGen/MachineScheduler.cpp projects/vps/contrib/llvm/lib/CodeGen/MachineTraceMetrics.cpp projects/vps/contrib/llvm/lib/CodeGen/MachineVerifier.cpp projects/vps/contrib/llvm/lib/CodeGen/Passes.cpp projects/vps/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp projects/vps/contrib/llvm/lib/CodeGen/RegAllocBasic.cpp projects/vps/contrib/llvm/lib/CodeGen/RegAllocGreedy.cpp projects/vps/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp projects/vps/contrib/llvm/lib/CodeGen/RegisterScavenging.cpp projects/vps/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp projects/vps/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp projects/vps/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp projects/vps/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp projects/vps/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp projects/vps/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h projects/vps/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp projects/vps/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp projects/vps/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp projects/vps/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp projects/vps/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp projects/vps/contrib/llvm/lib/CodeGen/ShrinkWrapping.cpp projects/vps/contrib/llvm/lib/CodeGen/TargetLoweringBase.cpp projects/vps/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp projects/vps/contrib/llvm/lib/CodeGen/TargetOptionsImpl.cpp projects/vps/contrib/llvm/lib/CodeGen/TargetSchedule.cpp projects/vps/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp projects/vps/contrib/llvm/lib/DebugInfo/DWARFCompileUnit.cpp projects/vps/contrib/llvm/lib/DebugInfo/DWARFContext.cpp projects/vps/contrib/llvm/lib/DebugInfo/DWARFContext.h projects/vps/contrib/llvm/lib/DebugInfo/DWARFDebugInfoEntry.cpp projects/vps/contrib/llvm/lib/DebugInfo/DWARFDebugInfoEntry.h projects/vps/contrib/llvm/lib/DebugInfo/DWARFFormValue.cpp projects/vps/contrib/llvm/lib/ExecutionEngine/ExecutionEngine.cpp projects/vps/contrib/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp projects/vps/contrib/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp projects/vps/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp projects/vps/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJIT.h projects/vps/contrib/llvm/lib/ExecutionEngine/MCJIT/SectionMemoryManager.cpp projects/vps/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp projects/vps/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp projects/vps/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h projects/vps/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h projects/vps/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp projects/vps/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h projects/vps/contrib/llvm/lib/IR/AsmWriter.cpp projects/vps/contrib/llvm/lib/IR/AttributeImpl.h projects/vps/contrib/llvm/lib/IR/Attributes.cpp projects/vps/contrib/llvm/lib/IR/Constants.cpp projects/vps/contrib/llvm/lib/IR/ConstantsContext.h projects/vps/contrib/llvm/lib/IR/Core.cpp projects/vps/contrib/llvm/lib/IR/DIBuilder.cpp projects/vps/contrib/llvm/lib/IR/DataLayout.cpp projects/vps/contrib/llvm/lib/IR/DebugInfo.cpp projects/vps/contrib/llvm/lib/IR/Function.cpp projects/vps/contrib/llvm/lib/IR/Metadata.cpp projects/vps/contrib/llvm/lib/IR/PassManager.cpp projects/vps/contrib/llvm/lib/IR/Type.cpp projects/vps/contrib/llvm/lib/IR/Value.cpp projects/vps/contrib/llvm/lib/IR/Verifier.cpp projects/vps/contrib/llvm/lib/Linker/LinkModules.cpp projects/vps/contrib/llvm/lib/MC/MCAsmInfo.cpp projects/vps/contrib/llvm/lib/MC/MCAsmInfoCOFF.cpp projects/vps/contrib/llvm/lib/MC/MCAsmStreamer.cpp projects/vps/contrib/llvm/lib/MC/MCAssembler.cpp projects/vps/contrib/llvm/lib/MC/MCDwarf.cpp projects/vps/contrib/llvm/lib/MC/MCELFStreamer.cpp projects/vps/contrib/llvm/lib/MC/MCExpr.cpp projects/vps/contrib/llvm/lib/MC/MCMachOStreamer.cpp projects/vps/contrib/llvm/lib/MC/MCNullStreamer.cpp projects/vps/contrib/llvm/lib/MC/MCObjectFileInfo.cpp projects/vps/contrib/llvm/lib/MC/MCObjectStreamer.cpp projects/vps/contrib/llvm/lib/MC/MCParser/AsmParser.cpp projects/vps/contrib/llvm/lib/MC/MCParser/DarwinAsmParser.cpp projects/vps/contrib/llvm/lib/MC/MCParser/ELFAsmParser.cpp projects/vps/contrib/llvm/lib/MC/MCPureStreamer.cpp projects/vps/contrib/llvm/lib/MC/MCSectionCOFF.cpp projects/vps/contrib/llvm/lib/MC/MCSectionELF.cpp projects/vps/contrib/llvm/lib/MC/MCSectionMachO.cpp projects/vps/contrib/llvm/lib/MC/MCStreamer.cpp projects/vps/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp projects/vps/contrib/llvm/lib/Object/COFFObjectFile.cpp projects/vps/contrib/llvm/lib/Object/MachOObjectFile.cpp projects/vps/contrib/llvm/lib/Object/Object.cpp projects/vps/contrib/llvm/lib/Object/ObjectFile.cpp projects/vps/contrib/llvm/lib/Support/CommandLine.cpp projects/vps/contrib/llvm/lib/Support/DataExtractor.cpp projects/vps/contrib/llvm/lib/Support/FoldingSet.cpp projects/vps/contrib/llvm/lib/Support/Host.cpp projects/vps/contrib/llvm/lib/Support/LockFileManager.cpp projects/vps/contrib/llvm/lib/Support/PathV2.cpp projects/vps/contrib/llvm/lib/Support/Triple.cpp projects/vps/contrib/llvm/lib/Support/Unix/Memory.inc projects/vps/contrib/llvm/lib/Support/Unix/PathV2.inc projects/vps/contrib/llvm/lib/Support/Unix/Program.inc projects/vps/contrib/llvm/lib/Support/Unix/Signals.inc projects/vps/contrib/llvm/lib/Support/Windows/Program.inc projects/vps/contrib/llvm/lib/Support/Windows/Signals.inc projects/vps/contrib/llvm/lib/Support/YAMLParser.cpp projects/vps/contrib/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp projects/vps/contrib/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp projects/vps/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp projects/vps/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.h projects/vps/contrib/llvm/lib/Target/AArch64/AArch64InstrFormats.td projects/vps/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.td projects/vps/contrib/llvm/lib/Target/AArch64/AArch64MCInstLower.cpp projects/vps/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp projects/vps/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.h projects/vps/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp projects/vps/contrib/llvm/lib/Target/AArch64/TargetInfo/AArch64TargetInfo.cpp projects/vps/contrib/llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.cpp projects/vps/contrib/llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.h projects/vps/contrib/llvm/lib/Target/ARM/ARM.td projects/vps/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp projects/vps/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.h projects/vps/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp projects/vps/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.h projects/vps/contrib/llvm/lib/Target/ARM/ARMCallingConv.h projects/vps/contrib/llvm/lib/Target/ARM/ARMCallingConv.td projects/vps/contrib/llvm/lib/Target/ARM/ARMFastISel.cpp projects/vps/contrib/llvm/lib/Target/ARM/ARMFrameLowering.cpp projects/vps/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h projects/vps/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp projects/vps/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp projects/vps/contrib/llvm/lib/Target/ARM/ARMISelLowering.h projects/vps/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td projects/vps/contrib/llvm/lib/Target/ARM/ARMInstrNEON.td projects/vps/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td projects/vps/contrib/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp projects/vps/contrib/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h projects/vps/contrib/llvm/lib/Target/ARM/ARMSubtarget.cpp projects/vps/contrib/llvm/lib/Target/ARM/ARMSubtarget.h projects/vps/contrib/llvm/lib/Target/ARM/ARMTargetTransformInfo.cpp projects/vps/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp projects/vps/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp projects/vps/contrib/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp projects/vps/contrib/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.h projects/vps/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp projects/vps/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMUnwindOp.h projects/vps/contrib/llvm/lib/Target/ARM/Thumb1FrameLowering.cpp projects/vps/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp projects/vps/contrib/llvm/lib/Target/ARM/Thumb2SizeReduction.cpp projects/vps/contrib/llvm/lib/Target/Hexagon/Hexagon.h projects/vps/contrib/llvm/lib/Target/Hexagon/Hexagon.td projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonCFGOptimizer.cpp projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonExpandPredSpillCode.cpp projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonFrameLowering.cpp projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonHardwareLoops.cpp projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonISelDAGToDAG.cpp projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonISelLowering.cpp projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonISelLowering.h projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfo.h projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfo.td projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfoV3.td projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfoV4.td projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonMachineFunctionInfo.h projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonNewValueJump.cpp projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonPeephole.cpp projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonRemoveSZExtArgs.cpp projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonSplitTFRCondSets.cpp projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonTargetMachine.cpp projects/vps/contrib/llvm/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp projects/vps/contrib/llvm/lib/Target/MBlaze/MBlazeISelDAGToDAG.cpp projects/vps/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.td projects/vps/contrib/llvm/lib/Target/Mangler.cpp projects/vps/contrib/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp projects/vps/contrib/llvm/lib/Target/Mips/Disassembler/MipsDisassembler.cpp projects/vps/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp projects/vps/contrib/llvm/lib/Target/Mips/Mips16ISelDAGToDAG.cpp projects/vps/contrib/llvm/lib/Target/Mips/Mips16ISelDAGToDAG.h projects/vps/contrib/llvm/lib/Target/Mips/Mips16ISelLowering.cpp projects/vps/contrib/llvm/lib/Target/Mips/Mips16RegisterInfo.cpp projects/vps/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td projects/vps/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.cpp projects/vps/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp projects/vps/contrib/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp projects/vps/contrib/llvm/lib/Target/Mips/MipsDSPInstrFormats.td projects/vps/contrib/llvm/lib/Target/Mips/MipsDSPInstrInfo.td projects/vps/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp projects/vps/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp projects/vps/contrib/llvm/lib/Target/Mips/MipsISelLowering.h projects/vps/contrib/llvm/lib/Target/Mips/MipsInstrFormats.td projects/vps/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td projects/vps/contrib/llvm/lib/Target/Mips/MipsLongBranch.cpp projects/vps/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.cpp projects/vps/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.td projects/vps/contrib/llvm/lib/Target/Mips/MipsSEFrameLowering.cpp projects/vps/contrib/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp projects/vps/contrib/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.h projects/vps/contrib/llvm/lib/Target/Mips/MipsSEISelLowering.cpp projects/vps/contrib/llvm/lib/Target/Mips/MipsSEISelLowering.h projects/vps/contrib/llvm/lib/Target/Mips/MipsSEInstrInfo.cpp projects/vps/contrib/llvm/lib/Target/Mips/MipsSubtarget.cpp projects/vps/contrib/llvm/lib/Target/Mips/MipsSubtarget.h projects/vps/contrib/llvm/lib/Target/Mips/MipsTargetMachine.cpp projects/vps/contrib/llvm/lib/Target/Mips/MipsTargetMachine.h projects/vps/contrib/llvm/lib/Target/NVPTX/NVPTX.h projects/vps/contrib/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp projects/vps/contrib/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h projects/vps/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp projects/vps/contrib/llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.h projects/vps/contrib/llvm/lib/Target/NVPTX/NVPTXInstrInfo.td projects/vps/contrib/llvm/lib/Target/NVPTX/NVPTXIntrinsics.td projects/vps/contrib/llvm/lib/Target/NVPTX/NVPTXSection.h projects/vps/contrib/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp projects/vps/contrib/llvm/lib/Target/NVPTX/NVVMReflect.cpp projects/vps/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp projects/vps/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp projects/vps/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.cpp projects/vps/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h projects/vps/contrib/llvm/lib/Target/PowerPC/PPC.h projects/vps/contrib/llvm/lib/Target/PowerPC/PPC.td projects/vps/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp projects/vps/contrib/llvm/lib/Target/PowerPC/PPCBranchSelector.cpp projects/vps/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp projects/vps/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp projects/vps/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp projects/vps/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h projects/vps/contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td projects/vps/contrib/llvm/lib/Target/PowerPC/PPCInstrAltivec.td projects/vps/contrib/llvm/lib/Target/PowerPC/PPCInstrFormats.td projects/vps/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp projects/vps/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.h projects/vps/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td projects/vps/contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp projects/vps/contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.h projects/vps/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp projects/vps/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.h projects/vps/contrib/llvm/lib/Target/PowerPC/PPCScheduleA2.td projects/vps/contrib/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp projects/vps/contrib/llvm/lib/Target/R600/AMDGPU.h projects/vps/contrib/llvm/lib/Target/R600/AMDGPUAsmPrinter.cpp projects/vps/contrib/llvm/lib/Target/R600/AMDGPUAsmPrinter.h projects/vps/contrib/llvm/lib/Target/R600/AMDGPUCallingConv.td projects/vps/contrib/llvm/lib/Target/R600/AMDGPUISelLowering.h projects/vps/contrib/llvm/lib/Target/R600/AMDGPUInstructions.td projects/vps/contrib/llvm/lib/Target/R600/AMDGPUMachineFunction.cpp projects/vps/contrib/llvm/lib/Target/R600/AMDGPUSubtarget.cpp projects/vps/contrib/llvm/lib/Target/R600/AMDGPUSubtarget.h projects/vps/contrib/llvm/lib/Target/R600/AMDGPUTargetMachine.cpp projects/vps/contrib/llvm/lib/Target/R600/AMDILBase.td projects/vps/contrib/llvm/lib/Target/R600/AMDILDeviceInfo.cpp projects/vps/contrib/llvm/lib/Target/R600/AMDILISelDAGToDAG.cpp projects/vps/contrib/llvm/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.cpp projects/vps/contrib/llvm/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.h projects/vps/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp projects/vps/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp projects/vps/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp projects/vps/contrib/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h projects/vps/contrib/llvm/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp projects/vps/contrib/llvm/lib/Target/R600/Processors.td projects/vps/contrib/llvm/lib/Target/R600/R600ControlFlowFinalizer.cpp projects/vps/contrib/llvm/lib/Target/R600/R600Defines.h projects/vps/contrib/llvm/lib/Target/R600/R600ISelLowering.cpp projects/vps/contrib/llvm/lib/Target/R600/R600InstrInfo.cpp projects/vps/contrib/llvm/lib/Target/R600/R600InstrInfo.h projects/vps/contrib/llvm/lib/Target/R600/R600Instructions.td projects/vps/contrib/llvm/lib/Target/R600/R600MachineFunctionInfo.h projects/vps/contrib/llvm/lib/Target/R600/R600RegisterInfo.td projects/vps/contrib/llvm/lib/Target/R600/R600Schedule.td projects/vps/contrib/llvm/lib/Target/R600/SIISelLowering.cpp projects/vps/contrib/llvm/lib/Target/R600/SIISelLowering.h projects/vps/contrib/llvm/lib/Target/R600/SIInstrFormats.td projects/vps/contrib/llvm/lib/Target/R600/SIInstrInfo.cpp projects/vps/contrib/llvm/lib/Target/R600/SIInstrInfo.h projects/vps/contrib/llvm/lib/Target/R600/SIInstrInfo.td projects/vps/contrib/llvm/lib/Target/R600/SIInstructions.td projects/vps/contrib/llvm/lib/Target/R600/SIIntrinsics.td projects/vps/contrib/llvm/lib/Target/R600/SIRegisterInfo.td projects/vps/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCTargetDesc.cpp projects/vps/contrib/llvm/lib/Target/Sparc/SparcAsmPrinter.cpp projects/vps/contrib/llvm/lib/Target/Sparc/SparcCallingConv.td projects/vps/contrib/llvm/lib/Target/Sparc/SparcFrameLowering.cpp projects/vps/contrib/llvm/lib/Target/Sparc/SparcFrameLowering.h projects/vps/contrib/llvm/lib/Target/Sparc/SparcISelDAGToDAG.cpp projects/vps/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp projects/vps/contrib/llvm/lib/Target/Sparc/SparcISelLowering.h projects/vps/contrib/llvm/lib/Target/Sparc/SparcInstr64Bit.td projects/vps/contrib/llvm/lib/Target/Sparc/SparcInstrFormats.td projects/vps/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td projects/vps/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.cpp projects/vps/contrib/llvm/lib/Target/Sparc/SparcSubtarget.h projects/vps/contrib/llvm/lib/Target/Target.cpp projects/vps/contrib/llvm/lib/Target/TargetMachineC.cpp projects/vps/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp projects/vps/contrib/llvm/lib/Target/X86/MCTargetDesc/X86BaseInfo.h projects/vps/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp projects/vps/contrib/llvm/lib/Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp projects/vps/contrib/llvm/lib/Target/X86/X86.h projects/vps/contrib/llvm/lib/Target/X86/X86.td projects/vps/contrib/llvm/lib/Target/X86/X86CodeEmitter.cpp projects/vps/contrib/llvm/lib/Target/X86/X86FastISel.cpp projects/vps/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp projects/vps/contrib/llvm/lib/Target/X86/X86FrameLowering.h projects/vps/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp projects/vps/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/vps/contrib/llvm/lib/Target/X86/X86ISelLowering.h projects/vps/contrib/llvm/lib/Target/X86/X86InstrFormats.td projects/vps/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp projects/vps/contrib/llvm/lib/Target/X86/X86InstrInfo.td projects/vps/contrib/llvm/lib/Target/X86/X86InstrSSE.td projects/vps/contrib/llvm/lib/Target/X86/X86InstrShiftRotate.td projects/vps/contrib/llvm/lib/Target/X86/X86InstrSystem.td projects/vps/contrib/llvm/lib/Target/X86/X86SchedHaswell.td projects/vps/contrib/llvm/lib/Target/X86/X86SchedSandyBridge.td projects/vps/contrib/llvm/lib/Target/X86/X86Subtarget.cpp projects/vps/contrib/llvm/lib/Target/X86/X86Subtarget.h projects/vps/contrib/llvm/lib/Target/X86/X86TargetMachine.cpp projects/vps/contrib/llvm/lib/Target/X86/X86TargetTransformInfo.cpp projects/vps/contrib/llvm/lib/Target/XCore/Disassembler/XCoreDisassembler.cpp projects/vps/contrib/llvm/lib/Target/XCore/InstPrinter/XCoreInstPrinter.cpp projects/vps/contrib/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp projects/vps/contrib/llvm/lib/Target/XCore/XCore.h projects/vps/contrib/llvm/lib/Target/XCore/XCoreAsmPrinter.cpp projects/vps/contrib/llvm/lib/Target/XCore/XCoreISelDAGToDAG.cpp projects/vps/contrib/llvm/lib/Target/XCore/XCoreISelLowering.cpp projects/vps/contrib/llvm/lib/Target/XCore/XCoreISelLowering.h projects/vps/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.td projects/vps/contrib/llvm/lib/Target/XCore/XCoreTargetMachine.cpp projects/vps/contrib/llvm/lib/Target/XCore/XCoreTargetObjectFile.cpp projects/vps/contrib/llvm/lib/Transforms/IPO/ConstantMerge.cpp projects/vps/contrib/llvm/lib/Transforms/IPO/GlobalDCE.cpp projects/vps/contrib/llvm/lib/Transforms/IPO/GlobalOpt.cpp projects/vps/contrib/llvm/lib/Transforms/IPO/MergeFunctions.cpp projects/vps/contrib/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp projects/vps/contrib/llvm/lib/Transforms/IPO/StripSymbols.cpp projects/vps/contrib/llvm/lib/Transforms/InstCombine/InstCombine.h projects/vps/contrib/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp projects/vps/contrib/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp projects/vps/contrib/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp projects/vps/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp projects/vps/contrib/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp projects/vps/contrib/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp projects/vps/contrib/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp projects/vps/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp projects/vps/contrib/llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp projects/vps/contrib/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp projects/vps/contrib/llvm/lib/Transforms/Instrumentation/BlackList.cpp projects/vps/contrib/llvm/lib/Transforms/Instrumentation/Instrumentation.cpp projects/vps/contrib/llvm/lib/Transforms/ObjCARC/ObjCARC.cpp projects/vps/contrib/llvm/lib/Transforms/ObjCARC/ObjCARCContract.cpp projects/vps/contrib/llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp projects/vps/contrib/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp projects/vps/contrib/llvm/lib/Transforms/Scalar/GVN.cpp projects/vps/contrib/llvm/lib/Transforms/Scalar/GlobalMerge.cpp projects/vps/contrib/llvm/lib/Transforms/Scalar/LoopRotation.cpp projects/vps/contrib/llvm/lib/Transforms/Scalar/Reassociate.cpp projects/vps/contrib/llvm/lib/Transforms/Scalar/SROA.cpp projects/vps/contrib/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp projects/vps/contrib/llvm/lib/Transforms/Utils/CloneFunction.cpp projects/vps/contrib/llvm/lib/Transforms/Utils/InlineFunction.cpp projects/vps/contrib/llvm/lib/Transforms/Utils/Local.cpp projects/vps/contrib/llvm/lib/Transforms/Utils/SimplifyCFG.cpp projects/vps/contrib/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp projects/vps/contrib/llvm/lib/Transforms/Utils/Utils.cpp projects/vps/contrib/llvm/lib/Transforms/Utils/ValueMapper.cpp projects/vps/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp projects/vps/contrib/llvm/lib/Transforms/Vectorize/Vectorize.cpp projects/vps/contrib/llvm/tools/bugpoint/BugDriver.cpp projects/vps/contrib/llvm/tools/clang/include/clang-c/Index.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/ASTUnresolvedSet.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/CommentCommands.td projects/vps/contrib/llvm/tools/clang/include/clang/AST/CommentLexer.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/Decl.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/DeclBase.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/DeclFriend.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/DeclObjC.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/EvaluatedExprVisitor.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/Expr.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/ExprCXX.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/ExprObjC.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/Mangle.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/RawCommentList.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/RecursiveASTVisitor.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/Stmt.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/Type.h projects/vps/contrib/llvm/tools/clang/include/clang/AST/TypeNodes.def projects/vps/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTMatchers.h projects/vps/contrib/llvm/tools/clang/include/clang/Basic/Attr.td projects/vps/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def projects/vps/contrib/llvm/tools/clang/include/clang/Basic/Builtins.h projects/vps/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsARM.def projects/vps/contrib/llvm/tools/clang/include/clang/Basic/CommentOptions.h projects/vps/contrib/llvm/tools/clang/include/clang/Basic/DeclNodes.td projects/vps/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.h projects/vps/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticASTKinds.td projects/vps/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticCommentKinds.td projects/vps/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticDriverKinds.td projects/vps/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.td projects/vps/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td projects/vps/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticLexKinds.td projects/vps/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticOptions.def projects/vps/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticParseKinds.td projects/vps/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td projects/vps/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSerializationKinds.td projects/vps/contrib/llvm/tools/clang/include/clang/Basic/IdentifierTable.h projects/vps/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.def projects/vps/contrib/llvm/tools/clang/include/clang/Basic/OnDiskHashTable.h projects/vps/contrib/llvm/tools/clang/include/clang/Basic/SourceManager.h projects/vps/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h projects/vps/contrib/llvm/tools/clang/include/clang/Basic/StmtNodes.td projects/vps/contrib/llvm/tools/clang/include/clang/Basic/TargetBuiltins.h projects/vps/contrib/llvm/tools/clang/include/clang/Basic/TargetInfo.h projects/vps/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.def projects/vps/contrib/llvm/tools/clang/include/clang/Basic/arm_neon.td projects/vps/contrib/llvm/tools/clang/include/clang/Driver/ArgList.h projects/vps/contrib/llvm/tools/clang/include/clang/Driver/CC1Options.td projects/vps/contrib/llvm/tools/clang/include/clang/Driver/Driver.h projects/vps/contrib/llvm/tools/clang/include/clang/Driver/Options.td projects/vps/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h projects/vps/contrib/llvm/tools/clang/include/clang/Format/Format.h projects/vps/contrib/llvm/tools/clang/include/clang/Frontend/ChainedDiagnosticConsumer.h projects/vps/contrib/llvm/tools/clang/include/clang/Frontend/ChainedIncludesSource.h projects/vps/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.def projects/vps/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h projects/vps/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInstance.h projects/vps/contrib/llvm/tools/clang/include/clang/Frontend/LogDiagnosticPrinter.h projects/vps/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnosticBuffer.h projects/vps/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h projects/vps/contrib/llvm/tools/clang/include/clang/Frontend/VerifyDiagnosticConsumer.h projects/vps/contrib/llvm/tools/clang/include/clang/Lex/ModuleMap.h projects/vps/contrib/llvm/tools/clang/include/clang/Lex/PPCallbacks.h projects/vps/contrib/llvm/tools/clang/include/clang/Lex/PreprocessingRecord.h projects/vps/contrib/llvm/tools/clang/include/clang/Lex/Preprocessor.h projects/vps/contrib/llvm/tools/clang/include/clang/Parse/Parser.h projects/vps/contrib/llvm/tools/clang/include/clang/Rewrite/Frontend/FixItRewriter.h projects/vps/contrib/llvm/tools/clang/include/clang/Sema/AttributeList.h projects/vps/contrib/llvm/tools/clang/include/clang/Sema/DeclSpec.h projects/vps/contrib/llvm/tools/clang/include/clang/Sema/Initialization.h projects/vps/contrib/llvm/tools/clang/include/clang/Sema/ObjCMethodList.h projects/vps/contrib/llvm/tools/clang/include/clang/Sema/Ownership.h projects/vps/contrib/llvm/tools/clang/include/clang/Sema/ScopeInfo.h projects/vps/contrib/llvm/tools/clang/include/clang/Sema/Sema.h projects/vps/contrib/llvm/tools/clang/include/clang/Sema/Template.h projects/vps/contrib/llvm/tools/clang/include/clang/Sema/TemplateDeduction.h projects/vps/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h projects/vps/contrib/llvm/tools/clang/include/clang/Serialization/ASTReader.h projects/vps/contrib/llvm/tools/clang/include/clang/Serialization/ASTWriter.h projects/vps/contrib/llvm/tools/clang/include/clang/Serialization/GlobalModuleIndex.h projects/vps/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h projects/vps/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h projects/vps/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h projects/vps/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h projects/vps/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/CheckerManager.h projects/vps/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h projects/vps/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h projects/vps/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h projects/vps/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h projects/vps/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h projects/vps/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h projects/vps/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h projects/vps/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h projects/vps/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h projects/vps/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h projects/vps/contrib/llvm/tools/clang/lib/ARCMigrate/ARCMT.cpp projects/vps/contrib/llvm/tools/clang/lib/ARCMigrate/TransAPIUses.cpp projects/vps/contrib/llvm/tools/clang/lib/ARCMigrate/TransRetainReleaseDealloc.cpp projects/vps/contrib/llvm/tools/clang/lib/ARCMigrate/Transforms.h projects/vps/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/ASTDumper.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/ASTImporter.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/Comment.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/CommentLexer.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/CommentParser.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/Decl.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/DeclBase.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/DeclObjC.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/DeclPrinter.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/Expr.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/ExprCXX.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/ExprClassification.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/ItaniumMangle.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/MicrosoftCXXABI.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/RawCommentList.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/Stmt.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/StmtPrinter.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/StmtProfile.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/Type.cpp projects/vps/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp projects/vps/contrib/llvm/tools/clang/lib/Analysis/BodyFarm.cpp projects/vps/contrib/llvm/tools/clang/lib/Analysis/CFG.cpp projects/vps/contrib/llvm/tools/clang/lib/Analysis/ThreadSafety.cpp projects/vps/contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp projects/vps/contrib/llvm/tools/clang/lib/Basic/IdentifierTable.cpp projects/vps/contrib/llvm/tools/clang/lib/Basic/SourceManager.cpp projects/vps/contrib/llvm/tools/clang/lib/Basic/TargetInfo.cpp projects/vps/contrib/llvm/tools/clang/lib/Basic/Targets.cpp projects/vps/contrib/llvm/tools/clang/lib/Basic/Version.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGAtomic.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGBuiltin.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.h projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGClass.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGCleanup.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.h projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGDecl.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGDeclCXX.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGException.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGExprComplex.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGExprConstant.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGExprScalar.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGObjC.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGObjCMac.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGObjCRuntime.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGRTTI.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CGStmt.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.h projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.h projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.h projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.h projects/vps/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/MicrosoftCXXABI.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/ModuleBuilder.cpp projects/vps/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp projects/vps/contrib/llvm/tools/clang/lib/Driver/ArgList.cpp projects/vps/contrib/llvm/tools/clang/lib/Driver/Driver.cpp projects/vps/contrib/llvm/tools/clang/lib/Driver/SanitizerArgs.h projects/vps/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp projects/vps/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp projects/vps/contrib/llvm/tools/clang/lib/Driver/ToolChains.h projects/vps/contrib/llvm/tools/clang/lib/Driver/Tools.cpp projects/vps/contrib/llvm/tools/clang/lib/Driver/WindowsToolChain.cpp projects/vps/contrib/llvm/tools/clang/lib/Edit/EditedSource.cpp projects/vps/contrib/llvm/tools/clang/lib/Format/Format.cpp projects/vps/contrib/llvm/tools/clang/lib/Format/TokenAnnotator.cpp projects/vps/contrib/llvm/tools/clang/lib/Format/TokenAnnotator.h projects/vps/contrib/llvm/tools/clang/lib/Format/UnwrappedLineParser.cpp projects/vps/contrib/llvm/tools/clang/lib/Format/UnwrappedLineParser.h projects/vps/contrib/llvm/tools/clang/lib/Frontend/ASTMerge.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/ASTUnit.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/ChainedIncludesSource.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/CompilerInstance.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/DiagnosticRenderer.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/FrontendAction.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/InitPreprocessor.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/LogDiagnosticPrinter.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/PrintPreprocessedOutput.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/SerializedDiagnosticPrinter.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/TextDiagnostic.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticBuffer.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticPrinter.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp projects/vps/contrib/llvm/tools/clang/lib/Frontend/Warnings.cpp projects/vps/contrib/llvm/tools/clang/lib/Headers/avxintrin.h projects/vps/contrib/llvm/tools/clang/lib/Headers/emmintrin.h projects/vps/contrib/llvm/tools/clang/lib/Headers/stddef.h projects/vps/contrib/llvm/tools/clang/lib/Headers/stdint.h projects/vps/contrib/llvm/tools/clang/lib/Headers/xopintrin.h projects/vps/contrib/llvm/tools/clang/lib/Lex/Lexer.cpp projects/vps/contrib/llvm/tools/clang/lib/Lex/LiteralSupport.cpp projects/vps/contrib/llvm/tools/clang/lib/Lex/MacroArgs.cpp projects/vps/contrib/llvm/tools/clang/lib/Lex/ModuleMap.cpp projects/vps/contrib/llvm/tools/clang/lib/Lex/PPDirectives.cpp projects/vps/contrib/llvm/tools/clang/lib/Lex/PPMacroExpansion.cpp projects/vps/contrib/llvm/tools/clang/lib/Lex/Pragma.cpp projects/vps/contrib/llvm/tools/clang/lib/Lex/PreprocessingRecord.cpp projects/vps/contrib/llvm/tools/clang/lib/Lex/Preprocessor.cpp projects/vps/contrib/llvm/tools/clang/lib/Lex/TokenLexer.cpp projects/vps/contrib/llvm/tools/clang/lib/Parse/ParseCXXInlineMethods.cpp projects/vps/contrib/llvm/tools/clang/lib/Parse/ParseDecl.cpp projects/vps/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp projects/vps/contrib/llvm/tools/clang/lib/Parse/ParseExpr.cpp projects/vps/contrib/llvm/tools/clang/lib/Parse/ParseExprCXX.cpp projects/vps/contrib/llvm/tools/clang/lib/Parse/ParseInit.cpp projects/vps/contrib/llvm/tools/clang/lib/Parse/ParseObjc.cpp projects/vps/contrib/llvm/tools/clang/lib/Parse/ParsePragma.cpp projects/vps/contrib/llvm/tools/clang/lib/Parse/ParsePragma.h projects/vps/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp projects/vps/contrib/llvm/tools/clang/lib/Parse/ParseTemplate.cpp projects/vps/contrib/llvm/tools/clang/lib/Parse/ParseTentative.cpp projects/vps/contrib/llvm/tools/clang/lib/Parse/Parser.cpp projects/vps/contrib/llvm/tools/clang/lib/Rewrite/Frontend/FixItRewriter.cpp projects/vps/contrib/llvm/tools/clang/lib/Rewrite/Frontend/InclusionRewriter.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/AnalysisBasedWarnings.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/AttributeList.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/DeclSpec.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/ScopeInfo.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/Sema.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaAccess.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaCast.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaCodeComplete.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaDeclObjC.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaExceptionSpec.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaExprMember.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaExprObjC.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaLambda.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaLookup.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaObjCProperty.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaOpenMP.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaOverload.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaPseudoObject.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaStmt.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaStmtAsm.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaTemplateDeduction.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiate.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaTemplateVariadic.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp projects/vps/contrib/llvm/tools/clang/lib/Sema/TreeTransform.h projects/vps/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.cpp projects/vps/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp projects/vps/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp projects/vps/contrib/llvm/tools/clang/lib/Serialization/ASTReaderInternals.h projects/vps/contrib/llvm/tools/clang/lib/Serialization/ASTReaderStmt.cpp projects/vps/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp projects/vps/contrib/llvm/tools/clang/lib/Serialization/ASTWriterDecl.cpp projects/vps/contrib/llvm/tools/clang/lib/Serialization/ASTWriterStmt.cpp projects/vps/contrib/llvm/tools/clang/lib/Serialization/GlobalModuleIndex.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CStringChecker.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CStringSyntaxChecker.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/Checkers.td projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DeadStoresChecker.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DebugCheckers.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DynamicTypePropagation.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocSizeofChecker.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ReturnUndefChecker.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BugReporter.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CallEvent.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Environment.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineC.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/MemRegion.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ProgramState.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/RegionStore.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SVals.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleConstraintManager.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Store.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SymbolManager.cpp projects/vps/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/CheckerRegistration.cpp projects/vps/contrib/llvm/tools/clang/utils/TableGen/ClangAttrEmitter.cpp projects/vps/contrib/llvm/tools/clang/utils/TableGen/ClangCommentCommandInfoEmitter.cpp projects/vps/contrib/llvm/tools/clang/utils/TableGen/ClangDiagnosticsEmitter.cpp projects/vps/contrib/llvm/tools/clang/utils/TableGen/NeonEmitter.cpp projects/vps/contrib/llvm/tools/clang/utils/TableGen/TableGen.cpp projects/vps/contrib/llvm/tools/clang/utils/TableGen/TableGenBackends.h projects/vps/contrib/llvm/tools/llc/llc.cpp projects/vps/contrib/llvm/tools/llvm-as/llvm-as.cpp projects/vps/contrib/llvm/tools/llvm-dis/llvm-dis.cpp projects/vps/contrib/llvm/tools/llvm-extract/llvm-extract.cpp projects/vps/contrib/llvm/tools/llvm-link/llvm-link.cpp projects/vps/contrib/llvm/tools/llvm-mc/llvm-mc.cpp projects/vps/contrib/llvm/tools/llvm-objdump/MachODump.cpp projects/vps/contrib/llvm/tools/llvm-objdump/llvm-objdump.cpp projects/vps/contrib/llvm/tools/llvm-ranlib/llvm-ranlib.cpp projects/vps/contrib/llvm/tools/llvm-readobj/COFFDumper.cpp projects/vps/contrib/llvm/tools/llvm-readobj/ELFDumper.cpp projects/vps/contrib/llvm/tools/llvm-readobj/MachODumper.cpp projects/vps/contrib/llvm/tools/llvm-readobj/ObjDumper.h projects/vps/contrib/llvm/tools/llvm-readobj/llvm-readobj.cpp projects/vps/contrib/llvm/tools/llvm-readobj/llvm-readobj.h projects/vps/contrib/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp projects/vps/contrib/llvm/tools/macho-dump/macho-dump.cpp projects/vps/contrib/llvm/tools/opt/opt.cpp projects/vps/contrib/llvm/utils/TableGen/AsmMatcherEmitter.cpp projects/vps/contrib/llvm/utils/TableGen/CodeGenSchedule.cpp projects/vps/contrib/llvm/utils/TableGen/CodeGenSchedule.h projects/vps/contrib/llvm/utils/TableGen/SubtargetEmitter.cpp projects/vps/contrib/llvm/utils/TableGen/X86RecognizableInstr.cpp projects/vps/contrib/tcpdump/tcpdump.c projects/vps/contrib/tzdata/africa projects/vps/contrib/tzdata/asia projects/vps/contrib/tzdata/australasia projects/vps/contrib/tzdata/europe projects/vps/contrib/tzdata/southamerica projects/vps/contrib/tzdata/zone.tab projects/vps/contrib/wpa/COPYING projects/vps/contrib/wpa/README projects/vps/contrib/wpa/hostapd/ChangeLog projects/vps/contrib/wpa/hostapd/README projects/vps/contrib/wpa/hostapd/README-WPS projects/vps/contrib/wpa/hostapd/config_file.c (contents, props changed) projects/vps/contrib/wpa/hostapd/config_file.h (contents, props changed) projects/vps/contrib/wpa/hostapd/ctrl_iface.c (contents, props changed) projects/vps/contrib/wpa/hostapd/ctrl_iface.h (contents, props changed) projects/vps/contrib/wpa/hostapd/defconfig projects/vps/contrib/wpa/hostapd/dump_state.c (contents, props changed) projects/vps/contrib/wpa/hostapd/dump_state.h (contents, props changed) projects/vps/contrib/wpa/hostapd/eap_register.c (contents, props changed) projects/vps/contrib/wpa/hostapd/eap_register.h (contents, props changed) projects/vps/contrib/wpa/hostapd/hlr_auc_gw.c (contents, props changed) projects/vps/contrib/wpa/hostapd/hostapd.conf (contents, props changed) projects/vps/contrib/wpa/hostapd/hostapd.eap_user projects/vps/contrib/wpa/hostapd/hostapd_cli.c (contents, props changed) projects/vps/contrib/wpa/hostapd/main.c (contents, props changed) projects/vps/contrib/wpa/hostapd/nt_password_hash.c (contents, props changed) projects/vps/contrib/wpa/src/ap/accounting.c (contents, props changed) projects/vps/contrib/wpa/src/ap/accounting.h (contents, props changed) projects/vps/contrib/wpa/src/ap/ap_config.c (contents, props changed) projects/vps/contrib/wpa/src/ap/ap_config.h (contents, props changed) projects/vps/contrib/wpa/src/ap/ap_drv_ops.c (contents, props changed) projects/vps/contrib/wpa/src/ap/ap_drv_ops.h (contents, props changed) projects/vps/contrib/wpa/src/ap/ap_list.c (contents, props changed) projects/vps/contrib/wpa/src/ap/ap_list.h (contents, props changed) projects/vps/contrib/wpa/src/ap/ap_mlme.c (contents, props changed) projects/vps/contrib/wpa/src/ap/ap_mlme.h (contents, props changed) projects/vps/contrib/wpa/src/ap/authsrv.c (contents, props changed) projects/vps/contrib/wpa/src/ap/authsrv.h (contents, props changed) projects/vps/contrib/wpa/src/ap/beacon.c (contents, props changed) projects/vps/contrib/wpa/src/ap/beacon.h (contents, props changed) projects/vps/contrib/wpa/src/ap/ctrl_iface_ap.c (contents, props changed) projects/vps/contrib/wpa/src/ap/ctrl_iface_ap.h (contents, props changed) projects/vps/contrib/wpa/src/ap/drv_callbacks.c (contents, props changed) projects/vps/contrib/wpa/src/ap/hostapd.c (contents, props changed) projects/vps/contrib/wpa/src/ap/hostapd.h (contents, props changed) projects/vps/contrib/wpa/src/ap/hw_features.c (contents, props changed) projects/vps/contrib/wpa/src/ap/hw_features.h (contents, props changed) projects/vps/contrib/wpa/src/ap/iapp.c (contents, props changed) projects/vps/contrib/wpa/src/ap/iapp.h (contents, props changed) projects/vps/contrib/wpa/src/ap/ieee802_11.c (contents, props changed) projects/vps/contrib/wpa/src/ap/ieee802_11.h (contents, props changed) projects/vps/contrib/wpa/src/ap/ieee802_11_auth.c (contents, props changed) projects/vps/contrib/wpa/src/ap/ieee802_11_auth.h (contents, props changed) projects/vps/contrib/wpa/src/ap/ieee802_11_ht.c (contents, props changed) projects/vps/contrib/wpa/src/ap/ieee802_1x.c (contents, props changed) projects/vps/contrib/wpa/src/ap/ieee802_1x.h (contents, props changed) projects/vps/contrib/wpa/src/ap/peerkey_auth.c (contents, props changed) projects/vps/contrib/wpa/src/ap/pmksa_cache_auth.c (contents, props changed) projects/vps/contrib/wpa/src/ap/pmksa_cache_auth.h (contents, props changed) projects/vps/contrib/wpa/src/ap/preauth_auth.c (contents, props changed) projects/vps/contrib/wpa/src/ap/preauth_auth.h (contents, props changed) projects/vps/contrib/wpa/src/ap/sta_info.c (contents, props changed) projects/vps/contrib/wpa/src/ap/sta_info.h (contents, props changed) projects/vps/contrib/wpa/src/ap/tkip_countermeasures.c (contents, props changed) projects/vps/contrib/wpa/src/ap/tkip_countermeasures.h (contents, props changed) projects/vps/contrib/wpa/src/ap/utils.c (contents, props changed) projects/vps/contrib/wpa/src/ap/vlan_init.c (contents, props changed) projects/vps/contrib/wpa/src/ap/wmm.c (contents, props changed) projects/vps/contrib/wpa/src/ap/wpa_auth.c (contents, props changed) projects/vps/contrib/wpa/src/ap/wpa_auth.h (contents, props changed) projects/vps/contrib/wpa/src/ap/wpa_auth_ft.c (contents, props changed) projects/vps/contrib/wpa/src/ap/wpa_auth_glue.c (contents, props changed) projects/vps/contrib/wpa/src/ap/wpa_auth_glue.h (contents, props changed) projects/vps/contrib/wpa/src/ap/wpa_auth_i.h (contents, props changed) projects/vps/contrib/wpa/src/ap/wpa_auth_ie.c (contents, props changed) projects/vps/contrib/wpa/src/ap/wpa_auth_ie.h (contents, props changed) projects/vps/contrib/wpa/src/ap/wps_hostapd.c (contents, props changed) projects/vps/contrib/wpa/src/ap/wps_hostapd.h (contents, props changed) projects/vps/contrib/wpa/src/common/defs.h projects/vps/contrib/wpa/src/common/eapol_common.h projects/vps/contrib/wpa/src/common/ieee802_11_common.c projects/vps/contrib/wpa/src/common/ieee802_11_common.h projects/vps/contrib/wpa/src/common/ieee802_11_defs.h projects/vps/contrib/wpa/src/common/privsep_commands.h projects/vps/contrib/wpa/src/common/version.h projects/vps/contrib/wpa/src/common/wpa_common.c projects/vps/contrib/wpa/src/common/wpa_common.h projects/vps/contrib/wpa/src/common/wpa_ctrl.c projects/vps/contrib/wpa/src/common/wpa_ctrl.h projects/vps/contrib/wpa/src/crypto/aes-cbc.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/aes-ctr.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/aes-eax.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/aes-encblock.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/aes-internal-dec.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/aes-internal-enc.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/aes-internal.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/aes-omac1.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/aes-unwrap.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/aes-wrap.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/aes.h projects/vps/contrib/wpa/src/crypto/aes_i.h (contents, props changed) projects/vps/contrib/wpa/src/crypto/aes_wrap.h projects/vps/contrib/wpa/src/crypto/crypto.h projects/vps/contrib/wpa/src/crypto/crypto_cryptoapi.c projects/vps/contrib/wpa/src/crypto/crypto_gnutls.c projects/vps/contrib/wpa/src/crypto/crypto_internal-cipher.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/crypto_internal-modexp.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/crypto_internal-rsa.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/crypto_internal.c projects/vps/contrib/wpa/src/crypto/crypto_libtomcrypt.c projects/vps/contrib/wpa/src/crypto/crypto_none.c projects/vps/contrib/wpa/src/crypto/crypto_nss.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/crypto_openssl.c projects/vps/contrib/wpa/src/crypto/des-internal.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/des_i.h (contents, props changed) projects/vps/contrib/wpa/src/crypto/dh_group5.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/dh_group5.h (contents, props changed) projects/vps/contrib/wpa/src/crypto/dh_groups.c projects/vps/contrib/wpa/src/crypto/dh_groups.h projects/vps/contrib/wpa/src/crypto/fips_prf_cryptoapi.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/fips_prf_gnutls.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/fips_prf_internal.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/fips_prf_nss.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/fips_prf_openssl.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/md4-internal.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/md5-internal.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/md5.c projects/vps/contrib/wpa/src/crypto/md5.h projects/vps/contrib/wpa/src/crypto/md5_i.h (contents, props changed) projects/vps/contrib/wpa/src/crypto/milenage.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/milenage.h (contents, props changed) projects/vps/contrib/wpa/src/crypto/ms_funcs.c projects/vps/contrib/wpa/src/crypto/ms_funcs.h projects/vps/contrib/wpa/src/crypto/rc4.c projects/vps/contrib/wpa/src/crypto/sha1-internal.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/sha1-pbkdf2.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/sha1-tlsprf.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/sha1-tprf.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/sha1.c projects/vps/contrib/wpa/src/crypto/sha1.h projects/vps/contrib/wpa/src/crypto/sha1_i.h (contents, props changed) projects/vps/contrib/wpa/src/crypto/sha256-internal.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/sha256.c projects/vps/contrib/wpa/src/crypto/sha256.h projects/vps/contrib/wpa/src/crypto/tls.h projects/vps/contrib/wpa/src/crypto/tls_gnutls.c projects/vps/contrib/wpa/src/crypto/tls_internal.c projects/vps/contrib/wpa/src/crypto/tls_none.c projects/vps/contrib/wpa/src/crypto/tls_nss.c (contents, props changed) projects/vps/contrib/wpa/src/crypto/tls_openssl.c projects/vps/contrib/wpa/src/crypto/tls_schannel.c projects/vps/contrib/wpa/src/drivers/driver.h projects/vps/contrib/wpa/src/drivers/driver_ndis.c projects/vps/contrib/wpa/src/drivers/driver_ndis.h projects/vps/contrib/wpa/src/drivers/driver_ndis_.c projects/vps/contrib/wpa/src/drivers/driver_wired.c projects/vps/contrib/wpa/src/drivers/drivers.c projects/vps/contrib/wpa/src/drivers/ndis_events.c projects/vps/contrib/wpa/src/eap_common/chap.c projects/vps/contrib/wpa/src/eap_common/chap.h projects/vps/contrib/wpa/src/eap_common/eap_common.c projects/vps/contrib/wpa/src/eap_common/eap_common.h projects/vps/contrib/wpa/src/eap_common/eap_defs.h projects/vps/contrib/wpa/src/eap_common/eap_fast_common.c projects/vps/contrib/wpa/src/eap_common/eap_fast_common.h projects/vps/contrib/wpa/src/eap_common/eap_gpsk_common.c projects/vps/contrib/wpa/src/eap_common/eap_gpsk_common.h projects/vps/contrib/wpa/src/eap_common/eap_ikev2_common.c projects/vps/contrib/wpa/src/eap_common/eap_ikev2_common.h projects/vps/contrib/wpa/src/eap_common/eap_pax_common.c projects/vps/contrib/wpa/src/eap_common/eap_pax_common.h projects/vps/contrib/wpa/src/eap_common/eap_peap_common.c projects/vps/contrib/wpa/src/eap_common/eap_peap_common.h projects/vps/contrib/wpa/src/eap_common/eap_psk_common.c projects/vps/contrib/wpa/src/eap_common/eap_psk_common.h projects/vps/contrib/wpa/src/eap_common/eap_sake_common.c projects/vps/contrib/wpa/src/eap_common/eap_sake_common.h projects/vps/contrib/wpa/src/eap_common/eap_sim_common.c projects/vps/contrib/wpa/src/eap_common/eap_sim_common.h projects/vps/contrib/wpa/src/eap_common/eap_tlv_common.h projects/vps/contrib/wpa/src/eap_common/eap_ttls.h projects/vps/contrib/wpa/src/eap_common/eap_wsc_common.c projects/vps/contrib/wpa/src/eap_common/eap_wsc_common.h projects/vps/contrib/wpa/src/eap_common/ikev2_common.c projects/vps/contrib/wpa/src/eap_common/ikev2_common.h projects/vps/contrib/wpa/src/eap_peer/eap.c projects/vps/contrib/wpa/src/eap_peer/eap.h projects/vps/contrib/wpa/src/eap_peer/eap_aka.c projects/vps/contrib/wpa/src/eap_peer/eap_config.h projects/vps/contrib/wpa/src/eap_peer/eap_fast.c projects/vps/contrib/wpa/src/eap_peer/eap_fast_pac.c projects/vps/contrib/wpa/src/eap_peer/eap_fast_pac.h projects/vps/contrib/wpa/src/eap_peer/eap_gpsk.c projects/vps/contrib/wpa/src/eap_peer/eap_gtc.c projects/vps/contrib/wpa/src/eap_peer/eap_i.h projects/vps/contrib/wpa/src/eap_peer/eap_ikev2.c projects/vps/contrib/wpa/src/eap_peer/eap_leap.c projects/vps/contrib/wpa/src/eap_peer/eap_md5.c projects/vps/contrib/wpa/src/eap_peer/eap_methods.c projects/vps/contrib/wpa/src/eap_peer/eap_methods.h projects/vps/contrib/wpa/src/eap_peer/eap_mschapv2.c projects/vps/contrib/wpa/src/eap_peer/eap_otp.c projects/vps/contrib/wpa/src/eap_peer/eap_pax.c projects/vps/contrib/wpa/src/eap_peer/eap_peap.c projects/vps/contrib/wpa/src/eap_peer/eap_psk.c projects/vps/contrib/wpa/src/eap_peer/eap_sake.c projects/vps/contrib/wpa/src/eap_peer/eap_sim.c projects/vps/contrib/wpa/src/eap_peer/eap_tls.c projects/vps/contrib/wpa/src/eap_peer/eap_tls_common.c projects/vps/contrib/wpa/src/eap_peer/eap_tls_common.h projects/vps/contrib/wpa/src/eap_peer/eap_tnc.c projects/vps/contrib/wpa/src/eap_peer/eap_ttls.c projects/vps/contrib/wpa/src/eap_peer/eap_vendor_test.c projects/vps/contrib/wpa/src/eap_peer/eap_wsc.c projects/vps/contrib/wpa/src/eap_peer/ikev2.c projects/vps/contrib/wpa/src/eap_peer/ikev2.h projects/vps/contrib/wpa/src/eap_peer/mschapv2.c projects/vps/contrib/wpa/src/eap_peer/mschapv2.h projects/vps/contrib/wpa/src/eap_peer/tncc.c projects/vps/contrib/wpa/src/eap_peer/tncc.h projects/vps/contrib/wpa/src/eap_server/eap.h projects/vps/contrib/wpa/src/eap_server/eap_i.h projects/vps/contrib/wpa/src/eap_server/eap_methods.h projects/vps/contrib/wpa/src/eap_server/eap_server.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_aka.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_fast.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_gpsk.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_gtc.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_identity.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_ikev2.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_md5.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_methods.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_mschapv2.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_pax.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_peap.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_psk.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_sake.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_sim.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_tls.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_tls_common.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_tnc.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_ttls.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_vendor_test.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_server_wsc.c (contents, props changed) projects/vps/contrib/wpa/src/eap_server/eap_sim_db.c projects/vps/contrib/wpa/src/eap_server/eap_sim_db.h projects/vps/contrib/wpa/src/eap_server/eap_tls_common.h projects/vps/contrib/wpa/src/eap_server/ikev2.c projects/vps/contrib/wpa/src/eap_server/ikev2.h projects/vps/contrib/wpa/src/eap_server/tncs.c projects/vps/contrib/wpa/src/eap_server/tncs.h projects/vps/contrib/wpa/src/eapol_auth/eapol_auth_dump.c (contents, props changed) projects/vps/contrib/wpa/src/eapol_auth/eapol_auth_sm.c (contents, props changed) projects/vps/contrib/wpa/src/eapol_auth/eapol_auth_sm.h (contents, props changed) projects/vps/contrib/wpa/src/eapol_auth/eapol_auth_sm_i.h (contents, props changed) projects/vps/contrib/wpa/src/eapol_supp/eapol_supp_sm.c projects/vps/contrib/wpa/src/eapol_supp/eapol_supp_sm.h projects/vps/contrib/wpa/src/l2_packet/l2_packet.h projects/vps/contrib/wpa/src/l2_packet/l2_packet_freebsd.c projects/vps/contrib/wpa/src/l2_packet/l2_packet_ndis.c projects/vps/contrib/wpa/src/l2_packet/l2_packet_none.c projects/vps/contrib/wpa/src/radius/radius.c projects/vps/contrib/wpa/src/radius/radius.h projects/vps/contrib/wpa/src/radius/radius_client.c projects/vps/contrib/wpa/src/radius/radius_client.h projects/vps/contrib/wpa/src/radius/radius_server.c projects/vps/contrib/wpa/src/radius/radius_server.h projects/vps/contrib/wpa/src/rsn_supp/peerkey.c projects/vps/contrib/wpa/src/rsn_supp/peerkey.h projects/vps/contrib/wpa/src/rsn_supp/pmksa_cache.c projects/vps/contrib/wpa/src/rsn_supp/pmksa_cache.h projects/vps/contrib/wpa/src/rsn_supp/preauth.c projects/vps/contrib/wpa/src/rsn_supp/preauth.h projects/vps/contrib/wpa/src/rsn_supp/wpa.c projects/vps/contrib/wpa/src/rsn_supp/wpa.h projects/vps/contrib/wpa/src/rsn_supp/wpa_ft.c projects/vps/contrib/wpa/src/rsn_supp/wpa_i.h projects/vps/contrib/wpa/src/rsn_supp/wpa_ie.c projects/vps/contrib/wpa/src/rsn_supp/wpa_ie.h projects/vps/contrib/wpa/src/tls/asn1.c projects/vps/contrib/wpa/src/tls/asn1.h projects/vps/contrib/wpa/src/tls/bignum.c projects/vps/contrib/wpa/src/tls/bignum.h projects/vps/contrib/wpa/src/tls/libtommath.c projects/vps/contrib/wpa/src/tls/pkcs1.c (contents, props changed) projects/vps/contrib/wpa/src/tls/pkcs1.h (contents, props changed) projects/vps/contrib/wpa/src/tls/pkcs5.c (contents, props changed) projects/vps/contrib/wpa/src/tls/pkcs5.h (contents, props changed) projects/vps/contrib/wpa/src/tls/pkcs8.c (contents, props changed) projects/vps/contrib/wpa/src/tls/pkcs8.h (contents, props changed) projects/vps/contrib/wpa/src/tls/rsa.c projects/vps/contrib/wpa/src/tls/rsa.h projects/vps/contrib/wpa/src/tls/tlsv1_client.c projects/vps/contrib/wpa/src/tls/tlsv1_client.h projects/vps/contrib/wpa/src/tls/tlsv1_client_i.h projects/vps/contrib/wpa/src/tls/tlsv1_client_read.c projects/vps/contrib/wpa/src/tls/tlsv1_client_write.c projects/vps/contrib/wpa/src/tls/tlsv1_common.c projects/vps/contrib/wpa/src/tls/tlsv1_common.h projects/vps/contrib/wpa/src/tls/tlsv1_cred.c projects/vps/contrib/wpa/src/tls/tlsv1_cred.h projects/vps/contrib/wpa/src/tls/tlsv1_record.c projects/vps/contrib/wpa/src/tls/tlsv1_record.h projects/vps/contrib/wpa/src/tls/tlsv1_server.c projects/vps/contrib/wpa/src/tls/tlsv1_server.h projects/vps/contrib/wpa/src/tls/tlsv1_server_i.h projects/vps/contrib/wpa/src/tls/tlsv1_server_read.c projects/vps/contrib/wpa/src/tls/tlsv1_server_write.c projects/vps/contrib/wpa/src/tls/x509v3.c projects/vps/contrib/wpa/src/tls/x509v3.h projects/vps/contrib/wpa/src/utils/base64.c projects/vps/contrib/wpa/src/utils/base64.h projects/vps/contrib/wpa/src/utils/build_config.h projects/vps/contrib/wpa/src/utils/common.c projects/vps/contrib/wpa/src/utils/common.h projects/vps/contrib/wpa/src/utils/eloop.c projects/vps/contrib/wpa/src/utils/eloop.h projects/vps/contrib/wpa/src/utils/eloop_none.c projects/vps/contrib/wpa/src/utils/eloop_win.c projects/vps/contrib/wpa/src/utils/includes.h projects/vps/contrib/wpa/src/utils/ip_addr.c projects/vps/contrib/wpa/src/utils/ip_addr.h projects/vps/contrib/wpa/src/utils/list.h (contents, props changed) projects/vps/contrib/wpa/src/utils/os.h projects/vps/contrib/wpa/src/utils/os_internal.c projects/vps/contrib/wpa/src/utils/os_none.c projects/vps/contrib/wpa/src/utils/os_unix.c projects/vps/contrib/wpa/src/utils/os_win32.c projects/vps/contrib/wpa/src/utils/pcsc_funcs.c projects/vps/contrib/wpa/src/utils/pcsc_funcs.h projects/vps/contrib/wpa/src/utils/radiotap.h (contents, props changed) projects/vps/contrib/wpa/src/utils/radiotap_iter.h (contents, props changed) projects/vps/contrib/wpa/src/utils/state_machine.h projects/vps/contrib/wpa/src/utils/trace.c (contents, props changed) projects/vps/contrib/wpa/src/utils/trace.h (contents, props changed) projects/vps/contrib/wpa/src/utils/uuid.c projects/vps/contrib/wpa/src/utils/uuid.h projects/vps/contrib/wpa/src/utils/wpa_debug.c projects/vps/contrib/wpa/src/utils/wpa_debug.h projects/vps/contrib/wpa/src/utils/wpabuf.c projects/vps/contrib/wpa/src/utils/wpabuf.h projects/vps/contrib/wpa/src/wps/http_client.c (contents, props changed) projects/vps/contrib/wpa/src/wps/http_client.h (contents, props changed) projects/vps/contrib/wpa/src/wps/http_server.c (contents, props changed) projects/vps/contrib/wpa/src/wps/http_server.h (contents, props changed) projects/vps/contrib/wpa/src/wps/httpread.c projects/vps/contrib/wpa/src/wps/httpread.h projects/vps/contrib/wpa/src/wps/ndef.c (contents, props changed) projects/vps/contrib/wpa/src/wps/upnp_xml.c (contents, props changed) projects/vps/contrib/wpa/src/wps/upnp_xml.h (contents, props changed) projects/vps/contrib/wpa/src/wps/wps.c projects/vps/contrib/wpa/src/wps/wps.h projects/vps/contrib/wpa/src/wps/wps_attr_build.c projects/vps/contrib/wpa/src/wps/wps_attr_parse.c projects/vps/contrib/wpa/src/wps/wps_attr_process.c projects/vps/contrib/wpa/src/wps/wps_common.c projects/vps/contrib/wpa/src/wps/wps_defs.h projects/vps/contrib/wpa/src/wps/wps_dev_attr.c projects/vps/contrib/wpa/src/wps/wps_dev_attr.h projects/vps/contrib/wpa/src/wps/wps_enrollee.c projects/vps/contrib/wpa/src/wps/wps_er.c (contents, props changed) projects/vps/contrib/wpa/src/wps/wps_er.h (contents, props changed) projects/vps/contrib/wpa/src/wps/wps_er_ssdp.c (contents, props changed) projects/vps/contrib/wpa/src/wps/wps_i.h projects/vps/contrib/wpa/src/wps/wps_registrar.c projects/vps/contrib/wpa/src/wps/wps_upnp.c projects/vps/contrib/wpa/src/wps/wps_upnp.h projects/vps/contrib/wpa/src/wps/wps_upnp_ap.c (contents, props changed) projects/vps/contrib/wpa/src/wps/wps_upnp_event.c projects/vps/contrib/wpa/src/wps/wps_upnp_i.h projects/vps/contrib/wpa/src/wps/wps_upnp_ssdp.c projects/vps/contrib/wpa/src/wps/wps_upnp_web.c projects/vps/contrib/wpa/wpa_supplicant/ChangeLog projects/vps/contrib/wpa/wpa_supplicant/README projects/vps/contrib/wpa/wpa_supplicant/README-WPS projects/vps/contrib/wpa/wpa_supplicant/ap.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/ap.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/bgscan.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/bgscan.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/bgscan_simple.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/blacklist.c projects/vps/contrib/wpa/wpa_supplicant/blacklist.h projects/vps/contrib/wpa/wpa_supplicant/bss.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/bss.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/config.c projects/vps/contrib/wpa/wpa_supplicant/config.h projects/vps/contrib/wpa/wpa_supplicant/config_file.c projects/vps/contrib/wpa/wpa_supplicant/config_none.c projects/vps/contrib/wpa/wpa_supplicant/config_ssid.h projects/vps/contrib/wpa/wpa_supplicant/ctrl_iface.c projects/vps/contrib/wpa/wpa_supplicant/ctrl_iface.h projects/vps/contrib/wpa/wpa_supplicant/ctrl_iface_named_pipe.c projects/vps/contrib/wpa/wpa_supplicant/ctrl_iface_udp.c projects/vps/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c projects/vps/contrib/wpa/wpa_supplicant/dbus/Makefile (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_common.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_common.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_common_i.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_dict_helpers.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_dict_helpers.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_new.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_new.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_wps.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_new_introspect.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_old.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_old.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers_wps.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/defconfig projects/vps/contrib/wpa/wpa_supplicant/driver_i.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/eap_register.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/eapol_test.c projects/vps/contrib/wpa/wpa_supplicant/events.c projects/vps/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-signals.py (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/ibss_rsn.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/ibss_rsn.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/main.c projects/vps/contrib/wpa/wpa_supplicant/main_none.c projects/vps/contrib/wpa/wpa_supplicant/notify.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/notify.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/preauth_test.c projects/vps/contrib/wpa/wpa_supplicant/scan.c projects/vps/contrib/wpa/wpa_supplicant/scan.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/sme.c (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/sme.h (contents, props changed) projects/vps/contrib/wpa/wpa_supplicant/tests/test_eap_sim_common.c projects/vps/contrib/wpa/wpa_supplicant/tests/test_wpa.c projects/vps/contrib/wpa/wpa_supplicant/wpa_cli.c projects/vps/contrib/wpa/wpa_supplicant/wpa_passphrase.c projects/vps/contrib/wpa/wpa_supplicant/wpa_priv.c projects/vps/contrib/wpa/wpa_supplicant/wpa_supplicant.c projects/vps/contrib/wpa/wpa_supplicant/wpa_supplicant.conf projects/vps/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h projects/vps/contrib/wpa/wpa_supplicant/wpas_glue.c projects/vps/contrib/wpa/wpa_supplicant/wpas_glue.h projects/vps/contrib/wpa/wpa_supplicant/wps_supplicant.c projects/vps/contrib/wpa/wpa_supplicant/wps_supplicant.h projects/vps/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h projects/vps/crypto/openssh/sshd_config projects/vps/crypto/openssh/sshd_config.5 projects/vps/etc/defaults/rc.conf projects/vps/etc/devd/usb.conf projects/vps/etc/inetd.conf projects/vps/etc/mtree/BSD.include.dist projects/vps/etc/mtree/BSD.usr.dist projects/vps/etc/network.subr projects/vps/etc/newsyslog.conf projects/vps/etc/periodic/daily/450.status-security projects/vps/etc/rc.d/Makefile projects/vps/etc/rc.d/addswap projects/vps/etc/rc.d/fsck projects/vps/etc/rc.d/hostapd projects/vps/etc/rc.d/mdconfig projects/vps/etc/rc.d/ntpdate projects/vps/etc/rc.d/pfsync projects/vps/etc/rc.d/sshd projects/vps/etc/rc.d/zfs projects/vps/etc/rc.resume projects/vps/etc/syslog.conf projects/vps/gnu/lib/libdialog/Makefile projects/vps/gnu/lib/libdialog/dlg_config.h projects/vps/gnu/lib/libsupc++/Version.map projects/vps/gnu/usr.bin/Makefile projects/vps/gnu/usr.bin/dialog/Makefile projects/vps/gnu/usr.bin/gdb/libgdb/Makefile projects/vps/gnu/usr.bin/patch/Makefile projects/vps/gnu/usr.bin/patch/pch.c projects/vps/include/Makefile projects/vps/include/gssapi/gssapi.h projects/vps/include/iconv.h projects/vps/include/paths.h projects/vps/include/stdlib.h projects/vps/lib/Makefile projects/vps/lib/clang/clang.build.mk projects/vps/lib/clang/include/clang/Basic/Version.inc projects/vps/lib/clang/include/llvm/Config/config.h projects/vps/lib/clang/include/llvm/Config/llvm-config.h projects/vps/lib/clang/libclangparse/Makefile projects/vps/lib/clang/libclangstaticanalyzercheckers/Makefile projects/vps/lib/clang/libllvmarmdesc/Makefile projects/vps/lib/clang/libllvmlinker/Makefile projects/vps/lib/clang/libllvmmipscodegen/Makefile projects/vps/lib/clang/libllvmobject/Makefile projects/vps/lib/clang/libllvmsupport/Makefile projects/vps/lib/clang/libllvmvectorize/Makefile projects/vps/lib/clang/libllvmx86codegen/Makefile projects/vps/lib/libc/Makefile projects/vps/lib/libc/arm/gen/sigsetjmp.S projects/vps/lib/libc/gen/siginterrupt.c projects/vps/lib/libc/gen/signal.c projects/vps/lib/libc/gen/sysctl.3 projects/vps/lib/libc/gen/wordexp.c projects/vps/lib/libc/iconv/Symbol.map projects/vps/lib/libc/iconv/citrus_csmapper.c projects/vps/lib/libc/iconv/citrus_iconv.c projects/vps/lib/libc/iconv/citrus_iconv.h projects/vps/lib/libc/iconv/citrus_iconv_local.h projects/vps/lib/libc/iconv/citrus_lock.h projects/vps/lib/libc/iconv/citrus_mapper.c projects/vps/lib/libc/iconv/citrus_none.c projects/vps/lib/libc/iconv/citrus_stdenc.h projects/vps/lib/libc/iconv/citrus_stdenc_local.h projects/vps/lib/libc/iconv/citrus_stdenc_template.h projects/vps/lib/libc/iconv/iconv.c projects/vps/lib/libc/locale/cXXrtomb_iconv.h projects/vps/lib/libc/locale/mbrtocXX_iconv.h projects/vps/lib/libc/net/getaddrinfo.3 projects/vps/lib/libc/net/getnameinfo.3 projects/vps/lib/libc/net/sctp_sys_calls.c projects/vps/lib/libc/sparc64/gen/makecontext.c projects/vps/lib/libc/sparc64/gen/signalcontext.c projects/vps/lib/libc/stdio/fwrite.c projects/vps/lib/libc/stdio/mktemp.3 projects/vps/lib/libc/stdlib/getenv.c projects/vps/lib/libc/stdlib/labs.3 projects/vps/lib/libc/stdlib/labs.c projects/vps/lib/libc/stdlib/ldiv.3 projects/vps/lib/libc/stdlib/ldiv.c projects/vps/lib/libc/stdlib/memory.3 projects/vps/lib/libc/stdlib/merge.c projects/vps/lib/libc/stdlib/qsort.3 projects/vps/lib/libc/stdlib/qsort.c projects/vps/lib/libc/stdlib/radixsort.3 projects/vps/lib/libc/stdlib/radixsort.c projects/vps/lib/libc/stdlib/rand.3 projects/vps/lib/libc/stdlib/rand.c projects/vps/lib/libc/stdlib/random.3 projects/vps/lib/libc/stdlib/random.c projects/vps/lib/libc/stdlib/realpath.3 projects/vps/lib/libc/stdlib/strtod.3 projects/vps/lib/libc/stdlib/strtoimax.c projects/vps/lib/libc/stdlib/strtol.3 projects/vps/lib/libc/stdlib/strtol.c projects/vps/lib/libc/stdlib/strtoll.c projects/vps/lib/libc/stdlib/strtoq.c projects/vps/lib/libc/stdlib/strtoul.3 projects/vps/lib/libc/stdlib/strtoul.c projects/vps/lib/libc/stdlib/strtoull.c projects/vps/lib/libc/stdlib/strtoumax.c projects/vps/lib/libc/stdlib/strtouq.c projects/vps/lib/libc/stdlib/system.3 projects/vps/lib/libc/stdlib/system.c projects/vps/lib/libc/sys/kqueue.2 projects/vps/lib/libc/sys/ptrace.2 projects/vps/lib/libcompiler_rt/Makefile projects/vps/lib/libdwarf/dwarf_init.c projects/vps/lib/libdwarf/dwarf_loc.c projects/vps/lib/libfetch/common.c projects/vps/lib/libfetch/common.h projects/vps/lib/libfetch/fetch.3 projects/vps/lib/libfetch/fetch.c projects/vps/lib/libfetch/http.c projects/vps/lib/libgeom/geom_xml2tree.c projects/vps/lib/libgeom/libgeom.h projects/vps/lib/libiconv_modules/BIG5/citrus_big5.c projects/vps/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c projects/vps/lib/libiconv_modules/EUC/citrus_euc.c projects/vps/lib/libiconv_modules/EUCTW/citrus_euctw.c projects/vps/lib/libiconv_modules/GBK2K/citrus_gbk2k.c projects/vps/lib/libiconv_modules/HZ/citrus_hz.c projects/vps/lib/libiconv_modules/ISO2022/citrus_iso2022.c projects/vps/lib/libiconv_modules/JOHAB/citrus_johab.c projects/vps/lib/libiconv_modules/MSKanji/citrus_mskanji.c projects/vps/lib/libiconv_modules/UES/citrus_ues.c projects/vps/lib/libiconv_modules/UTF1632/citrus_utf1632.c projects/vps/lib/libiconv_modules/UTF7/citrus_utf7.c projects/vps/lib/libiconv_modules/UTF8/citrus_utf8.c projects/vps/lib/libiconv_modules/VIQR/citrus_viqr.c projects/vps/lib/libiconv_modules/ZW/citrus_zw.c projects/vps/lib/libiconv_modules/iconv_none/citrus_iconv_none.c projects/vps/lib/libiconv_modules/iconv_std/citrus_iconv_std.c projects/vps/lib/libkvm/Makefile projects/vps/lib/libkvm/kvm.h projects/vps/lib/libmemstat/memstat_uma.c projects/vps/lib/libprocstat/Makefile projects/vps/lib/libprocstat/common_kvm.h projects/vps/lib/libprocstat/libprocstat.c projects/vps/lib/librt/sigev_thread.c projects/vps/lib/libstand/nfs.c projects/vps/lib/libthr/thread/thr_cancel.c projects/vps/lib/libthread_db/arch/sparc64/libpthread_md.c projects/vps/lib/libusb/Makefile projects/vps/lib/libusb/libusb20.c projects/vps/lib/libusb/libusb20_ugen20.c projects/vps/lib/libusb/libusb_global_linux.h projects/vps/lib/libutil/login_times.c projects/vps/lib/msun/src/math.h projects/vps/lib/msun/src/s_fma.c projects/vps/lib/msun/src/s_fmal.c projects/vps/release/Makefile projects/vps/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/vps/release/generate-release.sh projects/vps/release/sparc64/mkisoimages.sh projects/vps/rescue/rescue/Makefile projects/vps/sbin/camcontrol/camcontrol.c projects/vps/sbin/camcontrol/fwdownload.c projects/vps/sbin/devd/devd.8 projects/vps/sbin/devd/devd.cc projects/vps/sbin/devfs/devfs.8 projects/vps/sbin/dhclient/bpf.c projects/vps/sbin/dhclient/clparse.c projects/vps/sbin/dhclient/dhclient.c projects/vps/sbin/dhclient/dhcpd.h projects/vps/sbin/dhclient/packet.c projects/vps/sbin/dhclient/privsep.c projects/vps/sbin/dhclient/privsep.h projects/vps/sbin/etherswitchcfg/etherswitchcfg.c projects/vps/sbin/geom/class/part/gpart.8 projects/vps/sbin/hastctl/hastctl.c projects/vps/sbin/hastd/control.c projects/vps/sbin/hastd/hastd.8 projects/vps/sbin/ifconfig/af_nd6.c projects/vps/sbin/ipfw/ipfw.8 projects/vps/sbin/mdconfig/mdconfig.8 projects/vps/sbin/mdconfig/mdconfig.c projects/vps/sbin/mount/Makefile (contents, props changed) projects/vps/sbin/mount/mount.8 projects/vps/sbin/mount/mount.c projects/vps/sbin/mount_nfs/mount_nfs.8 projects/vps/sbin/nvmecontrol/Makefile projects/vps/sbin/nvmecontrol/nvmecontrol.8 projects/vps/sbin/nvmecontrol/nvmecontrol.c projects/vps/sbin/reboot/boot_i386.8 projects/vps/sbin/recoverdisk/recoverdisk.1 projects/vps/sbin/route/Makefile projects/vps/sbin/route/route.c projects/vps/sbin/swapon/swapon.8 projects/vps/sbin/swapon/swapon.c projects/vps/share/doc/legal/Makefile projects/vps/share/doc/psd/Makefile projects/vps/share/examples/Makefile projects/vps/share/examples/etc/README.examples projects/vps/share/examples/etc/make.conf projects/vps/share/examples/kld/syscall/test/call.c projects/vps/share/man/man3/queue.3 projects/vps/share/man/man4/Makefile projects/vps/share/man/man4/ath_hal.4 projects/vps/share/man/man4/axe.4 projects/vps/share/man/man4/bridge.4 projects/vps/share/man/man4/filemon.4 projects/vps/share/man/man4/hptiop.4 projects/vps/share/man/man4/mfi.4 projects/vps/share/man/man4/nvd.4 projects/vps/share/man/man4/nvme.4 projects/vps/share/man/man4/oce.4 projects/vps/share/man/man4/random.4 projects/vps/share/man/man4/urtwn.4 projects/vps/share/man/man4/virtio.4 projects/vps/share/man/man4/virtio_balloon.4 projects/vps/share/man/man4/virtio_blk.4 projects/vps/share/man/man4/virtio_scsi.4 projects/vps/share/man/man4/vtnet.4 projects/vps/share/man/man5/fstab.5 projects/vps/share/man/man5/rc.conf.5 projects/vps/share/man/man5/src.conf.5 projects/vps/share/man/man7/ports.7 projects/vps/share/man/man9/Makefile projects/vps/share/man/man9/bus_dma.9 projects/vps/share/man/man9/hhook.9 projects/vps/share/man/man9/kernel_mount.9 projects/vps/share/man/man9/locking.9 projects/vps/share/man/man9/microuptime.9 projects/vps/share/man/man9/pci.9 projects/vps/share/man/man9/rmlock.9 projects/vps/share/man/man9/rwlock.9 projects/vps/share/man/man9/vfsconf.9 projects/vps/share/misc/bsd-family-tree projects/vps/share/misc/committers-ports.dot projects/vps/share/misc/committers-src.dot projects/vps/share/mk/bsd.cpu.mk projects/vps/share/mk/bsd.lib.mk projects/vps/share/mk/bsd.libnames.mk projects/vps/share/mk/bsd.own.mk projects/vps/share/mk/bsd.subdir.mk projects/vps/share/mk/sys.mk projects/vps/share/monetdef/Makefile projects/vps/sys/amd64/amd64/exception.S projects/vps/sys/amd64/amd64/genassym.c projects/vps/sys/amd64/amd64/identcpu.c projects/vps/sys/amd64/amd64/initcpu.c projects/vps/sys/amd64/amd64/machdep.c projects/vps/sys/amd64/amd64/mp_machdep.c projects/vps/sys/amd64/amd64/pmap.c projects/vps/sys/amd64/amd64/sys_machdep.c projects/vps/sys/amd64/conf/GENERIC projects/vps/sys/amd64/conf/NOTES projects/vps/sys/amd64/include/acpica_machdep.h projects/vps/sys/amd64/include/counter.h projects/vps/sys/amd64/include/md_var.h projects/vps/sys/amd64/include/pmap.h projects/vps/sys/amd64/include/xen/xen-os.h projects/vps/sys/amd64/vmm/intel/ept.c projects/vps/sys/amd64/vmm/io/vlapic.c projects/vps/sys/amd64/vmm/vmm_instruction_emul.c projects/vps/sys/amd64/vmm/x86.c projects/vps/sys/arm/arm/bus_space_generic.c projects/vps/sys/arm/arm/busdma_machdep-v6.c projects/vps/sys/arm/arm/cpufunc.c projects/vps/sys/arm/arm/db_trace.c projects/vps/sys/arm/arm/elf_trampoline.c projects/vps/sys/arm/arm/exception.S projects/vps/sys/arm/arm/gic.c projects/vps/sys/arm/arm/identcpu.c projects/vps/sys/arm/arm/pl310.c projects/vps/sys/arm/arm/pmap-v6.c projects/vps/sys/arm/arm/trap.c projects/vps/sys/arm/arm/vfp.c projects/vps/sys/arm/arm/vm_machdep.c projects/vps/sys/arm/broadcom/bcm2835/bcm2835_fb.c projects/vps/sys/arm/broadcom/bcm2835/bcm2835_mbox.c projects/vps/sys/arm/broadcom/bcm2835/bcm2835_mbox.h projects/vps/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/vps/sys/arm/broadcom/bcm2835/files.bcm2835 projects/vps/sys/arm/conf/AC100 projects/vps/sys/arm/conf/ARMADAXP projects/vps/sys/arm/conf/ATMEL projects/vps/sys/arm/conf/AVILA projects/vps/sys/arm/conf/BEAGLEBONE projects/vps/sys/arm/conf/BWCT projects/vps/sys/arm/conf/CAMBRIA projects/vps/sys/arm/conf/CNS11XXNAS projects/vps/sys/arm/conf/CRB projects/vps/sys/arm/conf/CUBIEBOARD projects/vps/sys/arm/conf/DB-78XXX projects/vps/sys/arm/conf/DB-88F5XXX projects/vps/sys/arm/conf/DB-88F6XXX projects/vps/sys/arm/conf/DOCKSTAR projects/vps/sys/arm/conf/DREAMPLUG-1001 projects/vps/sys/arm/conf/EA3250 projects/vps/sys/arm/conf/EB9200 projects/vps/sys/arm/conf/EFIKA_MX projects/vps/sys/arm/conf/EP80219 projects/vps/sys/arm/conf/ETHERNUT5 projects/vps/sys/arm/conf/GUMSTIX projects/vps/sys/arm/conf/HL200 projects/vps/sys/arm/conf/HL201 projects/vps/sys/arm/conf/IQ31244 projects/vps/sys/arm/conf/KB920X projects/vps/sys/arm/conf/LN2410SBC projects/vps/sys/arm/conf/NSLU projects/vps/sys/arm/conf/PANDABOARD projects/vps/sys/arm/conf/QILA9G20 projects/vps/sys/arm/conf/RPI-B projects/vps/sys/arm/conf/SAM9260EK projects/vps/sys/arm/conf/SAM9G20EK projects/vps/sys/arm/conf/SAM9X25EK projects/vps/sys/arm/conf/SHEEVAPLUG projects/vps/sys/arm/conf/SN9G45 projects/vps/sys/arm/conf/TS7800 projects/vps/sys/arm/conf/VERSATILEPB projects/vps/sys/arm/conf/ZEDBOARD projects/vps/sys/arm/include/armreg.h projects/vps/sys/arm/include/asmacros.h projects/vps/sys/arm/include/atomic.h projects/vps/sys/arm/include/counter.h projects/vps/sys/arm/include/intr.h projects/vps/sys/arm/include/kdb.h projects/vps/sys/arm/include/smp.h projects/vps/sys/arm/include/vfp.h projects/vps/sys/arm/ti/am335x/am335x_lcd.c projects/vps/sys/arm/ti/am335x/am335x_pmic.c projects/vps/sys/arm/ti/am335x/am335x_pwm.c projects/vps/sys/arm/ti/am335x/files.am335x projects/vps/sys/arm/ti/ti_mmchs.c projects/vps/sys/arm/ti/ti_mmchs.h projects/vps/sys/arm/ti/ti_scm.c projects/vps/sys/arm/versatile/versatile_pci.c projects/vps/sys/arm/versatile/versatile_sic.c projects/vps/sys/boot/arm/uboot/Makefile projects/vps/sys/boot/fdt/dts/am335x-evm.dts projects/vps/sys/boot/fdt/dts/am335x.dtsi projects/vps/sys/boot/fdt/dts/beaglebone-black.dts projects/vps/sys/boot/fdt/dts/beaglebone.dts projects/vps/sys/boot/ficl/loader.c projects/vps/sys/boot/forth/loader.conf projects/vps/sys/boot/forth/loader.rc projects/vps/sys/boot/i386/gptboot/Makefile projects/vps/sys/cam/ata/ata_da.c projects/vps/sys/cam/cam_ccb.h projects/vps/sys/cam/cam_periph.c projects/vps/sys/cam/cam_xpt.c projects/vps/sys/cam/ctl/ctl_backend_ramdisk.c projects/vps/sys/cam/scsi/scsi_all.c projects/vps/sys/cam/scsi/scsi_all.h projects/vps/sys/cam/scsi/scsi_ch.c projects/vps/sys/cam/scsi/scsi_da.c projects/vps/sys/cam/scsi/scsi_enc_ses.c projects/vps/sys/cam/scsi/scsi_pass.c projects/vps/sys/cam/scsi/scsi_xpt.c projects/vps/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c projects/vps/sys/cddl/compat/opensolaris/sys/mutex.h projects/vps/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/vps/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/vps/sys/cddl/dev/dtmalloc/dtmalloc.c projects/vps/sys/cddl/dev/dtrace/amd64/dis_tables.c projects/vps/sys/cddl/dev/dtrace/amd64/dis_tables.h projects/vps/sys/cddl/dev/dtrace/dtrace_ioctl.c projects/vps/sys/cddl/dev/dtrace/dtrace_load.c projects/vps/sys/cddl/dev/dtrace/dtrace_unload.c projects/vps/sys/cddl/dev/dtrace/i386/dis_tables.c projects/vps/sys/cddl/dev/dtrace/i386/dis_tables.h projects/vps/sys/compat/freebsd32/freebsd32.h projects/vps/sys/compat/freebsd32/freebsd32_misc.c projects/vps/sys/compat/freebsd32/freebsd32_proto.h projects/vps/sys/compat/freebsd32/freebsd32_signal.h projects/vps/sys/compat/freebsd32/freebsd32_syscall.h projects/vps/sys/compat/freebsd32/freebsd32_syscalls.c projects/vps/sys/compat/freebsd32/freebsd32_sysent.c projects/vps/sys/compat/freebsd32/freebsd32_systrace_args.c projects/vps/sys/compat/freebsd32/syscalls.master projects/vps/sys/compat/linux/linux_ioctl.c projects/vps/sys/compat/linux/linux_ioctl.h projects/vps/sys/conf/Makefile.amd64 projects/vps/sys/conf/Makefile.arm projects/vps/sys/conf/NOTES projects/vps/sys/conf/WITHOUT_SOURCELESS_HOST projects/vps/sys/conf/WITHOUT_SOURCELESS_UCODE projects/vps/sys/conf/files projects/vps/sys/conf/files.amd64 projects/vps/sys/conf/files.arm projects/vps/sys/conf/files.i386 projects/vps/sys/conf/files.ia64 projects/vps/sys/conf/files.mips projects/vps/sys/conf/files.pc98 projects/vps/sys/conf/files.powerpc projects/vps/sys/conf/files.sparc64 projects/vps/sys/conf/kmod.mk projects/vps/sys/conf/newvers.sh projects/vps/sys/conf/options projects/vps/sys/contrib/dev/acpica/acpica_prep.sh projects/vps/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/vps/sys/contrib/dev/acpica/common/dmextern.c projects/vps/sys/contrib/dev/acpica/common/dmrestag.c projects/vps/sys/contrib/dev/acpica/common/dmtable.c projects/vps/sys/contrib/dev/acpica/common/dmtbdump.c projects/vps/sys/contrib/dev/acpica/common/dmtbinfo.c projects/vps/sys/contrib/dev/acpica/common/getopt.c projects/vps/sys/contrib/dev/acpica/compiler/aslcompile.c projects/vps/sys/contrib/dev/acpica/compiler/aslmessages.h projects/vps/sys/contrib/dev/acpica/compiler/asloffset.c projects/vps/sys/contrib/dev/acpica/compiler/asloperands.c projects/vps/sys/contrib/dev/acpica/compiler/asloptions.c projects/vps/sys/contrib/dev/acpica/compiler/asltree.c projects/vps/sys/contrib/dev/acpica/compiler/aslutils.c projects/vps/sys/contrib/dev/acpica/compiler/dtfield.c projects/vps/sys/contrib/dev/acpica/compiler/dtio.c projects/vps/sys/contrib/dev/acpica/compiler/dttable.c projects/vps/sys/contrib/dev/acpica/compiler/dttemplate.c projects/vps/sys/contrib/dev/acpica/compiler/dttemplate.h projects/vps/sys/contrib/dev/acpica/compiler/dtutils.c projects/vps/sys/contrib/dev/acpica/compiler/preprocess.h projects/vps/sys/contrib/dev/acpica/compiler/prscan.c projects/vps/sys/contrib/dev/acpica/components/debugger/dbcmds.c projects/vps/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/vps/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/vps/sys/contrib/dev/acpica/components/debugger/dbnames.c projects/vps/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c projects/vps/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/vps/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c projects/vps/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c projects/vps/sys/contrib/dev/acpica/components/events/evgpeinit.c projects/vps/sys/contrib/dev/acpica/components/executer/exdump.c projects/vps/sys/contrib/dev/acpica/components/executer/exoparg1.c projects/vps/sys/contrib/dev/acpica/components/hardware/hwtimer.c projects/vps/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/vps/sys/contrib/dev/acpica/components/namespace/nspredef.c projects/vps/sys/contrib/dev/acpica/components/namespace/nsrepair2.c projects/vps/sys/contrib/dev/acpica/components/namespace/nswalk.c projects/vps/sys/contrib/dev/acpica/components/namespace/nsxfeval.c projects/vps/sys/contrib/dev/acpica/components/namespace/nsxfname.c projects/vps/sys/contrib/dev/acpica/components/resources/rsdump.c projects/vps/sys/contrib/dev/acpica/components/resources/rsutils.c projects/vps/sys/contrib/dev/acpica/components/tables/tbfadt.c projects/vps/sys/contrib/dev/acpica/components/tables/tbxfroot.c projects/vps/sys/contrib/dev/acpica/components/utilities/uteval.c projects/vps/sys/contrib/dev/acpica/components/utilities/utglobal.c projects/vps/sys/contrib/dev/acpica/components/utilities/utosi.c projects/vps/sys/contrib/dev/acpica/components/utilities/utstring.c projects/vps/sys/contrib/dev/acpica/components/utilities/utxface.c projects/vps/sys/contrib/dev/acpica/include/acdisasm.h projects/vps/sys/contrib/dev/acpica/include/acglobal.h projects/vps/sys/contrib/dev/acpica/include/aclocal.h projects/vps/sys/contrib/dev/acpica/include/acnamesp.h projects/vps/sys/contrib/dev/acpica/include/acpixf.h projects/vps/sys/contrib/dev/acpica/include/actables.h projects/vps/sys/contrib/dev/acpica/include/actypes.h projects/vps/sys/contrib/dev/acpica/include/acutils.h projects/vps/sys/contrib/dev/acpica/include/platform/acfreebsd.h projects/vps/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c projects/vps/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/vps/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h projects/vps/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_radio.c projects/vps/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c projects/vps/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_stub_funcs.c projects/vps/sys/crypto/sha2/sha2.c projects/vps/sys/crypto/sha2/sha2.h projects/vps/sys/dev/acpi_support/atk0110.c projects/vps/sys/dev/acpica/acpi_pcib.c projects/vps/sys/dev/acpica/acpi_pcib_acpi.c projects/vps/sys/dev/acpica/acpi_resource.c projects/vps/sys/dev/ae/if_ae.c projects/vps/sys/dev/ae/if_aereg.h projects/vps/sys/dev/age/if_age.c projects/vps/sys/dev/ahci/ahci.c projects/vps/sys/dev/ahci/ahci.h projects/vps/sys/dev/aic7xxx/aic7xxx_pci.c projects/vps/sys/dev/arcmsr/arcmsr.c projects/vps/sys/dev/arcmsr/arcmsr.h projects/vps/sys/dev/ata/ata-pci.h projects/vps/sys/dev/ata/chipsets/ata-acerlabs.c projects/vps/sys/dev/ata/chipsets/ata-intel.c projects/vps/sys/dev/ata/chipsets/ata-promise.c projects/vps/sys/dev/ath/ath_hal/ah.c projects/vps/sys/dev/ath/ath_hal/ah.h projects/vps/sys/dev/ath/ath_hal/ah_internal.h projects/vps/sys/dev/ath/ath_hal/ar9002/ar9285.h projects/vps/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c projects/vps/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c projects/vps/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.h projects/vps/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c projects/vps/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c projects/vps/sys/dev/ath/if_ath.c projects/vps/sys/dev/ath/if_ath_ahb.c projects/vps/sys/dev/ath/if_ath_btcoex.c projects/vps/sys/dev/ath/if_ath_debug.h projects/vps/sys/dev/ath/if_ath_rx.c projects/vps/sys/dev/ath/if_ath_rx_edma.c projects/vps/sys/dev/ath/if_athvar.h projects/vps/sys/dev/bce/if_bce.c projects/vps/sys/dev/bce/if_bcereg.h projects/vps/sys/dev/bge/if_bge.c projects/vps/sys/dev/bge/if_bgereg.h projects/vps/sys/dev/cfi/cfi_disk.c projects/vps/sys/dev/ciss/ciss.c projects/vps/sys/dev/cpuctl/cpuctl.c projects/vps/sys/dev/cxgbe/adapter.h projects/vps/sys/dev/cxgbe/common/common.h projects/vps/sys/dev/cxgbe/common/t4_hw.c projects/vps/sys/dev/cxgbe/common/t4_hw.h projects/vps/sys/dev/cxgbe/common/t4_msg.h projects/vps/sys/dev/cxgbe/common/t4_regs_values.h projects/vps/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/vps/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt projects/vps/sys/dev/cxgbe/firmware/t4fw_interface.h projects/vps/sys/dev/cxgbe/offload.h projects/vps/sys/dev/cxgbe/t4_ioctl.h projects/vps/sys/dev/cxgbe/t4_main.c projects/vps/sys/dev/cxgbe/t4_sge.c projects/vps/sys/dev/cxgbe/tom/t4_connect.c projects/vps/sys/dev/cxgbe/tom/t4_listen.c projects/vps/sys/dev/cxgbe/tom/t4_tom.c projects/vps/sys/dev/cxgbe/tom/t4_tom.h projects/vps/sys/dev/drm2/i915/i915_gem.c projects/vps/sys/dev/drm2/i915/intel_fb.c projects/vps/sys/dev/drm2/i915/intel_ringbuffer.c projects/vps/sys/dev/drm2/ttm/ttm_bo_vm.c projects/vps/sys/dev/e1000/if_em.c projects/vps/sys/dev/e1000/if_igb.c projects/vps/sys/dev/e1000/if_lem.c projects/vps/sys/dev/etherswitch/arswitch/arswitch.c projects/vps/sys/dev/etherswitch/arswitch/arswitch_7240.c projects/vps/sys/dev/etherswitch/arswitch/arswitch_8216.c projects/vps/sys/dev/etherswitch/arswitch/arswitch_8226.c projects/vps/sys/dev/etherswitch/arswitch/arswitch_8316.c projects/vps/sys/dev/etherswitch/arswitch/arswitch_phy.c projects/vps/sys/dev/etherswitch/arswitch/arswitch_reg.c projects/vps/sys/dev/etherswitch/arswitch/arswitch_reg.h projects/vps/sys/dev/etherswitch/arswitch/arswitchreg.h projects/vps/sys/dev/etherswitch/arswitch/arswitchvar.h projects/vps/sys/dev/etherswitch/etherswitch.h projects/vps/sys/dev/etherswitch/ip17x/ip175c.c projects/vps/sys/dev/etherswitch/ip17x/ip175d.c projects/vps/sys/dev/etherswitch/ip17x/ip17x_vlans.c projects/vps/sys/dev/etherswitch/rtl8366/rtl8366rb.c projects/vps/sys/dev/hme/if_hme.c projects/vps/sys/dev/hpt27xx/hpt27xx_config.c projects/vps/sys/dev/hptiop/hptiop.c projects/vps/sys/dev/ichsmb/ichsmb_pci.c projects/vps/sys/dev/ichwd/ichwd.c projects/vps/sys/dev/ichwd/ichwd.h projects/vps/sys/dev/ipmi/ipmi_isa.c projects/vps/sys/dev/ipmi/ipmivars.h projects/vps/sys/dev/isci/scil/sati_passthrough.c projects/vps/sys/dev/isp/isp.c projects/vps/sys/dev/isp/ispreg.h projects/vps/sys/dev/iwn/if_iwn.c projects/vps/sys/dev/iwn/if_iwnvar.h projects/vps/sys/dev/ixgb/if_ixgb.c projects/vps/sys/dev/ixgb/ixgb_ids.h projects/vps/sys/dev/ixgbe/README projects/vps/sys/dev/ixgbe/ixgbe.c projects/vps/sys/dev/ixgbe/ixgbe.h projects/vps/sys/dev/ixgbe/ixgbe_82598.c projects/vps/sys/dev/ixgbe/ixgbe_82599.c projects/vps/sys/dev/ixgbe/ixgbe_api.c projects/vps/sys/dev/ixgbe/ixgbe_api.h projects/vps/sys/dev/ixgbe/ixgbe_common.c projects/vps/sys/dev/ixgbe/ixgbe_common.h projects/vps/sys/dev/ixgbe/ixgbe_osdep.h projects/vps/sys/dev/ixgbe/ixgbe_phy.c projects/vps/sys/dev/ixgbe/ixgbe_phy.h projects/vps/sys/dev/ixgbe/ixgbe_type.h projects/vps/sys/dev/ixgbe/ixgbe_vf.c projects/vps/sys/dev/ixgbe/ixgbe_x540.c projects/vps/sys/dev/ixgbe/ixgbe_x540.h projects/vps/sys/dev/ixgbe/ixv.c projects/vps/sys/dev/mem/memdev.c projects/vps/sys/dev/mfi/mfi.c projects/vps/sys/dev/mii/brgphy.c projects/vps/sys/dev/mii/miidevs projects/vps/sys/dev/mmc/mmcsd.c projects/vps/sys/dev/mps/mps.c projects/vps/sys/dev/mps/mps_config.c projects/vps/sys/dev/mps/mps_mapping.c projects/vps/sys/dev/mps/mps_pci.c projects/vps/sys/dev/mps/mps_sas.c projects/vps/sys/dev/mps/mps_sas.h projects/vps/sys/dev/mps/mps_sas_lsi.c projects/vps/sys/dev/mps/mps_table.c projects/vps/sys/dev/mps/mps_user.c projects/vps/sys/dev/mps/mpsvar.h projects/vps/sys/dev/mpt/mpt_cam.c projects/vps/sys/dev/mvs/mvs.c projects/vps/sys/dev/nand/nand_geom.c projects/vps/sys/dev/nvd/nvd.c projects/vps/sys/dev/nvme/nvme.c projects/vps/sys/dev/nvme/nvme.h projects/vps/sys/dev/nvme/nvme_ctrlr.c projects/vps/sys/dev/nvme/nvme_ctrlr_cmd.c projects/vps/sys/dev/nvme/nvme_ns.c projects/vps/sys/dev/nvme/nvme_ns_cmd.c projects/vps/sys/dev/nvme/nvme_private.h projects/vps/sys/dev/nvme/nvme_qpair.c projects/vps/sys/dev/nvme/nvme_sysctl.c projects/vps/sys/dev/nvme/nvme_test.c projects/vps/sys/dev/oce/oce_hw.c projects/vps/sys/dev/oce/oce_hw.h projects/vps/sys/dev/oce/oce_if.c projects/vps/sys/dev/oce/oce_if.h projects/vps/sys/dev/oce/oce_mbox.c projects/vps/sys/dev/oce/oce_queue.c projects/vps/sys/dev/oce/oce_sysctl.c projects/vps/sys/dev/oce/oce_util.c projects/vps/sys/dev/pci/pci.c projects/vps/sys/dev/pci/pci_pci.c projects/vps/sys/dev/pci/pci_private.h projects/vps/sys/dev/pci/pcib_private.h projects/vps/sys/dev/pci/pcivar.h projects/vps/sys/dev/puc/puc_bfe.h projects/vps/sys/dev/puc/puc_cfg.h projects/vps/sys/dev/puc/pucdata.c projects/vps/sys/dev/qlxgbe/ql_os.c projects/vps/sys/dev/ral/rt2560.c projects/vps/sys/dev/ral/rt2661.c projects/vps/sys/dev/ral/rt2860.c projects/vps/sys/dev/random/ivy.c projects/vps/sys/dev/random/nehemiah.c projects/vps/sys/dev/random/probe.c projects/vps/sys/dev/random/randomdev.c projects/vps/sys/dev/random/randomdev.h projects/vps/sys/dev/random/randomdev_soft.c projects/vps/sys/dev/random/randomdev_soft.h projects/vps/sys/dev/random/yarrow.c projects/vps/sys/dev/re/if_re.c projects/vps/sys/dev/rt/if_rt.c projects/vps/sys/dev/sound/pci/ds1.c projects/vps/sys/dev/sound/pci/hda/hdaa_patches.c projects/vps/sys/dev/sound/pci/hda/hdac.h projects/vps/sys/dev/syscons/scvgarndr.c projects/vps/sys/dev/syscons/syscons.c projects/vps/sys/dev/uart/uart.h projects/vps/sys/dev/uart/uart_bus_fdt.c projects/vps/sys/dev/uart/uart_bus_pci.c projects/vps/sys/dev/uart/uart_core.c projects/vps/sys/dev/uart/uart_cpu_fdt.c projects/vps/sys/dev/uart/uart_subr.c projects/vps/sys/dev/usb/controller/musb_otg.c projects/vps/sys/dev/usb/controller/musb_otg.h projects/vps/sys/dev/usb/controller/musb_otg_atmelarm.c projects/vps/sys/dev/usb/controller/xhci.c projects/vps/sys/dev/usb/controller/xhci.h projects/vps/sys/dev/usb/controller/xhci_pci.c projects/vps/sys/dev/usb/input/ukbd.c projects/vps/sys/dev/usb/net/if_aue.c projects/vps/sys/dev/usb/net/if_axe.c projects/vps/sys/dev/usb/net/if_axereg.h projects/vps/sys/dev/usb/net/if_cuereg.h projects/vps/sys/dev/usb/net/if_ipheth.c projects/vps/sys/dev/usb/net/if_mos.c projects/vps/sys/dev/usb/net/if_rue.c projects/vps/sys/dev/usb/net/if_smsc.c projects/vps/sys/dev/usb/net/if_udav.c projects/vps/sys/dev/usb/quirk/usb_quirk.c projects/vps/sys/dev/usb/serial/u3g.c projects/vps/sys/dev/usb/serial/umcs.h projects/vps/sys/dev/usb/usb_pf.c projects/vps/sys/dev/usb/usbdevs projects/vps/sys/dev/usb/wlan/if_rumvar.h projects/vps/sys/dev/usb/wlan/if_runvar.h projects/vps/sys/dev/usb/wlan/if_uathvar.h projects/vps/sys/dev/usb/wlan/if_upgtvar.h projects/vps/sys/dev/usb/wlan/if_uralvar.h projects/vps/sys/dev/usb/wlan/if_urtwn.c projects/vps/sys/dev/usb/wlan/if_urtwnreg.h projects/vps/sys/dev/usb/wlan/if_urtwvar.h projects/vps/sys/dev/usb/wlan/if_zydreg.h projects/vps/sys/dev/virtio/balloon/virtio_balloon.c projects/vps/sys/dev/virtio/block/virtio_blk.c projects/vps/sys/dev/virtio/block/virtio_blk.h projects/vps/sys/dev/virtio/network/if_vtnet.c projects/vps/sys/dev/virtio/network/if_vtnetvar.h projects/vps/sys/dev/virtio/pci/virtio_pci.c projects/vps/sys/dev/virtio/scsi/virtio_scsi.c projects/vps/sys/dev/virtio/scsi/virtio_scsivar.h projects/vps/sys/dev/virtio/virtio.c projects/vps/sys/dev/virtio/virtio.h projects/vps/sys/dev/virtio/virtio_bus_if.m projects/vps/sys/dev/virtio/virtio_if.m projects/vps/sys/dev/virtio/virtqueue.c projects/vps/sys/dev/virtio/virtqueue.h projects/vps/sys/dev/vxge/vxge.h projects/vps/sys/dev/watchdog/watchdog.c projects/vps/sys/dev/wi/if_wi.c projects/vps/sys/dev/xen/blkfront/blkfront.c projects/vps/sys/dev/xen/blkfront/block.h projects/vps/sys/dev/xen/netfront/netfront.c projects/vps/sys/fs/cd9660/iso.h projects/vps/sys/fs/devfs/devfs_rule.c projects/vps/sys/fs/ext2fs/ext2_alloc.c projects/vps/sys/fs/ext2fs/ext2_balloc.c projects/vps/sys/fs/ext2fs/ext2_bmap.c projects/vps/sys/fs/ext2fs/ext2_dinode.h projects/vps/sys/fs/ext2fs/ext2_dir.h projects/vps/sys/fs/ext2fs/ext2_extern.h projects/vps/sys/fs/ext2fs/ext2_inode.c projects/vps/sys/fs/ext2fs/ext2_inode_cnv.c projects/vps/sys/fs/ext2fs/ext2_lookup.c projects/vps/sys/fs/ext2fs/ext2_subr.c projects/vps/sys/fs/ext2fs/ext2_vfsops.c projects/vps/sys/fs/ext2fs/ext2_vnops.c projects/vps/sys/fs/ext2fs/ext2fs.h projects/vps/sys/fs/ext2fs/fs.h projects/vps/sys/fs/ext2fs/inode.h projects/vps/sys/fs/nfs/nfs.h projects/vps/sys/fs/nfs/nfs_commonkrpc.c projects/vps/sys/fs/nfs/nfs_commonsubs.c projects/vps/sys/fs/nfsclient/nfs_clbio.c projects/vps/sys/fs/nfsclient/nfs_clport.c projects/vps/sys/fs/nfsclient/nfs_clstate.c projects/vps/sys/fs/nfsclient/nfs_clvfsops.c projects/vps/sys/fs/nfsclient/nfs_clvnops.c projects/vps/sys/fs/nullfs/null_vnops.c projects/vps/sys/fs/smbfs/smbfs_node.c projects/vps/sys/fs/smbfs/smbfs_smb.c projects/vps/sys/fs/smbfs/smbfs_vfsops.c projects/vps/sys/fs/smbfs/smbfs_vnops.c projects/vps/sys/fs/tmpfs/tmpfs_vfsops.c projects/vps/sys/gdb/gdb_cons.c projects/vps/sys/geom/geom_disk.c projects/vps/sys/geom/geom_disk.h projects/vps/sys/geom/geom_io.c projects/vps/sys/geom/journal/g_journal.c projects/vps/sys/geom/mirror/g_mirror.c projects/vps/sys/geom/raid/g_raid.c projects/vps/sys/geom/raid/g_raid_ctl.c projects/vps/sys/i386/conf/GENERIC projects/vps/sys/i386/conf/NOTES projects/vps/sys/i386/conf/PAE projects/vps/sys/i386/conf/XBOX projects/vps/sys/i386/conf/XEN projects/vps/sys/i386/i386/exception.s projects/vps/sys/i386/i386/identcpu.c projects/vps/sys/i386/i386/initcpu.c projects/vps/sys/i386/i386/mp_machdep.c projects/vps/sys/i386/i386/pmap.c projects/vps/sys/i386/i386/support.s projects/vps/sys/i386/i386/symbols.raw projects/vps/sys/i386/i386/sys_machdep.c projects/vps/sys/i386/i386/uio_machdep.c projects/vps/sys/i386/i386/vm_machdep.c projects/vps/sys/i386/include/acpica_machdep.h projects/vps/sys/i386/include/counter.h projects/vps/sys/i386/include/md_var.h projects/vps/sys/i386/include/xen/xen-os.h projects/vps/sys/i386/include/xen/xenvar.h projects/vps/sys/i386/xen/mp_machdep.c projects/vps/sys/i386/xen/pmap.c projects/vps/sys/i386/xen/xen_machdep.c projects/vps/sys/ia64/conf/GENERIC projects/vps/sys/ia64/ia64/mca.c projects/vps/sys/ia64/ia64/pmap.c projects/vps/sys/ia64/include/acpica_machdep.h projects/vps/sys/ia64/include/counter.h projects/vps/sys/ia64/pci/pci_cfgreg.c projects/vps/sys/kern/Make.tags.inc projects/vps/sys/kern/init_main.c projects/vps/sys/kern/kern_acct.c projects/vps/sys/kern/kern_alq.c projects/vps/sys/kern/kern_clock.c projects/vps/sys/kern/kern_cpuset.c projects/vps/sys/kern/kern_descrip.c projects/vps/sys/kern/kern_event.c projects/vps/sys/kern/kern_exit.c projects/vps/sys/kern/kern_hhook.c projects/vps/sys/kern/kern_intr.c projects/vps/sys/kern/kern_khelp.c projects/vps/sys/kern/kern_lock.c projects/vps/sys/kern/kern_mbuf.c projects/vps/sys/kern/kern_mutex.c projects/vps/sys/kern/kern_ntptime.c projects/vps/sys/kern/kern_priv.c projects/vps/sys/kern/kern_rmlock.c projects/vps/sys/kern/kern_rwlock.c projects/vps/sys/kern/kern_sig.c projects/vps/sys/kern/kern_sx.c projects/vps/sys/kern/kern_synch.c projects/vps/sys/kern/kern_time.c projects/vps/sys/kern/kern_umtx.c projects/vps/sys/kern/kern_uuid.c projects/vps/sys/kern/sched_4bsd.c projects/vps/sys/kern/subr_bus.c projects/vps/sys/kern/subr_counter.c projects/vps/sys/kern/subr_lock.c projects/vps/sys/kern/subr_witness.c projects/vps/sys/kern/sys_generic.c projects/vps/sys/kern/sysv_shm.c projects/vps/sys/kern/uipc_mbuf.c projects/vps/sys/kern/uipc_mqueue.c projects/vps/sys/kern/uipc_shm.c projects/vps/sys/kern/uipc_sockbuf.c projects/vps/sys/kern/uipc_syscalls.c projects/vps/sys/kern/uipc_usrreq.c projects/vps/sys/kern/vfs_aio.c projects/vps/sys/kern/vfs_bio.c projects/vps/sys/kern/vfs_cache.c projects/vps/sys/kern/vfs_mount.c projects/vps/sys/kern/vfs_subr.c projects/vps/sys/kern/vfs_vnops.c projects/vps/sys/kgssapi/gss_impl.c projects/vps/sys/mips/atheros/ar71xx_chip.c projects/vps/sys/mips/atheros/ar71xx_cpudef.h projects/vps/sys/mips/atheros/ar71xx_gpio.c projects/vps/sys/mips/atheros/ar71xx_setup.c projects/vps/sys/mips/atheros/ar71xx_setup.h projects/vps/sys/mips/atheros/ar724x_chip.c projects/vps/sys/mips/atheros/ar91xx_chip.c projects/vps/sys/mips/atheros/ar933x_chip.c projects/vps/sys/mips/atheros/files.ar71xx projects/vps/sys/mips/atheros/uart_bus_ar71xx.c projects/vps/sys/mips/atheros/uart_bus_ar933x.c projects/vps/sys/mips/atheros/uart_cpu_ar71xx.c projects/vps/sys/mips/atheros/uart_cpu_ar933x.c projects/vps/sys/mips/cavium/std.octeon1 projects/vps/sys/mips/conf/AP93.hints projects/vps/sys/mips/conf/AR71XX_BASE projects/vps/sys/mips/conf/AR724X_BASE projects/vps/sys/mips/conf/AR91XX_BASE projects/vps/sys/mips/conf/AR933X_BASE projects/vps/sys/mips/conf/AR933X_BASE.hints projects/vps/sys/mips/conf/BERI_TEMPLATE projects/vps/sys/mips/conf/CARAMBOLA2.hints projects/vps/sys/mips/conf/DIR-825 projects/vps/sys/mips/conf/GXEMUL projects/vps/sys/mips/conf/OCTEON1 projects/vps/sys/mips/conf/PB92 projects/vps/sys/mips/conf/RT305X projects/vps/sys/mips/conf/XLR64 projects/vps/sys/mips/conf/XLRN32 projects/vps/sys/mips/conf/std.SWARM projects/vps/sys/mips/conf/std.XLP projects/vps/sys/mips/include/atomic.h projects/vps/sys/mips/include/counter.h projects/vps/sys/mips/include/elf.h projects/vps/sys/mips/mips/mp_machdep.c projects/vps/sys/mips/mips/stdatomic.c projects/vps/sys/mips/mips/uio_machdep.c projects/vps/sys/mips/mips/vm_machdep.c projects/vps/sys/modules/Makefile projects/vps/sys/modules/ath/Makefile projects/vps/sys/modules/cam/Makefile projects/vps/sys/modules/cc/Makefile projects/vps/sys/modules/cxgbe/Makefile projects/vps/sys/modules/cxgbe/if_cxgbe/Makefile projects/vps/sys/modules/cxgbe/t4_firmware/Makefile projects/vps/sys/modules/dtrace/dtrace/Makefile projects/vps/sys/modules/em/Makefile projects/vps/sys/modules/ext2fs/Makefile projects/vps/sys/modules/hpt27xx/Makefile projects/vps/sys/modules/igb/Makefile projects/vps/sys/modules/ixgbe/Makefile projects/vps/sys/modules/linux/Makefile projects/vps/sys/modules/nvme/Makefile projects/vps/sys/modules/random/Makefile projects/vps/sys/modules/usb/Makefile projects/vps/sys/net/ieee8023ad_lacp.c projects/vps/sys/net/ieee8023ad_lacp.h projects/vps/sys/net/if.c projects/vps/sys/net/if_arp.h projects/vps/sys/net/if_bridge.c projects/vps/sys/net/if_ethersubr.c projects/vps/sys/net/if_gif.c projects/vps/sys/net/if_lagg.c projects/vps/sys/net/if_lagg.h projects/vps/sys/net/if_var.h projects/vps/sys/net/if_vlan.c projects/vps/sys/net/route.h projects/vps/sys/net/rtsock.c projects/vps/sys/net/vnet.h projects/vps/sys/net80211/ieee80211.h projects/vps/sys/net80211/ieee80211_amrr.c projects/vps/sys/net80211/ieee80211_ioctl.c projects/vps/sys/net80211/ieee80211_mesh.c projects/vps/sys/net80211/ieee80211_output.c projects/vps/sys/net80211/ieee80211_phy.c projects/vps/sys/net80211/ieee80211_phy.h projects/vps/sys/net80211/ieee80211_proto.h projects/vps/sys/net80211/ieee80211_var.h projects/vps/sys/netgraph/bluetooth/socket/ng_btsocket.c projects/vps/sys/netgraph/ng_base.c projects/vps/sys/netgraph/ng_pppoe.c projects/vps/sys/netgraph/ng_pppoe.h projects/vps/sys/netinet/icmp6.h projects/vps/sys/netinet/icmp_var.h projects/vps/sys/netinet/if_ether.c projects/vps/sys/netinet/in.c projects/vps/sys/netinet/in_mcast.c projects/vps/sys/netinet/in_pcb.c projects/vps/sys/netinet/in_pcb.h projects/vps/sys/netinet/ip_carp.c projects/vps/sys/netinet/ip_carp.h projects/vps/sys/netinet/ip_icmp.c projects/vps/sys/netinet/ip_input.c projects/vps/sys/netinet/ip_mroute.c projects/vps/sys/netinet/ip_mroute.h projects/vps/sys/netinet/ip_output.c projects/vps/sys/netinet/ip_var.h projects/vps/sys/netinet/pim_var.h projects/vps/sys/netinet/sctp_asconf.c projects/vps/sys/netinet/sctp_constants.h projects/vps/sys/netinet/sctp_indata.c projects/vps/sys/netinet/sctp_indata.h projects/vps/sys/netinet/sctp_input.c projects/vps/sys/netinet/sctp_output.c projects/vps/sys/netinet/sctp_pcb.c projects/vps/sys/netinet/sctp_sysctl.c projects/vps/sys/netinet/sctp_sysctl.h projects/vps/sys/netinet/tcp_input.c projects/vps/sys/netinet/tcp_syncache.c projects/vps/sys/netinet/tcp_syncache.h projects/vps/sys/netinet/tcp_var.h projects/vps/sys/netinet/udp_usrreq.c projects/vps/sys/netinet/udp_var.h projects/vps/sys/netinet6/icmp6.c projects/vps/sys/netinet6/in6.c projects/vps/sys/netinet6/in6_ifattach.c projects/vps/sys/netinet6/in6_pcb.c projects/vps/sys/netinet6/in6_proto.c projects/vps/sys/netinet6/in6_var.h projects/vps/sys/netinet6/ip6_forward.c projects/vps/sys/netinet6/ip6_input.c projects/vps/sys/netinet6/ip6_mroute.c projects/vps/sys/netinet6/ip6_mroute.h projects/vps/sys/netinet6/ip6_output.c projects/vps/sys/netinet6/ip6_var.h projects/vps/sys/netinet6/nd6.c projects/vps/sys/netinet6/nd6_rtr.c projects/vps/sys/netinet6/pim6_var.h projects/vps/sys/netinet6/raw_ip6.c projects/vps/sys/netinet6/raw_ip6.h projects/vps/sys/netinet6/udp6_usrreq.c projects/vps/sys/netipsec/ah_var.h projects/vps/sys/netipsec/esp_var.h projects/vps/sys/netipsec/ipcomp_var.h projects/vps/sys/netipsec/ipip_var.h projects/vps/sys/netipsec/ipsec.c projects/vps/sys/netipsec/ipsec.h projects/vps/sys/netipsec/ipsec6.h projects/vps/sys/netipsec/ipsec_input.c projects/vps/sys/netipsec/ipsec_mbuf.c projects/vps/sys/netipsec/ipsec_output.c projects/vps/sys/netipsec/key.c projects/vps/sys/netipsec/keysock.c projects/vps/sys/netipsec/keysock.h projects/vps/sys/netipsec/xform_ah.c projects/vps/sys/netipsec/xform_esp.c projects/vps/sys/netipsec/xform_ipcomp.c projects/vps/sys/netipsec/xform_ipip.c projects/vps/sys/netpfil/pf/if_pfsync.c projects/vps/sys/netpfil/pf/pf.c projects/vps/sys/netsmb/smb_conn.c projects/vps/sys/nfsclient/nfs_subs.c projects/vps/sys/nfsclient/nfs_vnops.c projects/vps/sys/ofed/drivers/net/mlx4/en_netdev.c projects/vps/sys/ofed/drivers/net/mlx4/en_tx.c projects/vps/sys/ofed/drivers/net/mlx4/main.c projects/vps/sys/ofed/include/linux/module.h projects/vps/sys/ofed/include/linux/sysfs.h projects/vps/sys/pc98/conf/GENERIC projects/vps/sys/powerpc/aim/mmu_oea64.c projects/vps/sys/powerpc/aim/vm_machdep.c projects/vps/sys/powerpc/booke/vm_machdep.c projects/vps/sys/powerpc/conf/GENERIC projects/vps/sys/powerpc/conf/GENERIC64 projects/vps/sys/powerpc/conf/MPC85XX projects/vps/sys/powerpc/conf/WII projects/vps/sys/powerpc/include/counter.h projects/vps/sys/powerpc/ofw/ofw_cpu.c projects/vps/sys/powerpc/ofw/ofw_real.c projects/vps/sys/powerpc/powerpc/busdma_machdep.c projects/vps/sys/powerpc/powerpc/uio_machdep.c projects/vps/sys/powerpc/wii/wii_ipcreg.h projects/vps/sys/rpc/rpcsec_gss.h projects/vps/sys/rpc/rpcsec_gss/rpcsec_gss.c projects/vps/sys/security/audit/audit.c projects/vps/sys/sparc64/conf/GENERIC projects/vps/sys/sparc64/include/atomic.h projects/vps/sys/sparc64/include/counter.h projects/vps/sys/sparc64/include/ucontext.h projects/vps/sys/sparc64/sparc64/machdep.c projects/vps/sys/sparc64/sparc64/mp_machdep.c projects/vps/sys/sparc64/sparc64/pmap.c projects/vps/sys/sparc64/sparc64/uio_machdep.c projects/vps/sys/sparc64/sparc64/vm_machdep.c projects/vps/sys/sys/_rmlock.h projects/vps/sys/sys/bitset.h projects/vps/sys/sys/bus.h projects/vps/sys/sys/cdefs.h projects/vps/sys/sys/counter.h projects/vps/sys/sys/cpuset.h projects/vps/sys/sys/elf_common.h projects/vps/sys/sys/eventhandler.h projects/vps/sys/sys/hhook.h projects/vps/sys/sys/kernel.h projects/vps/sys/sys/libkern.h projects/vps/sys/sys/lock.h projects/vps/sys/sys/malloc.h projects/vps/sys/sys/mbuf.h projects/vps/sys/sys/module_khelp.h projects/vps/sys/sys/param.h projects/vps/sys/sys/priv.h projects/vps/sys/sys/queue.h projects/vps/sys/sys/rmlock.h projects/vps/sys/sys/sched.h projects/vps/sys/sys/sdt.h projects/vps/sys/sys/sf_buf.h projects/vps/sys/sys/socket.h projects/vps/sys/sys/socketvar.h projects/vps/sys/sys/stdatomic.h projects/vps/sys/sys/syscallsubr.h projects/vps/sys/sys/systm.h projects/vps/sys/sys/time.h projects/vps/sys/sys/uuid.h projects/vps/sys/sys/vnode.h projects/vps/sys/ufs/ffs/ffs_alloc.c projects/vps/sys/ufs/ffs/ffs_balloc.c projects/vps/sys/ufs/ffs/ffs_snapshot.c projects/vps/sys/ufs/ffs/ffs_suspend.c projects/vps/sys/ufs/ffs/ffs_vfsops.c projects/vps/sys/ufs/ufs/dinode.h projects/vps/sys/ufs/ufs/inode.h projects/vps/sys/ufs/ufs/ufs_extattr.c projects/vps/sys/ufs/ufs/ufs_vnops.c projects/vps/sys/vm/swap_pager.c projects/vps/sys/vm/uma.h projects/vps/sys/vm/uma_core.c projects/vps/sys/vm/uma_dbg.c projects/vps/sys/vm/uma_int.h projects/vps/sys/vm/vm.h projects/vps/sys/vm/vm_fault.c projects/vps/sys/vm/vm_glue.c projects/vps/sys/vm/vm_init.c projects/vps/sys/vm/vm_kern.c projects/vps/sys/vm/vm_kern.h projects/vps/sys/vm/vm_map.c projects/vps/sys/vm/vm_map.h projects/vps/sys/vm/vm_mmap.c projects/vps/sys/vm/vm_object.c projects/vps/sys/vm/vm_object.h projects/vps/sys/vm/vm_page.c projects/vps/sys/vm/vm_pageout.c projects/vps/sys/vm/vm_pager.c projects/vps/sys/vm/vm_pager.h projects/vps/sys/vm/vm_param.h projects/vps/sys/vm/vm_phys.c projects/vps/sys/vm/vnode_pager.c projects/vps/sys/x86/include/specialreg.h projects/vps/sys/x86/x86/busdma_machdep.c projects/vps/sys/xen/evtchn/evtchn.c projects/vps/sys/xen/interface/arch-ia64.h (contents, props changed) projects/vps/sys/xen/interface/arch-x86/cpuid.h (contents, props changed) projects/vps/sys/xen/interface/arch-x86/hvm/save.h (contents, props changed) projects/vps/sys/xen/interface/arch-x86/xen-mca.h (contents, props changed) projects/vps/sys/xen/interface/arch-x86/xen-x86_32.h (contents, props changed) projects/vps/sys/xen/interface/arch-x86/xen-x86_64.h (contents, props changed) projects/vps/sys/xen/interface/arch-x86/xen.h (contents, props changed) projects/vps/sys/xen/interface/arch-x86_32.h (contents, props changed) projects/vps/sys/xen/interface/arch-x86_64.h (contents, props changed) projects/vps/sys/xen/interface/domctl.h (contents, props changed) projects/vps/sys/xen/interface/elfnote.h (contents, props changed) projects/vps/sys/xen/interface/event_channel.h (contents, props changed) projects/vps/sys/xen/interface/features.h (contents, props changed) projects/vps/sys/xen/interface/foreign/structs.py (contents, props changed) projects/vps/sys/xen/interface/grant_table.h (contents, props changed) projects/vps/sys/xen/interface/hvm/hvm_info_table.h (contents, props changed) projects/vps/sys/xen/interface/hvm/hvm_op.h (contents, props changed) projects/vps/sys/xen/interface/hvm/ioreq.h (contents, props changed) projects/vps/sys/xen/interface/hvm/params.h (contents, props changed) projects/vps/sys/xen/interface/hvm/save.h (contents, props changed) projects/vps/sys/xen/interface/io/blkif.h (contents, props changed) projects/vps/sys/xen/interface/io/netif.h (contents, props changed) projects/vps/sys/xen/interface/io/pciif.h (contents, props changed) projects/vps/sys/xen/interface/io/protocols.h (contents, props changed) projects/vps/sys/xen/interface/io/ring.h (contents, props changed) projects/vps/sys/xen/interface/io/xs_wire.h (contents, props changed) projects/vps/sys/xen/interface/kexec.h (contents, props changed) projects/vps/sys/xen/interface/memory.h (contents, props changed) projects/vps/sys/xen/interface/nmi.h (contents, props changed) projects/vps/sys/xen/interface/physdev.h (contents, props changed) projects/vps/sys/xen/interface/platform.h (contents, props changed) projects/vps/sys/xen/interface/sched.h (contents, props changed) projects/vps/sys/xen/interface/sysctl.h (contents, props changed) projects/vps/sys/xen/interface/trace.h (contents, props changed) projects/vps/sys/xen/interface/vcpu.h (contents, props changed) projects/vps/sys/xen/interface/version.h (contents, props changed) projects/vps/sys/xen/interface/xen-compat.h (contents, props changed) projects/vps/sys/xen/interface/xen.h (contents, props changed) projects/vps/sys/xen/interface/xenoprof.h (contents, props changed) projects/vps/sys/xen/xenstore/xenstore.c projects/vps/tools/build/mk/OptionalObsoleteFiles.inc projects/vps/tools/build/options/WITHOUT_KERBEROS_SUPPORT projects/vps/tools/build/options/makeman projects/vps/tools/regression/aio/aiop/aiop.c projects/vps/tools/regression/aio/aiotest/aiotest.c projects/vps/tools/regression/lib/libc/gen/test-fpclassify.c projects/vps/tools/regression/lib/libc/gen/test-ftw.c projects/vps/tools/regression/lib/libc/gen/test-wordexp.c projects/vps/tools/regression/lib/libc/nss/test-getaddr.c projects/vps/tools/regression/lib/libc/nss/test-getgr.c projects/vps/tools/regression/lib/libc/nss/test-gethostby.c projects/vps/tools/regression/lib/libc/nss/test-getproto.c projects/vps/tools/regression/lib/libc/nss/test-getpw.c projects/vps/tools/regression/lib/libc/nss/test-getrpc.c projects/vps/tools/regression/lib/libc/nss/test-getusershell.c projects/vps/tools/regression/lib/libc/nss/testutil.h projects/vps/tools/regression/priv/Makefile projects/vps/tools/regression/pthread/cv_cancel1/cv_cancel1.c projects/vps/tools/regression/sbin/dhclient/Makefile projects/vps/tools/tools/ath/Makefile projects/vps/tools/tools/ath/Makefile.inc projects/vps/tools/tools/ath/athspectral/athspectral.c projects/vps/tools/tools/crypto/ipsecstats.c projects/vps/tools/tools/cxgbetool/cxgbetool.c projects/vps/tools/tools/nanobsd/gateworks/common projects/vps/tools/tools/sysdoc/sysdoc.sh projects/vps/tools/tools/sysdoc/tunables.mdoc projects/vps/tools/tools/zfsboottest/Makefile projects/vps/tools/tools/zfsboottest/zfsboottest.c projects/vps/tools/tools/zfsboottest/zfsboottest.sh projects/vps/usr.bin/Makefile projects/vps/usr.bin/Makefile.amd64 projects/vps/usr.bin/Makefile.i386 projects/vps/usr.bin/Makefile.ia64 projects/vps/usr.bin/Makefile.powerpc projects/vps/usr.bin/Makefile.sparc64 projects/vps/usr.bin/calendar/calendar.c projects/vps/usr.bin/calendar/calendars/calendar.freebsd projects/vps/usr.bin/clang/clang/clang.1 projects/vps/usr.bin/clang/llc/llc.1 projects/vps/usr.bin/clang/llvm-objdump/Makefile projects/vps/usr.bin/clang/llvm-rtdyld/Makefile projects/vps/usr.bin/clang/opt/opt.1 projects/vps/usr.bin/csup/updater.h projects/vps/usr.bin/dtc/checking.cc projects/vps/usr.bin/dtc/dtc.1 projects/vps/usr.bin/dtc/fdt.cc projects/vps/usr.bin/fetch/fetch.1 projects/vps/usr.bin/fetch/fetch.c projects/vps/usr.bin/iconv/iconv.c projects/vps/usr.bin/kdump/kdump.c projects/vps/usr.bin/killall/killall.1 projects/vps/usr.bin/killall/killall.c projects/vps/usr.bin/mail/popen.c projects/vps/usr.bin/make/job.c projects/vps/usr.bin/mkcsmapper/lex.l projects/vps/usr.bin/mkesdb/lex.l projects/vps/usr.bin/netstat/inet.c projects/vps/usr.bin/netstat/inet6.c projects/vps/usr.bin/netstat/ipsec.c projects/vps/usr.bin/netstat/main.c projects/vps/usr.bin/netstat/mbuf.c projects/vps/usr.bin/netstat/mroute.c projects/vps/usr.bin/netstat/netstat.1 projects/vps/usr.bin/netstat/netstat.h projects/vps/usr.bin/netstat/pfkey.c projects/vps/usr.bin/netstat/route.c projects/vps/usr.bin/patch/Makefile projects/vps/usr.bin/patch/patch.c projects/vps/usr.bin/patch/pch.c projects/vps/usr.bin/rwho/rwho.c projects/vps/usr.bin/sed/main.c projects/vps/usr.bin/sort/vsort.h projects/vps/usr.bin/systat/Makefile projects/vps/usr.bin/systat/cmdtab.c projects/vps/usr.bin/systat/extern.h projects/vps/usr.bin/systat/systat.1 projects/vps/usr.bin/truss/syscalls.c projects/vps/usr.bin/uniq/uniq.c projects/vps/usr.sbin/Makefile projects/vps/usr.sbin/Makefile.amd64 projects/vps/usr.sbin/Makefile.i386 projects/vps/usr.sbin/Makefile.ia64 projects/vps/usr.sbin/Makefile.powerpc projects/vps/usr.sbin/Makefile.sparc64 projects/vps/usr.sbin/acpi/acpidb/acpidb.c projects/vps/usr.sbin/acpi/acpidump/acpi.c projects/vps/usr.sbin/authpf/Makefile projects/vps/usr.sbin/bhyve/Makefile projects/vps/usr.sbin/bhyve/atpic.c projects/vps/usr.sbin/bhyve/bhyverun.c projects/vps/usr.sbin/bhyve/pci_emul.c projects/vps/usr.sbin/bhyve/pci_emul.h projects/vps/usr.sbin/bhyve/pci_virtio_block.c projects/vps/usr.sbin/bhyve/pci_virtio_net.c projects/vps/usr.sbin/bhyve/rtc.c projects/vps/usr.sbin/bhyve/virtio.h projects/vps/usr.sbin/bsdconfig/USAGE projects/vps/usr.sbin/bsdconfig/bsdconfig projects/vps/usr.sbin/bsdconfig/bsdconfig.8 projects/vps/usr.sbin/bsdconfig/console/INDEX projects/vps/usr.sbin/bsdconfig/console/USAGE projects/vps/usr.sbin/bsdconfig/console/console projects/vps/usr.sbin/bsdconfig/console/font projects/vps/usr.sbin/bsdconfig/console/include/messages.subr projects/vps/usr.sbin/bsdconfig/console/keymap projects/vps/usr.sbin/bsdconfig/console/repeat projects/vps/usr.sbin/bsdconfig/console/saver projects/vps/usr.sbin/bsdconfig/console/screenmap projects/vps/usr.sbin/bsdconfig/console/ttys projects/vps/usr.sbin/bsdconfig/diskmgmt/INDEX projects/vps/usr.sbin/bsdconfig/diskmgmt/USAGE projects/vps/usr.sbin/bsdconfig/diskmgmt/diskmgmt projects/vps/usr.sbin/bsdconfig/docsinstall/INDEX projects/vps/usr.sbin/bsdconfig/docsinstall/USAGE projects/vps/usr.sbin/bsdconfig/docsinstall/docsinstall projects/vps/usr.sbin/bsdconfig/dot/INDEX projects/vps/usr.sbin/bsdconfig/dot/USAGE projects/vps/usr.sbin/bsdconfig/dot/dot projects/vps/usr.sbin/bsdconfig/examples/Makefile projects/vps/usr.sbin/bsdconfig/examples/bsdconfigrc projects/vps/usr.sbin/bsdconfig/include/media.hlp projects/vps/usr.sbin/bsdconfig/include/messages.subr projects/vps/usr.sbin/bsdconfig/mouse/INDEX projects/vps/usr.sbin/bsdconfig/mouse/USAGE projects/vps/usr.sbin/bsdconfig/mouse/disable projects/vps/usr.sbin/bsdconfig/mouse/enable projects/vps/usr.sbin/bsdconfig/mouse/flags projects/vps/usr.sbin/bsdconfig/mouse/include/messages.subr projects/vps/usr.sbin/bsdconfig/mouse/mouse projects/vps/usr.sbin/bsdconfig/mouse/port projects/vps/usr.sbin/bsdconfig/mouse/type projects/vps/usr.sbin/bsdconfig/networking/INDEX projects/vps/usr.sbin/bsdconfig/networking/USAGE projects/vps/usr.sbin/bsdconfig/networking/defaultrouter projects/vps/usr.sbin/bsdconfig/networking/devices projects/vps/usr.sbin/bsdconfig/networking/hostname projects/vps/usr.sbin/bsdconfig/networking/include/messages.subr projects/vps/usr.sbin/bsdconfig/networking/nameservers projects/vps/usr.sbin/bsdconfig/networking/networking projects/vps/usr.sbin/bsdconfig/networking/share/Makefile projects/vps/usr.sbin/bsdconfig/networking/share/common.subr projects/vps/usr.sbin/bsdconfig/networking/share/device.subr projects/vps/usr.sbin/bsdconfig/networking/share/hostname.subr projects/vps/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/vps/usr.sbin/bsdconfig/networking/share/media.subr projects/vps/usr.sbin/bsdconfig/networking/share/netmask.subr projects/vps/usr.sbin/bsdconfig/networking/share/resolv.subr projects/vps/usr.sbin/bsdconfig/networking/share/routing.subr projects/vps/usr.sbin/bsdconfig/packages/INDEX projects/vps/usr.sbin/bsdconfig/packages/USAGE projects/vps/usr.sbin/bsdconfig/packages/packages projects/vps/usr.sbin/bsdconfig/password/INDEX projects/vps/usr.sbin/bsdconfig/password/USAGE projects/vps/usr.sbin/bsdconfig/password/password projects/vps/usr.sbin/bsdconfig/password/share/password.subr projects/vps/usr.sbin/bsdconfig/security/INDEX projects/vps/usr.sbin/bsdconfig/security/USAGE projects/vps/usr.sbin/bsdconfig/security/include/messages.subr projects/vps/usr.sbin/bsdconfig/security/kern_securelevel projects/vps/usr.sbin/bsdconfig/security/security projects/vps/usr.sbin/bsdconfig/share/common.subr projects/vps/usr.sbin/bsdconfig/share/device.subr projects/vps/usr.sbin/bsdconfig/share/dialog.subr projects/vps/usr.sbin/bsdconfig/share/media/Makefile projects/vps/usr.sbin/bsdconfig/share/media/any.subr projects/vps/usr.sbin/bsdconfig/share/media/cdrom.subr projects/vps/usr.sbin/bsdconfig/share/media/common.subr projects/vps/usr.sbin/bsdconfig/share/media/directory.subr projects/vps/usr.sbin/bsdconfig/share/media/dos.subr projects/vps/usr.sbin/bsdconfig/share/media/floppy.subr projects/vps/usr.sbin/bsdconfig/share/media/ftp.subr projects/vps/usr.sbin/bsdconfig/share/media/httpproxy.subr projects/vps/usr.sbin/bsdconfig/share/media/network.subr projects/vps/usr.sbin/bsdconfig/share/media/nfs.subr projects/vps/usr.sbin/bsdconfig/share/media/options.subr projects/vps/usr.sbin/bsdconfig/share/media/tcpip.subr projects/vps/usr.sbin/bsdconfig/share/media/ufs.subr projects/vps/usr.sbin/bsdconfig/share/media/usb.subr projects/vps/usr.sbin/bsdconfig/share/mustberoot.subr projects/vps/usr.sbin/bsdconfig/share/packages/categories.subr projects/vps/usr.sbin/bsdconfig/share/packages/index.subr projects/vps/usr.sbin/bsdconfig/share/packages/packages.subr projects/vps/usr.sbin/bsdconfig/share/script.subr projects/vps/usr.sbin/bsdconfig/share/strings.subr projects/vps/usr.sbin/bsdconfig/share/struct.subr projects/vps/usr.sbin/bsdconfig/share/sysrc.subr projects/vps/usr.sbin/bsdconfig/share/variable.subr projects/vps/usr.sbin/bsdconfig/startup/INDEX projects/vps/usr.sbin/bsdconfig/startup/USAGE projects/vps/usr.sbin/bsdconfig/startup/include/messages.subr projects/vps/usr.sbin/bsdconfig/startup/misc projects/vps/usr.sbin/bsdconfig/startup/rcadd projects/vps/usr.sbin/bsdconfig/startup/rcconf projects/vps/usr.sbin/bsdconfig/startup/rcdelete projects/vps/usr.sbin/bsdconfig/startup/rcedit projects/vps/usr.sbin/bsdconfig/startup/rcvar projects/vps/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/vps/usr.sbin/bsdconfig/startup/share/rcvar.subr projects/vps/usr.sbin/bsdconfig/startup/startup projects/vps/usr.sbin/bsdconfig/timezone/INDEX projects/vps/usr.sbin/bsdconfig/timezone/USAGE projects/vps/usr.sbin/bsdconfig/timezone/share/continents.subr projects/vps/usr.sbin/bsdconfig/timezone/share/countries.subr projects/vps/usr.sbin/bsdconfig/timezone/share/iso3166.subr projects/vps/usr.sbin/bsdconfig/timezone/share/menus.subr projects/vps/usr.sbin/bsdconfig/timezone/share/zones.subr projects/vps/usr.sbin/bsdconfig/timezone/timezone projects/vps/usr.sbin/bsdconfig/ttys/INDEX projects/vps/usr.sbin/bsdconfig/ttys/USAGE projects/vps/usr.sbin/bsdconfig/ttys/ttys projects/vps/usr.sbin/bsdconfig/usermgmt/INDEX projects/vps/usr.sbin/bsdconfig/usermgmt/USAGE projects/vps/usr.sbin/bsdconfig/usermgmt/groupadd projects/vps/usr.sbin/bsdconfig/usermgmt/groupdel projects/vps/usr.sbin/bsdconfig/usermgmt/groupedit projects/vps/usr.sbin/bsdconfig/usermgmt/groupinput projects/vps/usr.sbin/bsdconfig/usermgmt/include/messages.subr projects/vps/usr.sbin/bsdconfig/usermgmt/share/group_input.subr projects/vps/usr.sbin/bsdconfig/usermgmt/share/user_input.subr projects/vps/usr.sbin/bsdconfig/usermgmt/useradd projects/vps/usr.sbin/bsdconfig/usermgmt/userdel projects/vps/usr.sbin/bsdconfig/usermgmt/useredit projects/vps/usr.sbin/bsdconfig/usermgmt/userinput projects/vps/usr.sbin/bsdconfig/usermgmt/usermgmt projects/vps/usr.sbin/bsdinstall/partedit/diskeditor.c projects/vps/usr.sbin/bsdinstall/scripts/mirrorselect projects/vps/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt projects/vps/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c projects/vps/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def projects/vps/usr.sbin/gssd/gssd.8 projects/vps/usr.sbin/gssd/gssd.c projects/vps/usr.sbin/makefs/cd9660.c projects/vps/usr.sbin/makefs/cd9660/iso9660_rrip.c projects/vps/usr.sbin/makefs/ffs/ufs_bswap.h projects/vps/usr.sbin/mergemaster/mergemaster.8 projects/vps/usr.sbin/newsyslog/newsyslog.c projects/vps/usr.sbin/nfsd/nfsv4.4 projects/vps/usr.sbin/nvram/nvram.c projects/vps/usr.sbin/pciconf/cap.c projects/vps/usr.sbin/pkg/config.c projects/vps/usr.sbin/pkg_install/add/extract.c projects/vps/usr.sbin/pkg_install/create/pl.c projects/vps/usr.sbin/pkg_install/lib/exec.c projects/vps/usr.sbin/portsnap/portsnap/portsnap.sh projects/vps/usr.sbin/powerd/powerd.8 projects/vps/usr.sbin/powerd/powerd.c projects/vps/usr.sbin/ppp/defs.c projects/vps/usr.sbin/ppp/defs.h projects/vps/usr.sbin/pw/pw_user.c projects/vps/usr.sbin/rtadvd/config.c projects/vps/usr.sbin/rtadvd/rtadvd.c projects/vps/usr.sbin/rtsold/rtsol.c projects/vps/usr.sbin/rwhod/rwhod.c projects/vps/usr.sbin/sysrc/sysrc projects/vps/usr.sbin/sysrc/sysrc.8 projects/vps/usr.sbin/watchdogd/watchdogd.8 projects/vps/usr.sbin/watchdogd/watchdogd.c projects/vps/usr.sbin/wpa/Makefile.crypto projects/vps/usr.sbin/wpa/Makefile.inc projects/vps/usr.sbin/wpa/hostapd/Makefile projects/vps/usr.sbin/wpa/hostapd_cli/Makefile projects/vps/usr.sbin/wpa/wpa_cli/Makefile projects/vps/usr.sbin/wpa/wpa_passphrase/Makefile projects/vps/usr.sbin/wpa/wpa_supplicant/Makefile projects/vps/usr.sbin/ypserv/yp_access.c projects/vps/usr.sbin/ypserv/yp_dnslookup.c projects/vps/usr.sbin/ypserv/yp_main.c Directory Properties: projects/vps/ (props changed) projects/vps/cddl/ (props changed) projects/vps/cddl/contrib/opensolaris/ (props changed) projects/vps/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) projects/vps/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/vps/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/vps/contrib/bind9/ (props changed) projects/vps/contrib/binutils/ (props changed) projects/vps/contrib/bmake/ (props changed) projects/vps/contrib/dialog/ (props changed) projects/vps/contrib/gcc/ (props changed) projects/vps/contrib/gdb/ (props changed) projects/vps/contrib/ipfilter/ (props changed) projects/vps/contrib/libc++/ (props changed) projects/vps/contrib/libcxxrt/ (props changed) projects/vps/contrib/libstdc++/ (props changed) projects/vps/contrib/llvm/ (props changed) projects/vps/contrib/llvm/tools/clang/ (props changed) projects/vps/contrib/openbsm/ (props changed) projects/vps/contrib/tcpdump/ (props changed) projects/vps/contrib/tzdata/ (props changed) projects/vps/contrib/wpa/ (props changed) projects/vps/contrib/wpa/hostapd/eap_testing.txt (props changed) projects/vps/contrib/wpa/hostapd/hostapd.8 (props changed) projects/vps/contrib/wpa/hostapd/hostapd_cli.1 (props changed) projects/vps/contrib/wpa/hostapd/logwatch/hostapd.conf (props changed) projects/vps/contrib/wpa/hostapd/wired.conf (props changed) projects/vps/contrib/wpa/src/ap/vlan_init.h (props changed) projects/vps/contrib/wpa/src/ap/wmm.h (props changed) projects/vps/contrib/wpa/src/utils/radiotap.c (props changed) projects/vps/contrib/wpa/src/wps/http.h (props changed) projects/vps/contrib/wpa/wpa_supplicant/dbus/dbus-wpa_supplicant.conf (props changed) projects/vps/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-getall.py (props changed) projects/vps/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-wps.py (props changed) projects/vps/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new.py (props changed) projects/vps/crypto/heimdal/ (props changed) projects/vps/crypto/openssh/ (props changed) projects/vps/gnu/lib/ (props changed) projects/vps/gnu/usr.bin/gdb/ (props changed) projects/vps/lib/libc/ (props changed) projects/vps/lib/libutil/ (props changed) projects/vps/sbin/ (props changed) projects/vps/sbin/ipfw/ (props changed) projects/vps/share/man/man4/ (props changed) projects/vps/sys/ (props changed) projects/vps/sys/amd64/include/xen/ (props changed) projects/vps/sys/amd64/vmm/ (props changed) projects/vps/sys/boot/ (props changed) projects/vps/sys/cddl/contrib/opensolaris/ (props changed) projects/vps/sys/conf/ (props changed) projects/vps/sys/contrib/dev/acpica/ (props changed) projects/vps/sys/contrib/dev/acpica/common/ (props changed) projects/vps/sys/contrib/dev/acpica/compiler/ (props changed) projects/vps/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/vps/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/vps/sys/contrib/dev/acpica/components/dispatcher/ (props changed) projects/vps/sys/contrib/dev/acpica/components/events/ (props changed) projects/vps/sys/contrib/dev/acpica/components/executer/ (props changed) projects/vps/sys/contrib/dev/acpica/components/hardware/ (props changed) projects/vps/sys/contrib/dev/acpica/components/namespace/ (props changed) projects/vps/sys/contrib/dev/acpica/components/parser/ (props changed) projects/vps/sys/contrib/dev/acpica/components/resources/ (props changed) projects/vps/sys/contrib/dev/acpica/components/tables/ (props changed) projects/vps/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/vps/sys/contrib/dev/acpica/include/ (props changed) projects/vps/sys/contrib/dev/acpica/os_specific/ (props changed) projects/vps/sys/contrib/ipfilter/ (props changed) projects/vps/sys/xen/interface/ (props changed) projects/vps/sys/xen/interface/COPYING (props changed) projects/vps/sys/xen/interface/acm.h (props changed) projects/vps/sys/xen/interface/acm_ops.h (props changed) projects/vps/sys/xen/interface/arch-powerpc.h (props changed) projects/vps/sys/xen/interface/arch-x86/ (props changed) projects/vps/sys/xen/interface/arch-x86/hvm/ (props changed) projects/vps/sys/xen/interface/callback.h (props changed) projects/vps/sys/xen/interface/dom0_ops.h (props changed) projects/vps/sys/xen/interface/elfstructs.h (props changed) projects/vps/sys/xen/interface/foreign/ (props changed) projects/vps/sys/xen/interface/foreign/Makefile (props changed) projects/vps/sys/xen/interface/foreign/mkchecker.py (props changed) projects/vps/sys/xen/interface/foreign/mkheader.py (props changed) projects/vps/sys/xen/interface/foreign/reference.size (props changed) projects/vps/sys/xen/interface/hvm/ (props changed) projects/vps/sys/xen/interface/hvm/e820.h (props changed) projects/vps/sys/xen/interface/io/ (props changed) projects/vps/sys/xen/interface/io/console.h (props changed) projects/vps/sys/xen/interface/io/fbif.h (props changed) projects/vps/sys/xen/interface/io/kbdif.h (props changed) projects/vps/sys/xen/interface/io/tpmif.h (props changed) projects/vps/sys/xen/interface/io/xenbus.h (props changed) projects/vps/sys/xen/interface/libelf.h (props changed) projects/vps/sys/xen/interface/xencomm.h (props changed) projects/vps/usr.bin/calendar/ (props changed) projects/vps/usr.bin/csup/ (props changed) projects/vps/usr.sbin/bhyve/ (props changed) projects/vps/usr.sbin/rtadvd/ (props changed) projects/vps/usr.sbin/rtsold/ (props changed) Modified: projects/vps/Makefile ============================================================================== --- projects/vps/Makefile Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/Makefile Wed Oct 23 19:02:26 2013 (r257008) @@ -32,6 +32,12 @@ # targets - Print a list of supported TARGET/TARGET_ARCH pairs # for world and kernel targets. # toolchains - Build a toolchain for all world and kernel targets. +# +# "quick" way to test all kernel builds: +# _jflag=`sysctl -n hw.ncpu` +# _jflag=$(($_jflag * 2)) +# [ $_jflag -gt 12 ] && _jflag=12 +# make universe -DMAKE_JUST_KERNELS JFLAG=-j${_jflag} # # This makefile is simple by design. The FreeBSD make automatically reads # the /usr/share/mk/sys.mk unless the -m argument is specified on the @@ -124,11 +130,34 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ (in make.conf(5)) or command-line variable. .endif -MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE} -BINMAKE= \ - `if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \ + +# We often need to use the tree's version of make to build it. +# Choices add to complexity though. +# We cannot blindly use a make which may not be the one we want +# so be exlicit - until all choice is removed. +.if !defined(WITHOUT_BMAKE) +WANT_MAKE= bmake +.else +WANT_MAKE= fmake +.endif +MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE} +.if defined(.PARSEDIR) +HAVE_MAKE= bmake +.else +HAVE_MAKE= fmake +.endif +.if exists(${MYMAKE}) +SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk +.elif ${WANT_MAKE} != ${HAVE_MAKE} || ${WANT_MAKE} != "bmake" +# It may not exist yet but we may cause it to. +# In the case of fmake, upgrade_checks may cause a newer version to be built. +SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \ -m ${.CURDIR}/share/mk -_MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} +.else +SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk +.endif + +_MAKE= PATH=${PATH} ${SUB_MAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) @@ -209,6 +238,12 @@ cleanworld: # Handle the user-driven targets, using the source relative mk files. # +.if empty(.MAKEFLAGS:M-n) +# skip this for -n to avoid changing previous behavior of +# 'make -n buildworld' etc. +${TGTS}: .MAKE +.endif + ${TGTS}: ${_+_}@cd ${.CURDIR}; ${_MAKE} ${.TARGET} @@ -279,11 +314,13 @@ kernel: buildkernel installkernel # Perform a few tests to determine if the installed tools are adequate # for building the world. # +# Note: if we ever need to care about the version of bmake, simply testing +# MAKE_VERSION against a required version should suffice. +# upgrade_checks: -.if !defined(.PARSEDIR) -.if !defined(WITHOUT_BMAKE) - (cd ${.CURDIR} && ${MAKE} bmake) -.else +.if ${HAVE_MAKE} != ${WANT_MAKE} + @(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,}) +.elif ${WANT_MAKE} == "fmake" @if ! (cd ${.CURDIR}/tools/build/make_check && \ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ @@ -291,14 +328,13 @@ upgrade_checks: (cd ${.CURDIR} && ${MAKE} make); \ fi .endif -.endif # # Upgrade make(1) to the current version using the installed # headers, libraries and tools. Also, allow the location of # the system bsdmake-like utility to be overridden. # -MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ +MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" MMAKE= ${MMAKEENV} ${MAKE} \ @@ -315,7 +351,7 @@ make bmake: .PHONY ${MMAKE} obj && \ ${MMAKE} depend && \ ${MMAKE} all && \ - ${MMAKE} install DESTDIR=${MAKEPATH} BINDIR= + ${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= PROGNAME=${MYMAKE:T} tinderbox: @cd ${.CURDIR} && ${MAKE} DOING_TINDERBOX=YES universe @@ -365,7 +401,8 @@ MAKEFAIL=tee -a ${FAILFILE} MAKEFAIL=cat .endif -universe: universe_prologue upgrade_checks +universe_prologue: upgrade_checks +universe: universe_prologue universe_prologue: @echo "--------------------------------------------------------------" @echo ">>> make universe started on ${STARTTIME}" @@ -375,9 +412,9 @@ universe_prologue: .endif .for target in ${TARGETS} universe: universe_${target} -.ORDER: universe_prologue upgrade_checks universe_${target} universe_epilogue +universe_epilogue: universe_${target} universe_${target}: universe_${target}_prologue -universe_${target}_prologue: +universe_${target}_prologue: universe_prologue @echo ">> ${target} started on `LC_ALL=C date`" .if !defined(MAKE_JUST_KERNELS) .for target_arch in ${TARGET_ARCHES_${target}} @@ -385,7 +422,7 @@ universe_${target}: universe_${target}_$ universe_${target}_${target_arch}: universe_${target}_prologue @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`" @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ - ${MAKE} ${JFLAG} ${UNIVERSE_TARGET} \ + ${SUB_MAKE} ${JFLAG} ${UNIVERSE_TARGET} \ TARGET=${target} \ TARGET_ARCH=${target_arch} \ > _.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \ @@ -406,11 +443,11 @@ universe_${target}: universe_${target}_k universe_${target}_kernels: universe_${target}_prologue .if exists(${KERNSRCDIR}/${target}/conf/NOTES) @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \ - ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ + ${SUB_MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ (echo "${target} 'make LINT' failed," \ "check _.${target}.makeLINT for details"| ${MAKEFAIL})) .endif - @cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \ + @cd ${.CURDIR} && ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \ universe_kernels .endif @echo ">> ${target} completed on `LC_ALL=C date`" @@ -433,7 +470,7 @@ TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR} universe_kernconfs: universe_kernconf_${TARGET}_${kernel} universe_kernconf_${TARGET}_${kernel}: @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ - ${MAKE} ${JFLAG} buildkernel \ + ${SUB_MAKE} ${JFLAG} buildkernel \ TARGET=${TARGET} \ TARGET_ARCH=${TARGET_ARCH_${kernel}} \ KERNCONF=${kernel} \ Modified: projects/vps/Makefile.inc1 ============================================================================== --- projects/vps/Makefile.inc1 Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/Makefile.inc1 Wed Oct 23 19:02:26 2013 (r257008) @@ -263,6 +263,13 @@ WMAKEENV= ${CROSSENV} \ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} + +# make hierarchy +HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} +.if defined(NO_ROOT) +HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT +.endif + .if ${MK_CDDL} == "no" WMAKEENV+= NO_CTF=1 .endif @@ -826,6 +833,18 @@ distributeworld installworld: installche awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \ ${DESTDIR}/${DISTDIR}/${dist}.meta .endfor +.if ${MK_DEBUG_FILES} != "no" +. for dist in base ${EXTRA_DISTRIBUTIONS} + @# For each file that exists in this dist, print the corresponding + @# line from the METALOG. This relies on the fact that + @# a line containing only the filename will sort immediatly before + @# the relevant mtree line. + cd ${DESTDIR}/${DISTDIR}; \ + find ./${dist}/usr/lib/debug | sort -u ${METALOG} - | \ + awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \ + ${DESTDIR}/${DISTDIR}/${dist}.debug.meta +. endfor +.endif .endif .endif @@ -834,13 +853,29 @@ packageworld: .if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ + --exclude usr/lib/debug \ @${DESTDIR}/${DISTDIR}/${dist}.meta .else ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz . + tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \ + --exclude usr/lib/debug . .endif .endfor +.if ${MK_DEBUG_FILES} != "no" +. for dist in base ${EXTRA_DISTRIBUTIONS} +. if defined(NO_ROOT) + ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ + tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \ + @${DESTDIR}/${DISTDIR}/${dist}.debug.meta +. else + ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ + tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \ + usr/lib/debug +. endif +. endfor +.endif + # # reinstall # @@ -1124,11 +1159,11 @@ legacy: .endif .for _tool in tools/build ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ - ${MAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install .endfor @@ -1203,8 +1238,8 @@ _clang_tblgen= \ # dtrace tools are required for older bootstrap env and cross-build .if ${MK_CDDL} != "no" && \ - ((${BOOTSTRAPPING} < 800038 && \ - !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999)) \ + ((${BOOTSTRAPPING} < 1000034 && \ + !(${BOOTSTRAPPING} >= 901505 && ${BOOTSTRAPPING} < 999999)) \ || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH})) _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge @@ -1230,7 +1265,7 @@ _kerberos5_bootstrap_tools= \ # Please document (add comment) why something is in 'bootstrap-tools'. # Try to bound the building of the bootstrap-tool to just the # FreeBSD versions that need the tool built at this stage of the build. -bootstrap-tools: +bootstrap-tools: .MAKE .for _tool in \ ${_clang_tblgen} \ ${_kerberos5_bootstrap_tools} \ @@ -1257,10 +1292,10 @@ bootstrap-tools: ${_crunch} \ ${_nmtree} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ - ${MAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install .endfor @@ -1283,7 +1318,7 @@ _gcc_tools= gnu/usr.bin/cc/cc_tools _rescue= rescue/rescue .endif -build-tools: +build-tools: .MAKE .for _tool in \ bin/csh \ bin/sh \ @@ -1298,16 +1333,16 @@ build-tools: usr.bin/mkesdb_static \ usr.bin/mkcsmapper_static ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ ${MAKE} DIRPRFX=${_tool}/ build-tools .endfor .for _tool in \ ${_gcc_tools} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ ${MAKE} DIRPRFX=${_tool}/ all .endfor @@ -1345,7 +1380,7 @@ _cc= gnu/usr.bin/cc .endif .endif -cross-tools: +cross-tools: .MAKE .for _tool in \ ${_clang_libs} \ ${_clang} \ @@ -1356,10 +1391,10 @@ cross-tools: ${_crunchide} \ ${_kgzip} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ - ${MAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install .endfor @@ -1367,12 +1402,7 @@ cross-tools: # hierarchy - ensure that all the needed directories are present # hierarchy hier: -.if defined(NO_ROOT) - cd ${.CURDIR}/etc; ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} \ - -DNO_ROOT METALOG=${METALOG} distrib-dirs -.else - cd ${.CURDIR}/etc; ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs -.endif + cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs # # libraries - build all libraries, and install them under ${DESTDIR}. @@ -1381,12 +1411,12 @@ hierarchy hier: # interdependencies (__L) are built automatically by the # ${.CURDIR}/tools/make_libdeps.sh script. # -libraries: - cd ${.CURDIR}; \ - ${MAKE} -f Makefile.inc1 _prereq_libs; \ - ${MAKE} -f Makefile.inc1 _startup_libs; \ - ${MAKE} -f Makefile.inc1 _prebuild_libs; \ - ${MAKE} -f Makefile.inc1 _generic_libs; +libraries: .MAKE + cd ${.CURDIR} && \ + ${MAKE} -f Makefile.inc1 _prereq_libs && \ + ${MAKE} -f Makefile.inc1 _startup_libs && \ + ${MAKE} -f Makefile.inc1 _prebuild_libs && \ + ${MAKE} -f Makefile.inc1 _generic_libs # # static libgcc.a prerequisite for shared libc @@ -1540,25 +1570,25 @@ lib/libradius__L: lib/libmd__L .endif .for _lib in ${_prereq_libs} -${_lib}__PL: .PHONY +${_lib}__PL: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_lib}; \ - ${MAKE} DIRPRFX=${_lib}/ obj; \ - ${MAKE} DIRPRFX=${_lib}/ depend; \ - ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \ + cd ${.CURDIR}/${_lib} && \ + ${MAKE} DIRPRFX=${_lib}/ obj && \ + ${MAKE} DIRPRFX=${_lib}/ depend && \ + ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \ ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install .endif .endfor .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} -${_lib}__L: .PHONY +${_lib}__L: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_lib}; \ - ${MAKE} DIRPRFX=${_lib}/ obj; \ - ${MAKE} DIRPRFX=${_lib}/ depend; \ - ${MAKE} DIRPRFX=${_lib}/ all; \ + cd ${.CURDIR}/${_lib} && \ + ${MAKE} DIRPRFX=${_lib}/ obj && \ + ${MAKE} DIRPRFX=${_lib}/ depend && \ + ${MAKE} DIRPRFX=${_lib}/ all && \ ${MAKE} DIRPRFX=${_lib}/ install .endif .endfor @@ -1566,12 +1596,12 @@ ${_lib}__L: .PHONY # libpam is special: we need to build static PAM modules before # static PAM library, and dynamic PAM library before dynamic PAM # modules. -lib/libpam__L: .PHONY +lib/libpam__L: .PHONY .MAKE ${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \ - cd ${.CURDIR}/lib/libpam; \ - ${MAKE} DIRPRFX=lib/libpam/ obj; \ - ${MAKE} DIRPRFX=lib/libpam/ depend; \ - ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ + cd ${.CURDIR}/lib/libpam && \ + ${MAKE} DIRPRFX=lib/libpam/ obj && \ + ${MAKE} DIRPRFX=lib/libpam/ depend && \ + ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all && \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install _prereq_libs: ${_prereq_libs:S/$/__PL/} @@ -1581,8 +1611,8 @@ _generic_libs: ${_generic_libs:S/$/__L/} .for __target in all clean cleandepend cleandir depend includes obj .for entry in ${SUBDIR} -${entry}.${__target}__D: .PHONY - ${_+_}@if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \ +${entry}.${__target}__D: .PHONY .MAKE + ${_+_}@set -e; if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \ ${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH} (${__target})"; \ edir=${entry}.${MACHINE_ARCH}; \ cd ${.CURDIR}/$${edir}; \ @@ -1820,10 +1850,10 @@ _xb-bootstrap-tools: .for _tool in \ ${_clang_tblgen} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${CDMAKE} DIRPRFX=${_tool}/ obj; \ - ${CDMAKE} DIRPRFX=${_tool}/ depend; \ - ${CDMAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${CDMAKE} DIRPRFX=${_tool}/ obj && \ + ${CDMAKE} DIRPRFX=${_tool}/ depend && \ + ${CDMAKE} DIRPRFX=${_tool}/ all && \ ${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install .endfor @@ -1839,9 +1869,9 @@ _xb-cross-tools: ${_clang_libs} \ ${_clang} ${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \ - cd ${.CURDIR}/${_tool}; \ - ${CDMAKE} DIRPRFX=${_tool}/ obj; \ - ${CDMAKE} DIRPRFX=${_tool}/ depend; \ + cd ${.CURDIR}/${_tool} && \ + ${CDMAKE} DIRPRFX=${_tool}/ obj && \ + ${CDMAKE} DIRPRFX=${_tool}/ depend && \ ${CDMAKE} DIRPRFX=${_tool}/ all .endfor @@ -1890,3 +1920,5 @@ _xi-links: xdev xdev-build xdev-install: @echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target" .endif + +buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE Modified: projects/vps/ObsoleteFiles.inc ============================================================================== --- projects/vps/ObsoleteFiles.inc Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/ObsoleteFiles.inc Wed Oct 23 19:02:26 2013 (r257008) @@ -38,6 +38,48 @@ # xargs -n1 | sort | uniq -d; # done +# 20130710: libkvm version bump +OLD_LIBS+=lib/libkvm.so.5 +OLD_LIBS+=usr/lib32/libkvm.so.5 +# 20130623: dialog update from 1.1 to 1.2 +OLD_LIBS+=usr/lib/libdialog.so.7 +OLD_LIBS+=usr/lib32/libdialog.so.7 +# 20130616: vfs_mount.9 removed +OLD_FILES+=usr/share/man/man9/vfs_mount.9.gz +# 20130614: remove CVS from base +OLD_FILES+=usr/bin/cvs +OLD_FILES+=usr/bin/cvsbug +OLD_FILES+=usr/share/doc/psd/28.cvs/paper.ascii.gz +OLD_DIRS+=usr/share/doc/psd/28.cvs +OLD_FILES+=usr/share/examples/cvs/contrib/README +OLD_FILES+=usr/share/examples/cvs/contrib/clmerge +OLD_FILES+=usr/share/examples/cvs/contrib/cln_hist +OLD_FILES+=usr/share/examples/cvs/contrib/commit_prep +OLD_FILES+=usr/share/examples/cvs/contrib/cvs2vendor +OLD_FILES+=usr/share/examples/cvs/contrib/cvs_acls +OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck +OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck.man +OLD_FILES+=usr/share/examples/cvs/contrib/cvshelp.man +OLD_FILES+=usr/share/examples/cvs/contrib/descend.man +OLD_FILES+=usr/share/examples/cvs/contrib/easy-import +OLD_FILES+=usr/share/examples/cvs/contrib/intro.doc +OLD_FILES+=usr/share/examples/cvs/contrib/log +OLD_FILES+=usr/share/examples/cvs/contrib/log_accum +OLD_FILES+=usr/share/examples/cvs/contrib/mfpipe +OLD_FILES+=usr/share/examples/cvs/contrib/rcs-to-cvs +OLD_FILES+=usr/share/examples/cvs/contrib/rcs2log +OLD_FILES+=usr/share/examples/cvs/contrib/rcslock +OLD_FILES+=usr/share/examples/cvs/contrib/sccs2rcs +OLD_DIRS+=usr/share/examples/cvs/contrib +OLD_DIRS+=usr/share/examples/cvs +OLD_FILES+=usr/share/info/cvs.info.gz +OLD_FILES+=usr/share/info/cvsclient.info.gz +OLD_FILES+=usr/share/man/man1/cvs.1.gz +OLD_FILES+=usr/share/man/man5/cvs.5.gz +OLD_FILES+=usr/share/man/man8/cvsbug.8.gz +# 20130607: WITH_DEBUG_FILES added +OLD_FILES+=lib/libufs.so.6.symbols +OLD_FILES+=usr/lib32/libufs.so.6.symbols # 20130417: nfs fha moved from nfsserver to nfs OLD_FILES+=usr/include/nfsserver/nfs_fha.h # 20130411: new clang import which bumps version from 3.2 to 3.3. Modified: projects/vps/UPDATING ============================================================================== --- projects/vps/UPDATING Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/UPDATING Wed Oct 23 19:02:26 2013 (r257008) @@ -31,6 +31,80 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130729: + random(4) and actual RNG implementations (aka, adaptors) have been + further decoupled. If you are running a custom kernel, you may + need to explicitly enable at least one RNG adaptor in your kernel + config. For example, to use Yarrow, add "options YARROW_RNG" to + your kernel config. For hardware backed RNGs, use either + "RDRAND_RNG" or "PADLOCK_RNG" options. + If you use random.ko via 'random_load="YES"' in /boot/loader.conf + instead of "device random", you will need to change that to + 'yarrow_rng_load="YES"', 'rdrand_rng_load="YES"', or + 'padlock_rng_load="YES"'. random.ko will be loaded automatically + as a dependency module. + +20130726: + Behavior of devfs rules path matching has been changed. + Pattern is now always matched against fully qualified devfs + path and slash characters must be explicitly matched by + slashes in pattern (FNM_PATHNAME). Rulesets involving devfs + subdirectories must be reviewed. + +20130716: + The default ARM ABI has changed to the ARM EABI. The old ABI is + incompatible with the ARM EABI and all programs and modules will + need to be rebuilt to work with a new kernel. + + To keep using the old ABI ensure the WITHOUT_ARM_EABI knob is set. + + NOTE: Support for the old ABI will be removed in the future and + users are advised to upgrade. + +20130709: + pkg_install has been disconnected from the build if you really need it + you should add WITH_PKGTOOLS in your src.conf(5). + +20130709: + Most of network statistics structures were changed to be able + keep 64-bits counters. Thus all tools, that work with networking + statistics, must be rebuilt (netstat(1), bsnmpd(1), etc.) + +20130629: + Fix targets that run multiple make's to use && rather than ; + so that subsequent steps depend on success of previous. + + NOTE: if building 'universe' with -j* on stable/8 or stable/9 + it would be better to start the build using bmake, to avoid + overloading the machine. + +20130618: + Fix a bug that allowed a tracing process (e.g. gdb) to write + to a memory-mapped file in the traced process's address space + even if neither the traced process nor the tracing process had + write access to that file. + +20130615: + CVS has been removed from the base system. An exact copy + of the code is available from the devel/cvs port. + +20130613: + Some people report the following error after the switch to bmake: + + make: illegal option -- J + usage: make [-BPSXeiknpqrstv] [-C directory] [-D variable] + ... + *** [buildworld] Error code 2 + + this likely due to an old instance of make in + ${MAKEPATH} (${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}) + which src/Makefile will use that blindly, if it exists, so if + you see the above error: + + rm -rf `make -V MAKEPATH` + + should resolve it. + 20130516: Use bmake by default. Whereas before one could choose to build with bmake via Modified: projects/vps/bin/ed/re.c ============================================================================== --- projects/vps/bin/ed/re.c Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/ed/re.c Wed Oct 23 19:02:26 2013 (r257008) @@ -89,7 +89,7 @@ extract_pattern(int delimiter) default: break; case '[': - if ((nd = parse_char_class(++nd)) == NULL) { + if ((nd = parse_char_class(nd + 1)) == NULL) { errmsg = "unbalanced brackets ([])"; return NULL; } Modified: projects/vps/bin/sh/Makefile ============================================================================== --- projects/vps/bin/sh/Makefile Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/sh/Makefile Wed Oct 23 19:02:26 2013 (r257008) @@ -8,7 +8,7 @@ SHSRCS= alias.c arith_yacc.c arith_yylex histedit.c input.c jobs.c kill.c mail.c main.c memalloc.c miscbltin.c \ mystring.c options.c output.c parser.c printf.c redir.c show.c \ test.c trap.c var.c -GENSRCS= builtins.c init.c nodes.c syntax.c +GENSRCS= builtins.c nodes.c syntax.c GENHDRS= builtins.h nodes.h syntax.h token.h SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} @@ -30,26 +30,21 @@ WFORMAT=0 ${.CURDIR}/../test \ ${.CURDIR}/../../usr.bin/printf -CLEANFILES+= mkinit mkinit.o mknodes mknodes.o \ +CLEANFILES+= mknodes mknodes.o \ mksyntax mksyntax.o CLEANFILES+= ${GENSRCS} ${GENHDRS} -build-tools: mkinit mknodes mksyntax +build-tools: mknodes mksyntax .ORDER: builtins.c builtins.h builtins.c builtins.h: mkbuiltins builtins.def sh ${.CURDIR}/mkbuiltins ${.CURDIR} -init.c: mkinit alias.c eval.c exec.c input.c jobs.c options.c parser.c \ - redir.c trap.c var.c - ./mkinit ${.ALLSRC:S/^mkinit$//} - # XXX this is just to stop the default .c rule being used, so that the # intermediate object has a fixed name. # XXX we have a default .c rule, but no default .o rule. .o: ${CC} ${CFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} -mkinit: mkinit.o mknodes: mknodes.o mksyntax: mksyntax.o Modified: projects/vps/bin/sh/TOUR ============================================================================== --- projects/vps/bin/sh/TOUR Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/sh/TOUR Wed Oct 23 19:02:26 2013 (r257008) @@ -25,38 +25,11 @@ programs is: program input files generates ------- ----------- --------- mkbuiltins builtins builtins.h builtins.c - mkinit *.c init.c mknodes nodetypes nodes.h nodes.c mksyntax - syntax.h syntax.c mktokens - token.h -There are undoubtedly too many of these. Mkinit searches all the -C source files for entries looking like: - - RESET { - x = 2; /* executed when the shell does a longjmp - back to the main command loop */ - } - -It pulls this code out into routines which are when particular -events occur. The intent is to improve modularity by isolating -the information about which modules need to be explicitly -initialized/reset within the modules themselves. - -Mkinit recognizes several constructs for placing declarations in -the init.c file. - INCLUDE "file.h" -includes a file. The storage class MKINIT makes a declaration -available in the init.c file, for example: - MKINIT int funcnest; /* depth of function calls */ -MKINIT alone on a line introduces a structure or union declara- -tion: - MKINIT - struct redirtab { - short renamed[10]; - }; -Preprocessor #define statements are copied to init.c without any -special action to request this. +There are undoubtedly too many of these. EXCEPTIONS: Code for dealing with exceptions appears in exceptions.c. The C language doesn't include exception handling, Modified: projects/vps/bin/sh/eval.c ============================================================================== --- projects/vps/bin/sh/eval.c Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/sh/eval.c Wed Oct 23 19:02:26 2013 (r257008) @@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$"); int evalskip; /* set if we are skipping commands */ int skipcount; /* number of levels to skip */ -MKINIT int loopnest; /* current loop nesting level */ +static int loopnest; /* current loop nesting level */ int funcnest; /* depth of function calls */ static int builtin_flags; /* evalcommand flags for builtins */ @@ -104,16 +104,13 @@ static void prehash(union node *); * Called to reset things after an exception. */ -#ifdef mkinit -INCLUDE "eval.h" - -RESET { +void +reseteval(void) +{ evalskip = 0; loopnest = 0; funcnest = 0; } -#endif - /* @@ -589,7 +586,8 @@ evalpipe(union node *n) pip[1] = -1; if (lp->next) { if (pipe(pip) < 0) { - close(prevfd); + if (prevfd >= 0) + close(prevfd); error("Pipe call failed: %s", strerror(errno)); } } Modified: projects/vps/bin/sh/eval.h ============================================================================== --- projects/vps/bin/sh/eval.h Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/sh/eval.h Wed Oct 23 19:02:26 2013 (r257008) @@ -46,6 +46,8 @@ struct backcmd { /* result of evalbackc struct job *jp; /* job structure for command */ }; +void reseteval(void); + /* flags in argument to evaltree/evalstring */ #define EV_EXIT 01 /* exit after evaluating tree */ #define EV_TESTED 02 /* exit status is checked; ignore -e flag */ Modified: projects/vps/bin/sh/exec.c ============================================================================== --- projects/vps/bin/sh/exec.c Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/sh/exec.c Wed Oct 23 19:02:26 2013 (r257008) @@ -70,7 +70,6 @@ __FBSDID("$FreeBSD$"); #include "syntax.h" #include "memalloc.h" #include "error.h" -#include "init.h" #include "mystring.h" #include "show.h" #include "jobs.h" Modified: projects/vps/bin/sh/input.c ============================================================================== --- projects/vps/bin/sh/input.c Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/sh/input.c Wed Oct 23 19:02:26 2013 (r257008) @@ -92,7 +92,7 @@ struct parsefile { int plinno = 1; /* input line number */ int parsenleft; /* copy of parsefile->nleft */ -MKINIT int parselleft; /* copy of parsefile->lleft */ +static int parselleft; /* copy of parsefile->lleft */ const char *parsenextc; /* copy of parsefile->nextc */ static char basebuf[BUFSIZ + 1];/* buffer for top level input file */ static struct parsefile basepf = { /* top level input file */ @@ -108,15 +108,12 @@ static void pushfile(void); static int preadfd(void); static void popstring(void); -#ifdef mkinit -INCLUDE "input.h" -INCLUDE "error.h" - -RESET { +void +resetinput(void) +{ popallfiles(); parselleft = parsenleft = 0; /* clear input buffer */ } -#endif /* Modified: projects/vps/bin/sh/input.h ============================================================================== --- projects/vps/bin/sh/input.h Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/sh/input.h Wed Oct 23 19:02:26 2013 (r257008) @@ -47,6 +47,7 @@ extern const char *parsenextc; /* next c struct alias; struct parsefile; +void resetinput(void); char *pfgets(char *, int); int pgetc(void); int preadbuffer(void); Modified: projects/vps/bin/sh/jobs.c ============================================================================== --- projects/vps/bin/sh/jobs.c Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/sh/jobs.c Wed Oct 23 19:02:26 2013 (r257008) @@ -77,8 +77,8 @@ __FBSDID("$FreeBSD$"); static struct job *jobtab; /* array of jobs */ static int njobs; /* size of array */ -MKINIT pid_t backgndpid = -1; /* pid of last background process */ -MKINIT struct job *bgjob = NULL; /* last background process */ +static pid_t backgndpid = -1; /* pid of last background process */ +static struct job *bgjob = NULL; /* last background process */ #if JOBS static struct job *jobmru; /* most recently used job list */ static pid_t initialpgrp; /* pgrp of shell on invocation */ @@ -116,7 +116,7 @@ static void showjob(struct job *, int); * Turn job control on and off. */ -MKINIT int jobctl; +static int jobctl; #if JOBS void Modified: projects/vps/bin/sh/main.c ============================================================================== --- projects/vps/bin/sh/main.c Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/sh/main.c Wed Oct 23 19:02:26 2013 (r257008) @@ -68,10 +68,10 @@ __FBSDID("$FreeBSD$"); #include "show.h" #include "memalloc.h" #include "error.h" -#include "init.h" #include "mystring.h" #include "exec.h" #include "cd.h" +#include "redir.h" #include "builtins.h" int rootpid; @@ -79,6 +79,7 @@ int rootshell; struct jmploc main_handler; int localeisutf8, initial_localeisutf8; +static void reset(void); static void cmdloop(int); static void read_profile(const char *); static char *find_dot_file(char *); @@ -170,8 +171,8 @@ state3: if (minusc) { evalstring(minusc, sflag ? 0 : EV_EXIT); } +state4: if (sflag || minusc == NULL) { -state4: /* XXX ??? - why isn't this before the "if" statement */ cmdloop(1); } exitshell(exitstatus); @@ -179,6 +180,14 @@ state4: /* XXX ??? - why isn't this befo return 0; } +static void +reset(void) +{ + reseteval(); + resetinput(); + resetparser(); + resetredir(); +} /* * Read and execute commands. "Top" is nonzero for the top level command Modified: projects/vps/bin/sh/output.c ============================================================================== --- projects/vps/bin/sh/output.c Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/sh/output.c Wed Oct 23 19:02:26 2013 (r257008) @@ -75,25 +75,6 @@ struct output memout = {NULL, 0, NULL, 0 struct output *out1 = &output; struct output *out2 = &errout; - - -#ifdef mkinit - -INCLUDE "output.h" -INCLUDE "memalloc.h" - -RESET { - out1 = &output; - out2 = &errout; - if (memout.buf != NULL) { - ckfree(memout.buf); - memout.buf = NULL; - } -} - -#endif - - void outcslow(int c, struct output *file) { Modified: projects/vps/bin/sh/parser.c ============================================================================== --- projects/vps/bin/sh/parser.c Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/sh/parser.c Wed Oct 23 19:02:26 2013 (r257008) @@ -96,9 +96,9 @@ static struct heredoc *heredoclist; /* l static int doprompt; /* if set, prompt the user */ static int needprompt; /* true if interactive and at start of line */ static int lasttoken; /* last token read */ -MKINIT int tokpushback; /* last token pushed back */ +int tokpushback; /* last token pushed back */ static char *wordtext; /* text of last word returned by readtoken */ -MKINIT int checkkwd; /* 1 == check for kwds, 2 == also eat newlines */ +static int checkkwd; static struct nodelist *backquotelist; static union node *redirnode; static struct heredoc *heredoc; @@ -1819,13 +1819,13 @@ parsearith: { } /* end of readtoken */ - -#ifdef mkinit -RESET { +void +resetparser(void) +{ tokpushback = 0; checkkwd = 0; } -#endif + /* * Returns true if the text contains nothing to expand (no dollar signs Modified: projects/vps/bin/sh/parser.h ============================================================================== --- projects/vps/bin/sh/parser.h Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/sh/parser.h Wed Oct 23 19:02:26 2013 (r257008) @@ -79,6 +79,7 @@ extern const char *const parsekwd[]; union node *parsecmd(int); void fixredir(union node *, const char *, int); +void resetparser(void); int goodname(const char *); int isassignment(const char *); char *getprompt(void *); Modified: projects/vps/bin/sh/redir.c ============================================================================== --- projects/vps/bin/sh/redir.c Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/sh/redir.c Wed Oct 23 19:02:26 2013 (r257008) @@ -66,14 +66,13 @@ __FBSDID("$FreeBSD$"); #define CLOSED -1 /* fd was not open before redir */ -MKINIT struct redirtab { struct redirtab *next; int renamed[10]; }; -MKINIT struct redirtab *redirlist; +static struct redirtab *redirlist; /* * We keep track of whether or not fd0 has been redirected. This is for @@ -324,16 +323,13 @@ popredir(void) * Undo all redirections. Called on error or interrupt. */ -#ifdef mkinit - -INCLUDE "redir.h" - -RESET { +void +resetredir(void) +{ while (redirlist) popredir(); } -#endif /* Return true if fd 0 has already been redirected at least once. */ int Modified: projects/vps/bin/sh/redir.h ============================================================================== --- projects/vps/bin/sh/redir.h Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/sh/redir.h Wed Oct 23 19:02:26 2013 (r257008) @@ -40,6 +40,7 @@ union node; void redirect(union node *, int); void popredir(void); +void resetredir(void); int fd0_redirected_p(void); void clearredir(void); Modified: projects/vps/bin/sh/sh.1 ============================================================================== --- projects/vps/bin/sh/sh.1 Wed Oct 23 18:58:38 2013 (r257007) +++ projects/vps/bin/sh/sh.1 Wed Oct 23 19:02:26 2013 (r257008) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd June 5, 2013 +.Dd June 14, 2013 .Dt SH 1 .Os .Sh NAME @@ -1036,6 +1036,9 @@ The current working directory as set by The file creation mask as set by .Ic umask . .It *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 19:06:16 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 034F35D4; Wed, 23 Oct 2013 19:06:16 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E3D5D265D; Wed, 23 Oct 2013 19:06:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NJ6FhC005083; Wed, 23 Oct 2013 19:06:15 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NJ6Fde005082; Wed, 23 Oct 2013 19:06:15 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231906.r9NJ6Fde005082@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 19:06:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257009 - projects/vps/usr.sbin/vpsctl X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 19:06:16 -0000 Author: will Date: Wed Oct 23 19:06:15 2013 New Revision: 257009 URL: http://svnweb.freebsd.org/changeset/base/257009 Log: Sync with svn.7he.at/vps/trunk r201. r201 | klaus | 2013-07-31 02:29:02 -0600 (Wed, 31 Jul 2013) | 3 lines Fixed vpsctl Makefile. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/usr.sbin/vpsctl/Makefile Modified: projects/vps/usr.sbin/vpsctl/Makefile ============================================================================== --- projects/vps/usr.sbin/vpsctl/Makefile Wed Oct 23 19:02:26 2013 (r257008) +++ projects/vps/usr.sbin/vpsctl/Makefile Wed Oct 23 19:06:15 2013 (r257009) @@ -26,7 +26,7 @@ mkprivlist: true priv_ston.c priv_ntos.c: mkprivlist - ./mkprivlist.sh ${.CURDIR}/../../sys/sys/priv.h + ${.CURDIR}/mkprivlist.sh ${.CURDIR}/../../sys/sys/priv.h vpsctl: priv_ston.c priv_ntos.c cc -Wall -g -I../../sys -I/usr/include -o vpsctl \ From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 19:06:54 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7D9237B5; Wed, 23 Oct 2013 19:06:54 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5338E2677; Wed, 23 Oct 2013 19:06:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NJ6sow005326; Wed, 23 Oct 2013 19:06:54 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NJ6rwf005323; Wed, 23 Oct 2013 19:06:53 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231906.r9NJ6rwf005323@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 19:06:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257010 - in projects/vps: sys/vps tools/vps usr.sbin/vpsctl X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 19:06:54 -0000 Author: will Date: Wed Oct 23 19:06:53 2013 New Revision: 257010 URL: http://svnweb.freebsd.org/changeset/base/257010 Log: Sync with svn.7he.at/vps/trunk r202. r202 | klaus | 2013-08-01 01:05:34 -0600 (Thu, 01 Aug 2013) | 3 lines Some build fixes. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/sys/vps/vps_restore.c projects/vps/tools/vps/makepublicdiff.sh projects/vps/usr.sbin/vpsctl/Makefile Modified: projects/vps/sys/vps/vps_restore.c ============================================================================== --- projects/vps/sys/vps/vps_restore.c Wed Oct 23 19:06:15 2013 (r257009) +++ projects/vps/sys/vps/vps_restore.c Wed Oct 23 19:06:53 2013 (r257010) @@ -301,6 +301,7 @@ vps_restore_ucred_all(struct vps_snapst_ } VPSFUNC +__attribute__((unused)) static int vps_restore_ucred_checkall(struct vps_snapst_ctx *ctx, struct vps *vps) { @@ -976,7 +977,7 @@ vps_restore_kqueue(struct vps_snapst_ctx return (error); } fget(td, td->td_retval[0], 0, &fp); - DBGR("%s: kqueue installed at fd %ld\n", + DBGR("%s: kqueue installed at fd %zd\n", __func__, td->td_retval[0]); kq = NULL; @@ -2175,7 +2176,8 @@ vps_restore_inodenumtovnode(struct vps_s vdfi = (struct vps_dump_fileinodenum *)o1->data; - DBGR("%s: fsid=%lu fileid=%d\n", __func__, vdfi->fsid, vdfi->fileid); + DBGR("%s: fsid=%llu fileid=%d\n", + __func__, (unsigned long long)vdfi->fsid, vdfi->fileid); DBGR("%s: vps's rootpath=[%s] vnode=%p\n", __func__, vps->_rootpath, vps->_rootvnode); Modified: projects/vps/tools/vps/makepublicdiff.sh ============================================================================== --- projects/vps/tools/vps/makepublicdiff.sh Wed Oct 23 19:06:15 2013 (r257009) +++ projects/vps/tools/vps/makepublicdiff.sh Wed Oct 23 19:06:53 2013 (r257010) @@ -5,7 +5,7 @@ WORKDIR=head DIFFFILENAME=$(date '+vps-%Y%m%d_%s.diff') -diff -Naupr -x .svn -x rsync_vps.\* -I '$Id.*$' -I '$FreeBSD.*$' ${ORIGDIR} ${WORKDIR} > ${DIFFFILENAME} +diff -Naupr -x .svn -x rsync_vps.\* -x VPS_DBG -I '$Id.*$' -I '$FreeBSD.*$' ${ORIGDIR} ${WORKDIR} > ${DIFFFILENAME} ls -lh ${DIFFFILENAME} Modified: projects/vps/usr.sbin/vpsctl/Makefile ============================================================================== --- projects/vps/usr.sbin/vpsctl/Makefile Wed Oct 23 19:06:15 2013 (r257009) +++ projects/vps/usr.sbin/vpsctl/Makefile Wed Oct 23 19:06:53 2013 (r257010) @@ -25,9 +25,11 @@ clean: mkprivlist: true -priv_ston.c priv_ntos.c: mkprivlist +priv_generate: ${.CURDIR}/mkprivlist.sh ${.CURDIR}/../../sys/sys/priv.h +priv_ston.c priv_ntos.c: mkprivlist priv_generate + vpsctl: priv_ston.c priv_ntos.c cc -Wall -g -I../../sys -I/usr/include -o vpsctl \ ${.CURDIR}/vpsctl.c \ From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 19:12:04 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7DB09CFE; Wed, 23 Oct 2013 19:12:04 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6906E275A; Wed, 23 Oct 2013 19:12:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NJC4nY008524; Wed, 23 Oct 2013 19:12:04 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NJC2I4008512; Wed, 23 Oct 2013 19:12:02 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231912.r9NJC2I4008512@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 19:12:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257011 - in projects/vps: contrib/llvm/tools/clang/lib/Headers lib/libfetch sys/cam/scsi sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/dev/usb/wlan usr.bin/fetch usr.sbin/watchdogd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 19:12:04 -0000 Author: will Date: Wed Oct 23 19:12:02 2013 New Revision: 257011 URL: http://svnweb.freebsd.org/changeset/base/257011 Log: Sync with svn.7he.at/vps/trunk r203. Merge changes 253795:253808 from svn.freebsd.org/base/head/. to . No merge conflicts. r203 | klaus | 2013-08-01 01:09:07 -0600 (Thu, 01 Aug 2013) | 3 lines Update from FreeBSD r253795 to r253808. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/contrib/llvm/tools/clang/lib/Headers/cpuid.h projects/vps/lib/libfetch/fetch.3 projects/vps/lib/libfetch/http.c projects/vps/sys/cam/scsi/scsi_da.c projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/vps/sys/dev/usb/wlan/if_rsu.c projects/vps/usr.bin/fetch/fetch.1 projects/vps/usr.sbin/watchdogd/watchdogd.c Directory Properties: projects/vps/ (props changed) projects/vps/contrib/llvm/ (props changed) projects/vps/contrib/llvm/tools/clang/ (props changed) projects/vps/sys/ (props changed) projects/vps/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/vps/contrib/llvm/tools/clang/lib/Headers/cpuid.h ============================================================================== --- projects/vps/contrib/llvm/tools/clang/lib/Headers/cpuid.h Wed Oct 23 19:06:53 2013 (r257010) +++ projects/vps/contrib/llvm/tools/clang/lib/Headers/cpuid.h Wed Oct 23 19:12:02 2013 (r257011) @@ -25,10 +25,132 @@ #error this header is for x86 only #endif +/* Features in %ecx for level 1 */ +#define bit_SSE3 0x00000001 +#define bit_PCLMULQDQ 0x00000002 +#define bit_DTES64 0x00000004 +#define bit_MONITOR 0x00000008 +#define bit_DSCPL 0x00000010 +#define bit_VMX 0x00000020 +#define bit_SMX 0x00000040 +#define bit_EIST 0x00000080 +#define bit_TM2 0x00000100 +#define bit_SSSE3 0x00000200 +#define bit_CNXTID 0x00000400 +#define bit_FMA 0x00001000 +#define bit_CMPXCHG16B 0x00002000 +#define bit_xTPR 0x00004000 +#define bit_PDCM 0x00008000 +#define bit_PCID 0x00020000 +#define bit_DCA 0x00040000 +#define bit_SSE41 0x00080000 +#define bit_SSE42 0x00100000 +#define bit_x2APIC 0x00200000 +#define bit_MOVBE 0x00400000 +#define bit_POPCNT 0x00800000 +#define bit_TSCDeadline 0x01000000 +#define bit_AESNI 0x02000000 +#define bit_XSAVE 0x04000000 +#define bit_OSXSAVE 0x08000000 +#define bit_AVX 0x10000000 +#define bit_RDRAND 0x40000000 + +/* Features in %edx for level 1 */ +#define bit_FPU 0x00000001 +#define bit_VME 0x00000002 +#define bit_DE 0x00000004 +#define bit_PSE 0x00000008 +#define bit_TSC 0x00000010 +#define bit_MSR 0x00000020 +#define bit_PAE 0x00000040 +#define bit_MCE 0x00000080 +#define bit_CX8 0x00000100 +#define bit_APIC 0x00000200 +#define bit_SEP 0x00000800 +#define bit_MTRR 0x00001000 +#define bit_PGE 0x00002000 +#define bit_MCA 0x00004000 +#define bit_CMOV 0x00008000 +#define bit_PAT 0x00010000 +#define bit_PSE36 0x00020000 +#define bit_PSN 0x00040000 +#define bit_CLFSH 0x00080000 +#define bit_DS 0x00200000 +#define bit_ACPI 0x00400000 +#define bit_MMX 0x00800000 +#define bit_FXSR 0x01000000 +#define bit_SSE 0x02000000 +#define bit_SSE2 0x04000000 +#define bit_SS 0x08000000 +#define bit_HTT 0x10000000 +#define bit_TM 0x20000000 +#define bit_PBE 0x80000000 + +/* Features in %ebx for level 7 sub-leaf 0 */ +#define bit_FSGSBASE 0x00000001 +#define bit_SMEP 0x00000080 +#define bit_ENH_MOVSB 0x00000200 + +/* PIC on i386 uses %ebx, so preserve it. */ +#if __i386__ +#define __cpuid(__level, __eax, __ebx, __ecx, __edx) \ + __asm(" pushl %%ebx\n" \ + " cpuid\n" \ + " mov %%ebx,%1\n" \ + " popl %%ebx" \ + : "=a"(__eax), "=r" (__ebx), "=c"(__ecx), "=d"(__edx) \ + : "0"(__level)) + +#define __cpuid_count(__level, __count, __eax, __ebx, __ecx, __edx) \ + __asm(" pushl %%ebx\n" \ + " cpuid\n" \ + " mov %%ebx,%1\n" \ + " popl %%ebx" \ + : "=a"(__eax), "=r" (__ebx), "=c"(__ecx), "=d"(__edx) \ + : "0"(__level), "2"(__count)) +#else +#define __cpuid(__level, __eax, __ebx, __ecx, __edx) \ + __asm("cpuid" : "=a"(__eax), "=b" (__ebx), "=c"(__ecx), "=d"(__edx) \ + : "0"(__level)) + +#define __cpuid_count(__level, __count, __eax, __ebx, __ecx, __edx) \ + __asm("cpuid" : "=a"(__eax), "=b" (__ebx), "=c"(__ecx), "=d"(__edx) \ + : "0"(__level), "2"(__count)) +#endif + static __inline int __get_cpuid (unsigned int __level, unsigned int *__eax, unsigned int *__ebx, unsigned int *__ecx, unsigned int *__edx) { - __asm("cpuid" : "=a"(*__eax), "=b" (*__ebx), "=c"(*__ecx), "=d"(*__edx) - : "0"(__level)); + __cpuid(__level, *__eax, *__ebx, *__ecx, *__edx); return 1; } + +static __inline int __get_cpuid_max (unsigned int __level, unsigned int *__sig) +{ + unsigned int __eax, __ebx, __ecx, __edx; +#if __i386__ + int __cpuid_supported; + + __asm(" pushfl\n" + " popl %%eax\n" + " movl %%eax,%%ecx\n" + " xorl $0x00200000,%%eax\n" + " pushl %%eax\n" + " popfl\n" + " pushfl\n" + " popl %%eax\n" + " movl $0,%0\n" + " cmpl %%eax,%%ecx\n" + " je 1f\n" + " movl $1,%0\n" + "1:" + : "=r" (__cpuid_supported) : : "eax", "ecx"); + if (!__cpuid_supported) + return 0; +#endif + + __cpuid(__level, __eax, __ebx, __ecx, __edx); + if (__sig) + *__sig = __ebx; + return __eax; +} Modified: projects/vps/lib/libfetch/fetch.3 ============================================================================== --- projects/vps/lib/libfetch/fetch.3 Wed Oct 23 19:06:53 2013 (r257010) +++ projects/vps/lib/libfetch/fetch.3 Wed Oct 23 19:12:02 2013 (r257011) @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 1998-2011 Dag-Erling Smørgrav +.\" Copyright (c) 1998-2013 Dag-Erling Smørgrav .\" Copyright (c) 2013 Michael Gmelin .\" All rights reserved. .\" @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 25, 2013 +.Dd July 30, 2013 .Dt FETCH 3 .Os .Sh NAME @@ -571,6 +571,15 @@ variable is set. Same as .Ev FTP_PROXY , for compatibility. +.It Ev HTTP_ACCEPT +Specifies the value of the +.Va Accept +header for HTTP requests. +If empty, no +.Va Accept +header is sent. +The default is +.Dq */* . .It Ev HTTP_AUTH Specifies HTTP authorization parameters as a colon-separated list of items. Modified: projects/vps/lib/libfetch/http.c ============================================================================== --- projects/vps/lib/libfetch/http.c Wed Oct 23 19:06:53 2013 (r257010) +++ projects/vps/lib/libfetch/http.c Wed Oct 23 19:12:02 2013 (r257011) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2000-2011 Dag-Erling Smørgrav + * Copyright (c) 2000-2013 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1664,6 +1664,12 @@ http_request(struct url *URL, const char } /* other headers */ + if ((p = getenv("HTTP_ACCEPT")) != NULL) { + if (*p != '\0') + http_cmd(conn, "Accept: %s", p); + } else { + http_cmd(conn, "Accept: */*"); + } if ((p = getenv("HTTP_REFERER")) != NULL && *p != '\0') { if (strcasecmp(p, "auto") == 0) http_cmd(conn, "Referer: %s://%s%s", Modified: projects/vps/sys/cam/scsi/scsi_da.c ============================================================================== --- projects/vps/sys/cam/scsi/scsi_da.c Wed Oct 23 19:06:53 2013 (r257010) +++ projects/vps/sys/cam/scsi/scsi_da.c Wed Oct 23 19:12:02 2013 (r257011) @@ -98,7 +98,8 @@ typedef enum { DA_Q_NO_SYNC_CACHE = 0x01, DA_Q_NO_6_BYTE = 0x02, DA_Q_NO_PREVENT = 0x04, - DA_Q_4K = 0x08 + DA_Q_4K = 0x08, + DA_Q_NO_RC16 = 0x10 } da_quirks; #define DA_Q_BIT_STRING \ @@ -106,7 +107,8 @@ typedef enum { "\001NO_SYNC_CACHE" \ "\002NO_6_BYTE" \ "\003NO_PREVENT" \ - "\0044K" + "\0044K" \ + "\005NO_RC16" typedef enum { DA_CCB_PROBE_RC = 0x01, @@ -680,6 +682,11 @@ static struct da_quirk_entry da_quirk_ta {T_DIRECT, SIP_MEDIA_REMOVABLE, "Kingston", "DataTraveler G3", "1.00"}, /*quirks*/ DA_Q_NO_PREVENT }, + { + /* At least several Transcent USB sticks lie on RC16. */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "JetFlash", "Transcend*", + "*"}, /*quirks*/ DA_Q_NO_RC16 + }, /* ATA/SATA devices over SAS/USB/... */ { /* Hitachi Advanced Format (4k) drives */ @@ -2075,7 +2082,8 @@ daregister(struct cam_periph *periph, vo softc->minimum_cmd_size = 16; /* Predict whether device may support READ CAPACITY(16). */ - if (SID_ANSI_REV(&cgd->inq_data) >= SCSI_REV_SPC3) { + if (SID_ANSI_REV(&cgd->inq_data) >= SCSI_REV_SPC3 && + (softc->quirks & DA_Q_NO_RC16) == 0) { softc->flags |= DA_FLAG_CAN_RC16; softc->state = DA_STATE_PROBE_RC16; } Modified: projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c ============================================================================== --- projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Wed Oct 23 19:06:53 2013 (r257010) +++ projects/vps/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Wed Oct 23 19:12:02 2013 (r257011) @@ -5495,10 +5495,10 @@ zfs_ioctl_init(void) zfs_secpolicy_read, B_FALSE, POOL_CHECK_NONE); zfs_ioctl_register_pool(ZFS_IOC_ERROR_LOG, zfs_ioc_error_log, - zfs_secpolicy_inject, B_FALSE, POOL_CHECK_SUSPENDED); + zfs_secpolicy_inject, B_FALSE, POOL_CHECK_NONE); zfs_ioctl_register_pool(ZFS_IOC_DSOBJ_TO_DSNAME, zfs_ioc_dsobj_to_dsname, - zfs_secpolicy_diff, B_FALSE, POOL_CHECK_SUSPENDED); + zfs_secpolicy_diff, B_FALSE, POOL_CHECK_NONE); zfs_ioctl_register_pool(ZFS_IOC_POOL_GET_HISTORY, zfs_ioc_pool_get_history, zfs_secpolicy_config, B_FALSE, POOL_CHECK_SUSPENDED); @@ -5507,7 +5507,7 @@ zfs_ioctl_init(void) zfs_secpolicy_config, B_TRUE, POOL_CHECK_NONE); zfs_ioctl_register_pool(ZFS_IOC_CLEAR, zfs_ioc_clear, - zfs_secpolicy_config, B_TRUE, POOL_CHECK_SUSPENDED); + zfs_secpolicy_config, B_TRUE, POOL_CHECK_NONE); zfs_ioctl_register_pool(ZFS_IOC_POOL_REOPEN, zfs_ioc_pool_reopen, zfs_secpolicy_config, B_TRUE, POOL_CHECK_SUSPENDED); Modified: projects/vps/sys/dev/usb/wlan/if_rsu.c ============================================================================== --- projects/vps/sys/dev/usb/wlan/if_rsu.c Wed Oct 23 19:06:53 2013 (r257010) +++ projects/vps/sys/dev/usb/wlan/if_rsu.c Wed Oct 23 19:12:02 2013 (r257011) @@ -2077,7 +2077,7 @@ rsu_power_off(struct rsu_softc *sc) } static int -rsu_fw_loadsection(struct rsu_softc *sc, uint8_t *buf, int len) +rsu_fw_loadsection(struct rsu_softc *sc, const uint8_t *buf, int len) { struct rsu_data *data; struct r92s_tx_desc *txd; @@ -2111,9 +2111,9 @@ rsu_fw_loadsection(struct rsu_softc *sc, static int rsu_load_firmware(struct rsu_softc *sc) { - struct r92s_fw_hdr *hdr; + const struct r92s_fw_hdr *hdr; struct r92s_fw_priv *dmem; - uint8_t *imem, *emem; + const uint8_t *imem, *emem; int imemsz, ememsz; const struct firmware *fw; size_t size; @@ -2136,7 +2136,7 @@ rsu_load_firmware(struct rsu_softc *sc) error = EINVAL; goto fail; } - hdr = (struct r92s_fw_hdr *)fw->data; + hdr = (const struct r92s_fw_hdr *)fw->data; if (hdr->signature != htole16(0x8712) && hdr->signature != htole16(0x8192)) { device_printf(sc->sc_dev, @@ -2163,7 +2163,7 @@ rsu_load_firmware(struct rsu_softc *sc) error = EINVAL; goto fail; } - imem = (uint8_t *)&hdr[1]; + imem = (const uint8_t *)&hdr[1]; emem = imem + imemsz; /* Load IMEM section. */ @@ -2238,7 +2238,7 @@ rsu_load_firmware(struct rsu_softc *sc) } /* Update DMEM section before loading. */ - dmem = &hdr->priv; + dmem = __DECONST(struct r92s_fw_priv *, &hdr->priv); memset(dmem, 0, sizeof(*dmem)); dmem->hci_sel = R92S_HCI_SEL_USB | R92S_HCI_SEL_8172; dmem->nendpoints = sc->npipes; Modified: projects/vps/usr.bin/fetch/fetch.1 ============================================================================== --- projects/vps/usr.bin/fetch/fetch.1 Wed Oct 23 19:06:53 2013 (r257010) +++ projects/vps/usr.bin/fetch/fetch.1 Wed Oct 23 19:12:02 2013 (r257011) @@ -1,5 +1,6 @@ .\"- -.\" Copyright (c) 2000-2011 Dag-Erling Smørgrav +.\" Copyright (c) 2000-2013 Dag-Erling Smørgrav +.\" Copyright (c) 2013 Michael Gmelin .\" All rights reserved. .\" Portions Copyright (c) 1999 Massachusetts Institute of Technology; used .\" by permission. @@ -29,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 27, 2011 +.Dd July 30, 2013 .Dt FETCH 1 .Os .Sh NAME @@ -339,6 +340,7 @@ for a description of additional environm .Ev FTP_PASSWORD , .Ev FTP_PROXY , .Ev ftp_proxy , +.Ev HTTP_ACCEPT , .Ev HTTP_AUTH , .Ev HTTP_PROXY , .Ev http_proxy , Modified: projects/vps/usr.sbin/watchdogd/watchdogd.c ============================================================================== --- projects/vps/usr.sbin/watchdogd/watchdogd.c Wed Oct 23 19:06:53 2013 (r257010) +++ projects/vps/usr.sbin/watchdogd/watchdogd.c Wed Oct 23 19:12:02 2013 (r257011) @@ -774,7 +774,7 @@ parseargs(int argc, char *argv[]) struct timespec ts; pow2ns_to_ts(timeout, &ts); - if (pretimeout >= ts.tv_sec) { + if (pretimeout >= (uintmax_t)ts.tv_sec) { errx(EX_USAGE, "pretimeout (%d) >= timeout (%d -> %ld)\n" "see manual section TIMEOUT RESOLUTION", From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 19:13:40 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 3B88DE35; Wed, 23 Oct 2013 19:13:40 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 298BB278A; Wed, 23 Oct 2013 19:13:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NJDecl008768; Wed, 23 Oct 2013 19:13:40 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NJDeit008767; Wed, 23 Oct 2013 19:13:40 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231913.r9NJDeit008767@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 19:13:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257012 - projects/vps/tools/vps X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 19:13:40 -0000 Author: will Date: Wed Oct 23 19:13:39 2013 New Revision: 257012 URL: http://svnweb.freebsd.org/changeset/base/257012 Log: Sync with svn.7he.at/vps/trunk r204. This is the current upstream commit. r204 | klaus | 2013-08-05 09:07:50 -0600 (Mon, 05 Aug 2013) | 4 lines Added a script to change ''$FreeBSD: projects/vps/'' back to ''$FreeBSD: head/'' for an entire source tree. Submitted by: Klaus P. Ohrhallinger Added: projects/vps/tools/vps/mod_fbsdid_tag.sh Added: projects/vps/tools/vps/mod_fbsdid_tag.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/vps/tools/vps/mod_fbsdid_tag.sh Wed Oct 23 19:13:39 2013 (r257012) @@ -0,0 +1,8 @@ +#!/bin/sh -x + +set -e + +#find . -type f -not -path \.svn -exec sed -i '' 's/__FBSDID(\"\$FreeBSD: projects\/vps\//__FBSDID(\"\$FreeBSD: head\//' \{\} \; +find . -type f -not -path \.svn -exec sed -i '' 's/\$FreeBSD: projects\/vps\//\$FreeBSD: head\//' \{\} \; + +exit 0 From owner-svn-src-projects@FreeBSD.ORG Thu Oct 24 10:18:12 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0985CD00; Thu, 24 Oct 2013 10:18:12 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E7F8E2F6B; Thu, 24 Oct 2013 10:18:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9OAIBCr016218; Thu, 24 Oct 2013 10:18:11 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9OAIACi016208; Thu, 24 Oct 2013 10:18:10 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201310241018.r9OAIACi016208@svn.freebsd.org> From: Gleb Smirnoff Date: Thu, 24 Oct 2013 10:18:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257046 - in projects/ifnet: . bin bin/freebsd-version bin/ps bin/sh cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libdtrace/common c... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Oct 2013 10:18:12 -0000 Author: glebius Date: Thu Oct 24 10:18:08 2013 New Revision: 257046 URL: http://svnweb.freebsd.org/changeset/base/257046 Log: Merge head r256150 through r257045. Added: projects/ifnet/bin/freebsd-version/ - copied from r257045, head/bin/freebsd-version/ projects/ifnet/gnu/usr.bin/rcs/ - copied from r257045, head/gnu/usr.bin/rcs/ projects/ifnet/share/doc/psd/13.rcs/ - copied from r257045, head/share/doc/psd/13.rcs/ projects/ifnet/share/man/man4/altera_atse.4 - copied unchanged from r257045, head/share/man/man4/altera_atse.4 projects/ifnet/share/man/man9/getenv.9 - copied unchanged from r257045, head/share/man/man9/getenv.9 projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_bsc.c - copied unchanged from r257045, head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h - copied unchanged from r257045, head/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h - copied unchanged from r257045, head/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h projects/ifnet/sys/arm/conf/IMX53-QSB - copied unchanged from r257045, head/sys/arm/conf/IMX53-QSB projects/ifnet/sys/arm/conf/RADXA - copied unchanged from r257045, head/sys/arm/conf/RADXA projects/ifnet/sys/arm/rockchip/ - copied from r257045, head/sys/arm/rockchip/ projects/ifnet/sys/boot/fdt/dts/beri-sim.dts - copied unchanged from r257045, head/sys/boot/fdt/dts/beri-sim.dts projects/ifnet/sys/boot/fdt/dts/beripad-de4.dts - copied unchanged from r257045, head/sys/boot/fdt/dts/beripad-de4.dts projects/ifnet/sys/boot/fdt/dts/imx53-qsb.dts - copied unchanged from r257045, head/sys/boot/fdt/dts/imx53-qsb.dts projects/ifnet/sys/boot/fdt/dts/rk3188-radxa.dts - copied unchanged from r257045, head/sys/boot/fdt/dts/rk3188-radxa.dts projects/ifnet/sys/boot/fdt/dts/rk3188.dtsi - copied unchanged from r257045, head/sys/boot/fdt/dts/rk3188.dtsi projects/ifnet/sys/dev/altera/atse/ - copied from r257045, head/sys/dev/altera/atse/ projects/ifnet/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu - copied unchanged from r257045, head/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu projects/ifnet/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu - copied unchanged from r257045, head/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu projects/ifnet/sys/dev/cxgbe/iw_cxgbe/ - copied from r257045, head/sys/dev/cxgbe/iw_cxgbe/ projects/ifnet/sys/dev/etherswitch/arswitch/arswitch_9340.c - copied unchanged from r257045, head/sys/dev/etherswitch/arswitch/arswitch_9340.c projects/ifnet/sys/dev/etherswitch/arswitch/arswitch_9340.h - copied unchanged from r257045, head/sys/dev/etherswitch/arswitch/arswitch_9340.h - copied unchanged from r257045, head/sys/dev/fdt/fdt_ic_if.m projects/ifnet/sys/dev/ffec/ - copied from r257045, head/sys/dev/ffec/ projects/ifnet/sys/dev/iwn/if_iwn_debug.h - copied unchanged from r257045, head/sys/dev/iwn/if_iwn_debug.h projects/ifnet/sys/dev/ofw/ofw_nexus.c - copied unchanged from r257045, head/sys/dev/ofw/ofw_nexus.c projects/ifnet/sys/dev/ofw/ofw_nexus.h - copied unchanged from r257045, head/sys/dev/ofw/ofw_nexus.h projects/ifnet/sys/dev/random/dummy_rng.c - copied unchanged from r257045, head/sys/dev/random/dummy_rng.c projects/ifnet/sys/dev/random/live_entropy_sources.c - copied unchanged from r257045, head/sys/dev/random/live_entropy_sources.c projects/ifnet/sys/dev/random/live_entropy_sources.h - copied unchanged from r257045, head/sys/dev/random/live_entropy_sources.h projects/ifnet/sys/dev/random/rwfile.c - copied unchanged from r257045, head/sys/dev/random/rwfile.c projects/ifnet/sys/dev/random/rwfile.h - copied unchanged from r257045, head/sys/dev/random/rwfile.h projects/ifnet/sys/dev/usb/controller/dwc_otg_fdt.c - copied unchanged from r257045, head/sys/dev/usb/controller/dwc_otg_fdt.c projects/ifnet/sys/mips/beri/beri_pic.c - copied unchanged from r257045, head/sys/mips/beri/beri_pic.c projects/ifnet/sys/mips/conf/BERI_DE4_BASE - copied unchanged from r257045, head/sys/mips/conf/BERI_DE4_BASE projects/ifnet/sys/mips/conf/BERI_SIM_BASE - copied unchanged from r257045, head/sys/mips/conf/BERI_SIM_BASE projects/ifnet/sys/mips/conf/BERI_SIM_SDROOT - copied unchanged from r257045, head/sys/mips/conf/BERI_SIM_SDROOT projects/ifnet/sys/modules/cxgbe/iw_cxgbe/ - copied from r257045, head/sys/modules/cxgbe/iw_cxgbe/ projects/ifnet/sys/powerpc/ofw/openpic_ofw.c - copied unchanged from r257045, head/sys/powerpc/ofw/openpic_ofw.c projects/ifnet/sys/powerpc/powerpc/clock.c - copied unchanged from r257045, head/sys/powerpc/powerpc/clock.c projects/ifnet/sys/powerpc/powerpc/nexus.c - copied unchanged from r257045, head/sys/powerpc/powerpc/nexus.c projects/ifnet/sys/powerpc/powerpc/vm_machdep.c - copied unchanged from r257045, head/sys/powerpc/powerpc/vm_machdep.c projects/ifnet/sys/powerpc/pseries/phyp_llan.c - copied unchanged from r257045, head/sys/powerpc/pseries/phyp_llan.c projects/ifnet/tools/build/options/WITHOUT_RCS - copied unchanged from r257045, head/tools/build/options/WITHOUT_RCS projects/ifnet/tools/tools/atsectl/ - copied from r257045, head/tools/tools/atsectl/ projects/ifnet/usr.sbin/bsdconfig/share/keymap.subr - copied unchanged from r257045, head/usr.sbin/bsdconfig/share/keymap.subr projects/ifnet/usr.sbin/bsdinstall/scripts/entropy - copied unchanged from r257045, head/usr.sbin/bsdinstall/scripts/entropy projects/ifnet/usr.sbin/bsdinstall/scripts/zfsboot - copied unchanged from r257045, head/usr.sbin/bsdinstall/scripts/zfsboot Directory Properties: projects/ifnet/sys/dev/fdt/fdt_ic_if.m (props changed) Deleted: projects/ifnet/etc/atf/ projects/ifnet/lib/libyaml/libbsdyml.3 projects/ifnet/libexec/freebsd-version/ projects/ifnet/share/atf/ projects/ifnet/share/examples/atf/ projects/ifnet/share/man/man4/isf.4 projects/ifnet/share/xml/ projects/ifnet/share/xsl/ projects/ifnet/sys/arm/broadcom/bcm2835/dwc_otg_brcm.c projects/ifnet/sys/contrib/rdma/core_priv.h projects/ifnet/sys/contrib/rdma/ib_addr.h projects/ifnet/sys/contrib/rdma/ib_cache.h projects/ifnet/sys/contrib/rdma/ib_cm.h projects/ifnet/sys/contrib/rdma/ib_fmr_pool.h projects/ifnet/sys/contrib/rdma/ib_mad.h projects/ifnet/sys/contrib/rdma/ib_marshall.h projects/ifnet/sys/contrib/rdma/ib_pack.h projects/ifnet/sys/contrib/rdma/ib_sa.h projects/ifnet/sys/contrib/rdma/ib_smi.h projects/ifnet/sys/contrib/rdma/ib_umem.h projects/ifnet/sys/contrib/rdma/ib_user_cm.h projects/ifnet/sys/contrib/rdma/ib_user_mad.h projects/ifnet/sys/contrib/rdma/ib_user_sa.h projects/ifnet/sys/contrib/rdma/ib_user_verbs.h projects/ifnet/sys/contrib/rdma/ib_verbs.h projects/ifnet/sys/contrib/rdma/iw_cm.h projects/ifnet/sys/contrib/rdma/rdma_addr.c projects/ifnet/sys/contrib/rdma/rdma_cache.c projects/ifnet/sys/contrib/rdma/rdma_cm.h projects/ifnet/sys/contrib/rdma/rdma_cm_ib.h projects/ifnet/sys/contrib/rdma/rdma_cma.c projects/ifnet/sys/contrib/rdma/rdma_device.c projects/ifnet/sys/contrib/rdma/rdma_iwcm.c projects/ifnet/sys/contrib/rdma/rdma_user_cm.h projects/ifnet/sys/contrib/rdma/rdma_verbs.c projects/ifnet/sys/contrib/rdma/types.h projects/ifnet/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu projects/ifnet/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu projects/ifnet/sys/dev/isf/ projects/ifnet/sys/dev/random/pseudo_rng.c projects/ifnet/sys/kern/dtio_kdtrace.c projects/ifnet/sys/mips/conf/BERI_SIM.hints projects/ifnet/sys/modules/dtrace/dtio/ projects/ifnet/sys/modules/rdma/addr/ projects/ifnet/sys/modules/rdma/cma/ projects/ifnet/sys/modules/rdma/core/ projects/ifnet/sys/modules/rdma/iwcm/ projects/ifnet/sys/powerpc/aim/clock.c projects/ifnet/sys/powerpc/aim/nexus.c projects/ifnet/sys/powerpc/aim/vm_machdep.c projects/ifnet/sys/powerpc/booke/clock.c projects/ifnet/sys/powerpc/booke/vm_machdep.c projects/ifnet/sys/powerpc/mambo/mambo_openpic.c projects/ifnet/sys/powerpc/mpc85xx/nexus.c projects/ifnet/sys/powerpc/powermac/openpic_macio.c projects/ifnet/sys/powerpc/powerpc/openpic_fdt.c projects/ifnet/usr.bin/atf/atf-config/ projects/ifnet/usr.bin/atf/atf-report/ projects/ifnet/usr.bin/atf/atf-run/ projects/ifnet/usr.bin/atf/atf-version/ projects/ifnet/usr.sbin/isfctl/ Modified: projects/ifnet/Makefile.inc1 projects/ifnet/ObsoleteFiles.inc projects/ifnet/UPDATING projects/ifnet/bin/Makefile projects/ifnet/bin/ps/print.c projects/ifnet/bin/sh/jobs.c projects/ifnet/bin/sh/miscbltin.c projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/ifnet/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/ifnet/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c projects/ifnet/cddl/lib/libdtrace/psinfo.d projects/ifnet/contrib/binutils/gas/config/tc-arm.c projects/ifnet/contrib/binutils/gas/config/tc-mips.c projects/ifnet/contrib/binutils/gas/config/tc-mips.h projects/ifnet/contrib/binutils/gas/dwarf2dbg.c projects/ifnet/contrib/bsnmp/lib/snmp.c projects/ifnet/contrib/bsnmp/lib/snmp.h projects/ifnet/contrib/bsnmp/lib/snmpagent.c projects/ifnet/contrib/gcclibs/libssp/ssp.c projects/ifnet/contrib/ipfilter/ipf.h projects/ifnet/contrib/jemalloc/ChangeLog projects/ifnet/contrib/jemalloc/FREEBSD-diffs projects/ifnet/contrib/jemalloc/FREEBSD-upgrade projects/ifnet/contrib/jemalloc/VERSION projects/ifnet/contrib/jemalloc/doc/jemalloc.3 projects/ifnet/contrib/jemalloc/include/jemalloc/internal/arena.h projects/ifnet/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h projects/ifnet/contrib/jemalloc/include/jemalloc/internal/private_namespace.h projects/ifnet/contrib/jemalloc/include/jemalloc/internal/tcache.h projects/ifnet/contrib/jemalloc/include/jemalloc/jemalloc.h projects/ifnet/contrib/jemalloc/src/arena.c projects/ifnet/contrib/jemalloc/src/chunk.c projects/ifnet/contrib/jemalloc/src/ctl.c projects/ifnet/contrib/jemalloc/src/jemalloc.c projects/ifnet/contrib/libcxxrt/typeinfo.cc projects/ifnet/contrib/mtree/compare.c projects/ifnet/contrib/mtree/create.c projects/ifnet/contrib/mtree/getid.c projects/ifnet/contrib/mtree/spec.c projects/ifnet/etc/Makefile projects/ifnet/etc/defaults/periodic.conf projects/ifnet/etc/defaults/rc.conf projects/ifnet/etc/ftpusers projects/ifnet/etc/group projects/ifnet/etc/login.conf projects/ifnet/etc/master.passwd projects/ifnet/etc/mtree/BSD.root.dist projects/ifnet/etc/mtree/BSD.usr.dist projects/ifnet/etc/netstart projects/ifnet/etc/network.subr projects/ifnet/etc/rc projects/ifnet/etc/rc.d/initrandom projects/ifnet/etc/rc.d/jail projects/ifnet/etc/rc.d/netif projects/ifnet/etc/rc.d/rtadvd projects/ifnet/etc/rc.d/sendmail projects/ifnet/etc/rc.subr projects/ifnet/etc/sendmail/freebsd.mc projects/ifnet/gnu/usr.bin/Makefile projects/ifnet/gnu/usr.bin/cc/cc_tools/freebsd-native.h projects/ifnet/gnu/usr.bin/groff/tmac/mdoc.local projects/ifnet/include/pthread.h projects/ifnet/lib/clang/clang.build.mk projects/ifnet/lib/libc/gen/getutxent.c projects/ifnet/lib/libc/gen/popen.c projects/ifnet/lib/libc/gen/syslog.c projects/ifnet/lib/libc/iconv/citrus_mapper.c projects/ifnet/lib/libc/sys/getrlimit.2 projects/ifnet/lib/libcrypt/tests/Makefile projects/ifnet/lib/libcrypt/tests/crypt_tests.c projects/ifnet/lib/libproc/_libproc.h projects/ifnet/lib/libprocstat/libprocstat.c projects/ifnet/lib/libstand/tftp.c projects/ifnet/lib/libutil/login_class.3 projects/ifnet/lib/libutil/login_class.c projects/ifnet/lib/libvmmapi/vmmapi.c projects/ifnet/lib/libvmmapi/vmmapi.h projects/ifnet/lib/libyaml/Makefile projects/ifnet/lib/libz/zopen.c projects/ifnet/libexec/Makefile projects/ifnet/release/Makefile projects/ifnet/release/picobsd/build/picobsd projects/ifnet/release/picobsd/floppy.tree/etc/rc1 projects/ifnet/release/picobsd/floppy.tree/etc/ssh/sshd_config projects/ifnet/release/release.sh projects/ifnet/sbin/camcontrol/modeedit.c projects/ifnet/sbin/fsck_ffs/ea.c projects/ifnet/sbin/geom/class/part/geom_part.c projects/ifnet/sbin/growfs/debug.c projects/ifnet/sbin/gvinum/gvinum.c projects/ifnet/sbin/ifconfig/ifconfig.8 projects/ifnet/sbin/ifconfig/ifgroup.c projects/ifnet/sbin/iscontrol/fsm.c projects/ifnet/sbin/iscontrol/iscsi.conf.5 projects/ifnet/sbin/mdconfig/mdconfig.c projects/ifnet/sbin/nos-tun/nos-tun.c projects/ifnet/sbin/nvmecontrol/perftest.c projects/ifnet/sbin/route/keywords projects/ifnet/sbin/route/route.8 projects/ifnet/sbin/route/route.c projects/ifnet/share/Makefile projects/ifnet/share/doc/psd/Makefile projects/ifnet/share/examples/Makefile projects/ifnet/share/examples/bhyve/vmrun.sh projects/ifnet/share/examples/kld/random_adaptor/random_adaptor_example.c (contents, props changed) projects/ifnet/share/man/man4/Makefile projects/ifnet/share/man/man4/ahci.4 projects/ifnet/share/man/man4/random.4 projects/ifnet/share/man/man5/Makefile projects/ifnet/share/man/man5/rc.conf.5 projects/ifnet/share/man/man5/src.conf.5 projects/ifnet/share/man/man7/Makefile projects/ifnet/share/man/man8/rc.8 projects/ifnet/share/man/man8/rc.sendmail.8 projects/ifnet/share/man/man9/Makefile projects/ifnet/share/man/man9/disk.9 projects/ifnet/share/man/man9/rtentry.9 projects/ifnet/share/misc/bsd-family-tree projects/ifnet/share/misc/committers-src.dot projects/ifnet/share/mk/atf.test.mk projects/ifnet/share/mk/bsd.libnames.mk projects/ifnet/share/mk/bsd.own.mk projects/ifnet/share/mk/bsd.test.mk projects/ifnet/share/syscons/keymaps/INDEX.keymaps projects/ifnet/sys/amd64/amd64/pmap.c projects/ifnet/sys/amd64/conf/GENERIC projects/ifnet/sys/amd64/include/vmm.h (contents, props changed) projects/ifnet/sys/amd64/vmm/intel/vmx.c projects/ifnet/sys/amd64/vmm/intel/vmx.h projects/ifnet/sys/amd64/vmm/intel/vmx_controls.h projects/ifnet/sys/amd64/vmm/vmm_dev.c projects/ifnet/sys/amd64/vmm/x86.c projects/ifnet/sys/arm/allwinner/a10_wdog.c projects/ifnet/sys/arm/arm/busdma_machdep-v6.c projects/ifnet/sys/arm/arm/cpufunc.c projects/ifnet/sys/arm/arm/cpufunc_asm_armv7.S projects/ifnet/sys/arm/arm/fusu.S projects/ifnet/sys/arm/arm/identcpu.c projects/ifnet/sys/arm/arm/locore.S projects/ifnet/sys/arm/arm/machdep.c projects/ifnet/sys/arm/arm/pl310.c projects/ifnet/sys/arm/arm/pmap-v6.c projects/ifnet/sys/arm/arm/stack_machdep.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_wdog.c projects/ifnet/sys/arm/broadcom/bcm2835/files.bcm2835 projects/ifnet/sys/arm/conf/RPI-B projects/ifnet/sys/arm/freescale/imx/files.imx53 projects/ifnet/sys/arm/freescale/imx/imx51_ccm.c projects/ifnet/sys/arm/include/armreg.h projects/ifnet/sys/arm/include/pmap.h projects/ifnet/sys/arm/mv/common.c projects/ifnet/sys/arm/mv/gpio.c projects/ifnet/sys/arm/mv/mv_localbus.c projects/ifnet/sys/arm/mv/mvreg.h projects/ifnet/sys/arm/s3c2xx0/uart_bus_s3c2410.c projects/ifnet/sys/arm/s3c2xx0/uart_cpu_s3c2410.c projects/ifnet/sys/arm/versatile/versatile_pci.c projects/ifnet/sys/arm/xscale/i80321/ep80219_machdep.c projects/ifnet/sys/arm/xscale/i80321/iq31244_machdep.c projects/ifnet/sys/arm/xscale/i8134x/crb_machdep.c projects/ifnet/sys/arm/xscale/ixp425/avila_machdep.c projects/ifnet/sys/arm/xscale/ixp425/if_npe.c projects/ifnet/sys/arm/xscale/ixp425/ixp425_mem.c projects/ifnet/sys/arm/xscale/pxa/pxa_machdep.c projects/ifnet/sys/boot/fdt/dts/bcm2835.dtsi projects/ifnet/sys/boot/fdt/dts/digi-ccwmx53.dts projects/ifnet/sys/boot/forth/loader.conf projects/ifnet/sys/boot/i386/btx/btx/btx.S projects/ifnet/sys/boot/i386/libi386/Makefile projects/ifnet/sys/boot/i386/libi386/smbios.c projects/ifnet/sys/cam/ata/ata_all.c projects/ifnet/sys/cam/ata/ata_all.h projects/ifnet/sys/cam/ata/ata_da.c projects/ifnet/sys/cam/ata/ata_pmp.c projects/ifnet/sys/cam/ata/ata_xpt.c projects/ifnet/sys/cam/cam_ccb.h projects/ifnet/sys/cam/cam_periph.c projects/ifnet/sys/cam/cam_periph.h projects/ifnet/sys/cam/cam_queue.c projects/ifnet/sys/cam/cam_queue.h projects/ifnet/sys/cam/cam_sim.c projects/ifnet/sys/cam/cam_sim.h projects/ifnet/sys/cam/cam_xpt.c projects/ifnet/sys/cam/cam_xpt.h projects/ifnet/sys/cam/cam_xpt_internal.h projects/ifnet/sys/cam/cam_xpt_periph.h projects/ifnet/sys/cam/cam_xpt_sim.h projects/ifnet/sys/cam/ctl/ctl_backend_block.c projects/ifnet/sys/cam/ctl/ctl_frontend_cam_sim.c projects/ifnet/sys/cam/ctl/ctl_frontend_iscsi.c projects/ifnet/sys/cam/ctl/scsi_ctl.c projects/ifnet/sys/cam/scsi/scsi_all.c projects/ifnet/sys/cam/scsi/scsi_all.h projects/ifnet/sys/cam/scsi/scsi_cd.c projects/ifnet/sys/cam/scsi/scsi_ch.c projects/ifnet/sys/cam/scsi/scsi_da.c projects/ifnet/sys/cam/scsi/scsi_enc.c projects/ifnet/sys/cam/scsi/scsi_enc_internal.h projects/ifnet/sys/cam/scsi/scsi_enc_safte.c projects/ifnet/sys/cam/scsi/scsi_enc_ses.c projects/ifnet/sys/cam/scsi/scsi_pass.c projects/ifnet/sys/cam/scsi/scsi_pt.c projects/ifnet/sys/cam/scsi/scsi_sa.c projects/ifnet/sys/cam/scsi/scsi_sg.c projects/ifnet/sys/cam/scsi/scsi_targ_bh.c projects/ifnet/sys/cam/scsi/scsi_target.c projects/ifnet/sys/cam/scsi/scsi_xpt.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/ifnet/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/powerpc/sys/fasttrap_isa.h projects/ifnet/sys/cddl/dev/dtrace/amd64/dtrace_isa.c projects/ifnet/sys/cddl/dev/dtrace/dtrace_sysctl.c projects/ifnet/sys/conf/NOTES projects/ifnet/sys/conf/files projects/ifnet/sys/conf/files.amd64 projects/ifnet/sys/conf/files.i386 projects/ifnet/sys/conf/files.powerpc projects/ifnet/sys/conf/kmod.mk projects/ifnet/sys/conf/newvers.sh projects/ifnet/sys/conf/options projects/ifnet/sys/conf/options.mips projects/ifnet/sys/contrib/dev/run/rt2870.fw.uu projects/ifnet/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c projects/ifnet/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c projects/ifnet/sys/contrib/rdma/krping/getopt.c projects/ifnet/sys/contrib/rdma/krping/krping.c projects/ifnet/sys/contrib/rdma/krping/krping.h projects/ifnet/sys/contrib/rdma/krping/krping_dev.c projects/ifnet/sys/dev/aha/aha.c projects/ifnet/sys/dev/ahci/ahci.c projects/ifnet/sys/dev/ahci/ahci.h projects/ifnet/sys/dev/aic7xxx/aic79xx.c projects/ifnet/sys/dev/aic7xxx/aic7xxx.c projects/ifnet/sys/dev/altera/sdcard/altera_sdcard.c projects/ifnet/sys/dev/altera/sdcard/altera_sdcard_io.c projects/ifnet/sys/dev/ata/ata-all.c projects/ifnet/sys/dev/ata/ata-card.c projects/ifnet/sys/dev/ath/if_ath.c projects/ifnet/sys/dev/ath/if_ath_tx.c projects/ifnet/sys/dev/buslogic/bt.c projects/ifnet/sys/dev/bxe/bxe.c projects/ifnet/sys/dev/bxe/bxe_stats.c projects/ifnet/sys/dev/bxe/ecore_sp.h projects/ifnet/sys/dev/cfi/cfi_bus_nexus.c projects/ifnet/sys/dev/cfi/cfi_core.c projects/ifnet/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c projects/ifnet/sys/dev/cxgbe/adapter.h projects/ifnet/sys/dev/cxgbe/common/common.h projects/ifnet/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/ifnet/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt projects/ifnet/sys/dev/cxgbe/firmware/t4fw_interface.h projects/ifnet/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/ifnet/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt projects/ifnet/sys/dev/cxgbe/t4_main.c projects/ifnet/sys/dev/cxgbe/t4_sge.c projects/ifnet/sys/dev/cxgbe/tom/t4_cpl_io.c projects/ifnet/sys/dev/drm2/i915/i915_drv.c projects/ifnet/sys/dev/drm2/radeon/radeon_drv.c projects/ifnet/sys/dev/e1000/e1000_80003es2lan.c projects/ifnet/sys/dev/e1000/e1000_80003es2lan.h projects/ifnet/sys/dev/e1000/e1000_82571.c projects/ifnet/sys/dev/e1000/e1000_82575.c projects/ifnet/sys/dev/e1000/e1000_82575.h projects/ifnet/sys/dev/e1000/e1000_api.c projects/ifnet/sys/dev/e1000/e1000_defines.h projects/ifnet/sys/dev/e1000/e1000_hw.h projects/ifnet/sys/dev/e1000/e1000_i210.c projects/ifnet/sys/dev/e1000/e1000_i210.h projects/ifnet/sys/dev/e1000/e1000_ich8lan.c projects/ifnet/sys/dev/e1000/e1000_ich8lan.h projects/ifnet/sys/dev/e1000/e1000_mac.c projects/ifnet/sys/dev/e1000/e1000_osdep.h projects/ifnet/sys/dev/e1000/e1000_phy.c projects/ifnet/sys/dev/e1000/e1000_phy.h projects/ifnet/sys/dev/e1000/e1000_regs.h projects/ifnet/sys/dev/e1000/e1000_vf.h projects/ifnet/sys/dev/e1000/if_igb.c projects/ifnet/sys/dev/e1000/if_igb.h projects/ifnet/sys/dev/etherswitch/arswitch/arswitch.c projects/ifnet/sys/dev/etherswitch/arswitch/arswitch_vlans.c projects/ifnet/sys/dev/etherswitch/arswitch/arswitchreg.h projects/ifnet/sys/dev/etherswitch/arswitch/arswitchvar.h projects/ifnet/sys/dev/fdt/fdt_common.c projects/ifnet/sys/dev/fdt/fdt_common.h projects/ifnet/sys/dev/fdt/fdt_mips.c projects/ifnet/sys/dev/fdt/fdt_pci.c projects/ifnet/sys/dev/fdt/fdt_powerpc.c projects/ifnet/sys/dev/fdt/fdtbus.c projects/ifnet/sys/dev/fdt/simplebus.c projects/ifnet/sys/dev/firewire/sbp_targ.c projects/ifnet/sys/dev/glxsb/glxsb.c projects/ifnet/sys/dev/hifn/hifn7751.c projects/ifnet/sys/dev/hyperv/include/hyperv.h projects/ifnet/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/ifnet/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/ifnet/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c projects/ifnet/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/ifnet/sys/dev/hyperv/storvsc/hv_vstorage.h projects/ifnet/sys/dev/hyperv/vmbus/hv_channel.c projects/ifnet/sys/dev/hyperv/vmbus/hv_hv.c projects/ifnet/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c projects/ifnet/sys/dev/hyperv/vmbus/hv_vmbus_priv.h projects/ifnet/sys/dev/isci/isci_io_request.c projects/ifnet/sys/dev/isci/isci_sysctl.c projects/ifnet/sys/dev/isci/isci_task_request.c projects/ifnet/sys/dev/iscsi/icl.c projects/ifnet/sys/dev/iscsi/iscsi.c projects/ifnet/sys/dev/isp/isp.c projects/ifnet/sys/dev/isp/isp_freebsd.c projects/ifnet/sys/dev/isp/isp_freebsd.h projects/ifnet/sys/dev/isp/ispvar.h projects/ifnet/sys/dev/iwn/if_iwn.c projects/ifnet/sys/dev/iwn/if_iwnreg.h projects/ifnet/sys/dev/ixgbe/ixgbe.c projects/ifnet/sys/dev/md/md.c projects/ifnet/sys/dev/mpt/mpt_cam.c projects/ifnet/sys/dev/mvs/mvs.c projects/ifnet/sys/dev/netmap/if_igb_netmap.h projects/ifnet/sys/dev/nvd/nvd.c projects/ifnet/sys/dev/nvme/nvme.c projects/ifnet/sys/dev/nvme/nvme.h projects/ifnet/sys/dev/nvme/nvme_ctrlr.c projects/ifnet/sys/dev/nvme/nvme_ns.c projects/ifnet/sys/dev/nvme/nvme_private.h projects/ifnet/sys/dev/nvme/nvme_test.c projects/ifnet/sys/dev/oce/oce_hw.c projects/ifnet/sys/dev/oce/oce_hw.h projects/ifnet/sys/dev/oce/oce_if.c projects/ifnet/sys/dev/oce/oce_if.h projects/ifnet/sys/dev/oce/oce_mbox.c projects/ifnet/sys/dev/oce/oce_queue.c projects/ifnet/sys/dev/oce/oce_sysctl.c projects/ifnet/sys/dev/oce/oce_util.c projects/ifnet/sys/dev/ofw/ofw_bus.h projects/ifnet/sys/dev/ofw/ofw_bus_if.m projects/ifnet/sys/dev/ofw/ofw_bus_subr.c projects/ifnet/sys/dev/ofw/ofw_console.c projects/ifnet/sys/dev/ofw/ofw_fdt.c projects/ifnet/sys/dev/ofw/ofw_iicbus.c projects/ifnet/sys/dev/ofw/openfirm.c projects/ifnet/sys/dev/ofw/openfirm.h projects/ifnet/sys/dev/random/harvest.c projects/ifnet/sys/dev/random/hash.h projects/ifnet/sys/dev/random/ivy.c projects/ifnet/sys/dev/random/nehemiah.c projects/ifnet/sys/dev/random/random_adaptors.c projects/ifnet/sys/dev/random/random_adaptors.h projects/ifnet/sys/dev/random/random_harvestq.c projects/ifnet/sys/dev/random/random_harvestq.h projects/ifnet/sys/dev/random/randomdev.c projects/ifnet/sys/dev/random/randomdev.h projects/ifnet/sys/dev/random/randomdev_soft.c projects/ifnet/sys/dev/random/randomdev_soft.h projects/ifnet/sys/dev/random/yarrow.c projects/ifnet/sys/dev/random/yarrow.h projects/ifnet/sys/dev/re/if_re.c projects/ifnet/sys/dev/rndtest/rndtest.c projects/ifnet/sys/dev/safe/safe.c projects/ifnet/sys/dev/siis/siis.c projects/ifnet/sys/dev/syscons/scmouse.c projects/ifnet/sys/dev/syscons/syscons.c projects/ifnet/sys/dev/uart/uart_dev_imx.c projects/ifnet/sys/dev/uart/uart_dev_pl011.c projects/ifnet/sys/dev/ubsec/ubsec.c projects/ifnet/sys/dev/usb/controller/musb_otg.c projects/ifnet/sys/dev/usb/controller/musb_otg.h projects/ifnet/sys/dev/usb/controller/xhci.c projects/ifnet/sys/dev/usb/serial/uslcom.c projects/ifnet/sys/dev/usb/usbdevs projects/ifnet/sys/dev/usb/wlan/if_run.c projects/ifnet/sys/dev/usb/wlan/if_runreg.h projects/ifnet/sys/dev/vmware/vmxnet3/if_vmx.c projects/ifnet/sys/dev/vmware/vmxnet3/if_vmxvar.h projects/ifnet/sys/dev/xen/blkfront/blkfront.c projects/ifnet/sys/dev/xen/netback/netback.c projects/ifnet/sys/fs/devfs/devfs_vnops.c projects/ifnet/sys/fs/ext2fs/ext2_vnops.c projects/ifnet/sys/geom/concat/g_concat.c projects/ifnet/sys/geom/concat/g_concat.h projects/ifnet/sys/geom/gate/g_gate.c projects/ifnet/sys/geom/geom.h projects/ifnet/sys/geom/geom_dev.c projects/ifnet/sys/geom/geom_disk.c projects/ifnet/sys/geom/geom_disk.h projects/ifnet/sys/geom/geom_int.h projects/ifnet/sys/geom/geom_io.c projects/ifnet/sys/geom/geom_kern.c projects/ifnet/sys/geom/geom_slice.c projects/ifnet/sys/geom/geom_subr.c projects/ifnet/sys/geom/geom_vfs.c projects/ifnet/sys/geom/label/g_label.c projects/ifnet/sys/geom/mirror/g_mirror.c projects/ifnet/sys/geom/mirror/g_mirror.h projects/ifnet/sys/geom/multipath/g_multipath.c projects/ifnet/sys/geom/nop/g_nop.c projects/ifnet/sys/geom/nop/g_nop.h projects/ifnet/sys/geom/part/g_part.c projects/ifnet/sys/geom/part/g_part_apm.c projects/ifnet/sys/geom/part/g_part_bsd.c projects/ifnet/sys/geom/part/g_part_ebr.c projects/ifnet/sys/geom/part/g_part_gpt.c projects/ifnet/sys/geom/part/g_part_mbr.c projects/ifnet/sys/geom/part/g_part_pc98.c projects/ifnet/sys/geom/part/g_part_vtoc8.c projects/ifnet/sys/geom/raid/g_raid.c projects/ifnet/sys/geom/raid/g_raid.h projects/ifnet/sys/geom/raid/md_ddf.c projects/ifnet/sys/geom/raid/md_intel.c projects/ifnet/sys/geom/raid/md_jmicron.c projects/ifnet/sys/geom/raid/md_nvidia.c projects/ifnet/sys/geom/raid/md_promise.c projects/ifnet/sys/geom/raid/md_sii.c projects/ifnet/sys/geom/raid/tr_concat.c projects/ifnet/sys/geom/raid/tr_raid0.c projects/ifnet/sys/geom/raid/tr_raid1.c projects/ifnet/sys/geom/raid/tr_raid1e.c projects/ifnet/sys/geom/raid/tr_raid5.c projects/ifnet/sys/geom/stripe/g_stripe.c projects/ifnet/sys/geom/stripe/g_stripe.h projects/ifnet/sys/geom/zero/g_zero.c projects/ifnet/sys/i386/conf/GENERIC projects/ifnet/sys/kern/kern_conf.c projects/ifnet/sys/kern/kern_descrip.c projects/ifnet/sys/kern/kern_event.c projects/ifnet/sys/kern/kern_exec.c projects/ifnet/sys/kern/kern_intr.c projects/ifnet/sys/kern/kern_mbuf.c projects/ifnet/sys/kern/kern_poll.c projects/ifnet/sys/kern/kern_resource.c projects/ifnet/sys/kern/makesyscalls.sh projects/ifnet/sys/kern/subr_bus.c projects/ifnet/sys/kern/subr_devstat.c projects/ifnet/sys/kern/subr_taskqueue.c projects/ifnet/sys/kern/sys_generic.c projects/ifnet/sys/kern/uipc_sockbuf.c projects/ifnet/sys/kern/uipc_syscalls.c projects/ifnet/sys/kern/vfs_bio.c projects/ifnet/sys/kern/vfs_subr.c projects/ifnet/sys/mips/atheros/apb.c projects/ifnet/sys/mips/atheros/ar71xx_chip.c projects/ifnet/sys/mips/atheros/ar71xx_cpudef.h projects/ifnet/sys/mips/atheros/ar71xx_machdep.c projects/ifnet/sys/mips/atheros/ar71xx_spi.c projects/ifnet/sys/mips/atheros/ar71xxreg.h projects/ifnet/sys/mips/atheros/ar724x_chip.c projects/ifnet/sys/mips/atheros/ar91xx_chip.c projects/ifnet/sys/mips/atheros/ar933x_chip.c projects/ifnet/sys/mips/atheros/ar933xreg.h projects/ifnet/sys/mips/atheros/ar934x_chip.c projects/ifnet/sys/mips/atheros/ar934xreg.h projects/ifnet/sys/mips/atheros/if_arge.c projects/ifnet/sys/mips/atheros/if_argevar.h projects/ifnet/sys/mips/beri/beri_machdep.c projects/ifnet/sys/mips/beri/files.beri projects/ifnet/sys/mips/beri/std.beri projects/ifnet/sys/mips/cavium/octeon_rnd.c projects/ifnet/sys/mips/conf/AR934X_BASE projects/ifnet/sys/mips/conf/BERI_DE4.hints projects/ifnet/sys/mips/conf/BERI_DE4_MDROOT projects/ifnet/sys/mips/conf/BERI_DE4_SDROOT projects/ifnet/sys/mips/conf/BERI_SIM_MDROOT projects/ifnet/sys/mips/conf/BERI_TEMPLATE projects/ifnet/sys/mips/conf/DB120 projects/ifnet/sys/mips/conf/DB120.hints projects/ifnet/sys/mips/include/asm.h projects/ifnet/sys/mips/include/cpufunc.h projects/ifnet/sys/mips/include/cpuregs.h projects/ifnet/sys/mips/include/pcb.h projects/ifnet/sys/mips/include/pte.h projects/ifnet/sys/mips/mips/bcopy.S projects/ifnet/sys/mips/mips/bus_space_generic.c projects/ifnet/sys/mips/mips/cache.c projects/ifnet/sys/mips/mips/cpu.c projects/ifnet/sys/mips/mips/elf_trampoline.c projects/ifnet/sys/mips/mips/exception.S projects/ifnet/sys/mips/mips/fp.S projects/ifnet/sys/mips/mips/support.S projects/ifnet/sys/mips/mips/swtch.S projects/ifnet/sys/mips/mips/trap.c projects/ifnet/sys/modules/Makefile projects/ifnet/sys/modules/cxgb/Makefile projects/ifnet/sys/modules/cxgbe/Makefile projects/ifnet/sys/modules/cxgbe/t4_firmware/Makefile projects/ifnet/sys/modules/cxgbe/t5_firmware/Makefile projects/ifnet/sys/modules/dtrace/Makefile projects/ifnet/sys/modules/dtrace/dtraceall/dtraceall.c projects/ifnet/sys/modules/dtrace/fasttrap/Makefile projects/ifnet/sys/modules/random/Makefile projects/ifnet/sys/modules/rdma/Makefile projects/ifnet/sys/net/flowtable.c projects/ifnet/sys/net/ieee8023ad_lacp.c projects/ifnet/sys/net/if.c projects/ifnet/sys/net/if.h projects/ifnet/sys/net/if_ethersubr.c projects/ifnet/sys/net/if_lagg.c projects/ifnet/sys/net/if_media.h projects/ifnet/sys/net/if_tun.c projects/ifnet/sys/net/if_var.h projects/ifnet/sys/net/radix.c projects/ifnet/sys/net/radix.h projects/ifnet/sys/net/route.c projects/ifnet/sys/net/rtsock.c projects/ifnet/sys/net80211/ieee80211_freebsd.c projects/ifnet/sys/netatalk/at_control.c projects/ifnet/sys/netgraph/ng_base.c projects/ifnet/sys/netgraph/ng_iface.c projects/ifnet/sys/netinet/in.c projects/ifnet/sys/netinet/in.h projects/ifnet/sys/netinet/in_var.h projects/ifnet/sys/netinet/ip_input.c projects/ifnet/sys/netinet/ip_output.c projects/ifnet/sys/netinet/sctp_constants.h projects/ifnet/sys/netinet/sctp_usrreq.c projects/ifnet/sys/netinet/tcp_input.c projects/ifnet/sys/netinet6/in6.c projects/ifnet/sys/netinet6/in6_ifattach.c projects/ifnet/sys/netinet6/in6_var.h projects/ifnet/sys/netinet6/ip6_input.c projects/ifnet/sys/netinet6/ip6_output.c projects/ifnet/sys/netipx/ipx.c projects/ifnet/sys/netipx/ipx_if.h projects/ifnet/sys/ofed/drivers/infiniband/core/ucm.c projects/ifnet/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/ifnet/sys/ofed/drivers/net/mlx4/en_netdev.c projects/ifnet/sys/ofed/include/linux/gfp.h projects/ifnet/sys/pci/if_rlreg.h projects/ifnet/sys/powerpc/aim/interrupt.c projects/ifnet/sys/powerpc/aim/machdep.c projects/ifnet/sys/powerpc/aim/trap.c projects/ifnet/sys/powerpc/booke/machdep.c projects/ifnet/sys/powerpc/booke/platform_bare.c projects/ifnet/sys/powerpc/booke/pmap.c projects/ifnet/sys/powerpc/conf/GENERIC64 projects/ifnet/sys/powerpc/ofw/ofw_pci.c projects/ifnet/sys/powerpc/ofw/ofw_pci.h projects/ifnet/sys/powerpc/ofw/ofw_pcib_pci.c projects/ifnet/sys/powerpc/ofw/ofw_pcibus.c projects/ifnet/sys/powerpc/powermac/ata_kauai.c projects/ifnet/sys/powerpc/powermac/ata_macio.c projects/ifnet/sys/powerpc/pseries/phyp-hvcall.S projects/ifnet/sys/powerpc/pseries/vdevice.c projects/ifnet/sys/sys/ata.h projects/ifnet/sys/sys/counter.h projects/ifnet/sys/sys/devicestat.h projects/ifnet/sys/sys/eventvar.h projects/ifnet/sys/sys/param.h projects/ifnet/sys/sys/proc.h projects/ifnet/sys/sys/random.h projects/ifnet/sys/sys/resource.h projects/ifnet/sys/sys/resourcevar.h projects/ifnet/sys/sys/sockbuf.h projects/ifnet/sys/sys/systm.h projects/ifnet/sys/ufs/ffs/ffs_extern.h projects/ifnet/sys/ufs/ffs/ffs_softdep.c projects/ifnet/sys/ufs/ffs/ffs_vfsops.c projects/ifnet/sys/ufs/ffs/ffs_vnops.c projects/ifnet/sys/ufs/ffs/softdep.h projects/ifnet/sys/ufs/ufs/dinode.h projects/ifnet/sys/ufs/ufs/ufs_extern.h projects/ifnet/sys/ufs/ufs/ufsmount.h projects/ifnet/sys/vm/vm_phys.c projects/ifnet/sys/xen/xen-os.h projects/ifnet/tools/build/mk/OptionalObsoleteFiles.inc projects/ifnet/tools/make_libdeps.sh projects/ifnet/usr.bin/atf/Makefile projects/ifnet/usr.bin/atf/Makefile.inc projects/ifnet/usr.bin/limits/limits.c projects/ifnet/usr.bin/netstat/if.c projects/ifnet/usr.bin/netstat/main.c projects/ifnet/usr.bin/netstat/mbuf.c projects/ifnet/usr.bin/netstat/netstat.h projects/ifnet/usr.bin/netstat/route.c projects/ifnet/usr.bin/pathchk/pathchk.c projects/ifnet/usr.bin/procstat/procstat_rlimit.c projects/ifnet/usr.bin/rpcinfo/rpcinfo.c projects/ifnet/usr.bin/systat/netcmds.c projects/ifnet/usr.bin/uname/uname.1 projects/ifnet/usr.bin/uname/uname.c projects/ifnet/usr.sbin/Makefile projects/ifnet/usr.sbin/bhyve/Makefile projects/ifnet/usr.sbin/bhyve/bhyverun.c projects/ifnet/usr.sbin/bhyve/bhyverun.h projects/ifnet/usr.sbin/bhyve/dbgport.h projects/ifnet/usr.sbin/bhyve/mptbl.c projects/ifnet/usr.sbin/bhyve/pci_ahci.c projects/ifnet/usr.sbin/bhyve/pci_emul.c projects/ifnet/usr.sbin/bhyve/pci_hostbridge.c projects/ifnet/usr.sbin/bhyve/pci_virtio_block.c projects/ifnet/usr.sbin/bhyve/pci_virtio_net.c projects/ifnet/usr.sbin/bhyve/rtc.c projects/ifnet/usr.sbin/bhyve/spinup_ap.c projects/ifnet/usr.sbin/bhyvectl/Makefile projects/ifnet/usr.sbin/bhyvectl/bhyvectl.c projects/ifnet/usr.sbin/bhyveload/Makefile projects/ifnet/usr.sbin/bhyveload/bhyveload.8 projects/ifnet/usr.sbin/bhyveload/bhyveload.c projects/ifnet/usr.sbin/bootparamd/bootparamd/main.c projects/ifnet/usr.sbin/bootparamd/callbootd/callbootd.c projects/ifnet/usr.sbin/bsdconfig/bsdconfig projects/ifnet/usr.sbin/bsdconfig/console/ttys projects/ifnet/usr.sbin/bsdconfig/include/messages.subr projects/ifnet/usr.sbin/bsdconfig/mouse/enable projects/ifnet/usr.sbin/bsdconfig/networking/devices projects/ifnet/usr.sbin/bsdconfig/networking/share/device.subr projects/ifnet/usr.sbin/bsdconfig/networking/share/hostname.subr projects/ifnet/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/ifnet/usr.sbin/bsdconfig/networking/share/media.subr projects/ifnet/usr.sbin/bsdconfig/networking/share/netmask.subr projects/ifnet/usr.sbin/bsdconfig/networking/share/resolv.subr projects/ifnet/usr.sbin/bsdconfig/networking/share/routing.subr projects/ifnet/usr.sbin/bsdconfig/password/share/password.subr projects/ifnet/usr.sbin/bsdconfig/security/kern_securelevel projects/ifnet/usr.sbin/bsdconfig/security/security projects/ifnet/usr.sbin/bsdconfig/share/Makefile projects/ifnet/usr.sbin/bsdconfig/share/common.subr projects/ifnet/usr.sbin/bsdconfig/share/device.subr projects/ifnet/usr.sbin/bsdconfig/share/dialog.subr projects/ifnet/usr.sbin/bsdconfig/share/media/any.subr projects/ifnet/usr.sbin/bsdconfig/share/media/cdrom.subr projects/ifnet/usr.sbin/bsdconfig/share/media/common.subr projects/ifnet/usr.sbin/bsdconfig/share/media/dos.subr projects/ifnet/usr.sbin/bsdconfig/share/media/floppy.subr projects/ifnet/usr.sbin/bsdconfig/share/media/ftp.subr projects/ifnet/usr.sbin/bsdconfig/share/media/http.subr projects/ifnet/usr.sbin/bsdconfig/share/media/nfs.subr projects/ifnet/usr.sbin/bsdconfig/share/media/options.subr projects/ifnet/usr.sbin/bsdconfig/share/media/tcpip.subr projects/ifnet/usr.sbin/bsdconfig/share/media/ufs.subr projects/ifnet/usr.sbin/bsdconfig/share/media/usb.subr projects/ifnet/usr.sbin/bsdconfig/share/mustberoot.subr projects/ifnet/usr.sbin/bsdconfig/share/packages/packages.subr projects/ifnet/usr.sbin/bsdconfig/share/strings.subr projects/ifnet/usr.sbin/bsdconfig/share/variable.subr projects/ifnet/usr.sbin/bsdconfig/startup/misc projects/ifnet/usr.sbin/bsdconfig/startup/rcconf projects/ifnet/usr.sbin/bsdconfig/startup/rcdelete projects/ifnet/usr.sbin/bsdconfig/startup/rcvar projects/ifnet/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/ifnet/usr.sbin/bsdconfig/startup/share/rcedit.subr projects/ifnet/usr.sbin/bsdconfig/timezone/timezone projects/ifnet/usr.sbin/bsdconfig/usermgmt/groupdel projects/ifnet/usr.sbin/bsdconfig/usermgmt/groupedit projects/ifnet/usr.sbin/bsdconfig/usermgmt/groupinput projects/ifnet/usr.sbin/bsdconfig/usermgmt/share/group_input.subr projects/ifnet/usr.sbin/bsdconfig/usermgmt/share/user_input.subr projects/ifnet/usr.sbin/bsdconfig/usermgmt/userdel projects/ifnet/usr.sbin/bsdconfig/usermgmt/useredit projects/ifnet/usr.sbin/bsdconfig/usermgmt/userinput projects/ifnet/usr.sbin/bsdconfig/usermgmt/usermgmt projects/ifnet/usr.sbin/bsdinstall/bsdinstall projects/ifnet/usr.sbin/bsdinstall/bsdinstall.8 projects/ifnet/usr.sbin/bsdinstall/scripts/Makefile projects/ifnet/usr.sbin/bsdinstall/scripts/auto projects/ifnet/usr.sbin/bsdinstall/scripts/config projects/ifnet/usr.sbin/bsdinstall/scripts/jail projects/ifnet/usr.sbin/bsdinstall/scripts/keymap projects/ifnet/usr.sbin/bsdinstall/scripts/netconfig projects/ifnet/usr.sbin/bsdinstall/scripts/script projects/ifnet/usr.sbin/bsdinstall/scripts/services projects/ifnet/usr.sbin/ctladm/ctladm.c projects/ifnet/usr.sbin/ctld/kernel.c projects/ifnet/usr.sbin/ctld/login.c projects/ifnet/usr.sbin/freebsd-update/freebsd-update.sh projects/ifnet/usr.sbin/ifmcstat/ifmcstat.c projects/ifnet/usr.sbin/iscsid/discovery.c projects/ifnet/usr.sbin/jail/command.c projects/ifnet/usr.sbin/jail/config.c projects/ifnet/usr.sbin/jail/jail.8 projects/ifnet/usr.sbin/jail/jail.c projects/ifnet/usr.sbin/jail/jailp.h projects/ifnet/usr.sbin/kldxref/kldxref.c projects/ifnet/usr.sbin/pkg/Makefile projects/ifnet/usr.sbin/pkg/config.c projects/ifnet/usr.sbin/pkg/dns_utils.c projects/ifnet/usr.sbin/pkg/dns_utils.h projects/ifnet/usr.sbin/pkg/pkg.c projects/ifnet/usr.sbin/portsnap/portsnap/portsnap.8 projects/ifnet/usr.sbin/portsnap/portsnap/portsnap.sh projects/ifnet/usr.sbin/ppp/mppe.c projects/ifnet/usr.sbin/ypset/ypset.c Directory Properties: projects/ifnet/ (props changed) projects/ifnet/cddl/ (props changed) projects/ifnet/cddl/contrib/opensolaris/ (props changed) projects/ifnet/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/ifnet/contrib/binutils/ (props changed) projects/ifnet/contrib/ipfilter/ (props changed) projects/ifnet/contrib/libcxxrt/ (props changed) projects/ifnet/contrib/mtree/ (props changed) projects/ifnet/gnu/usr.bin/cc/cc_tools/ (props changed) projects/ifnet/lib/libc/ (props changed) projects/ifnet/lib/libutil/ (props changed) projects/ifnet/lib/libvmmapi/ (props changed) projects/ifnet/lib/libz/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/share/man/man4/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/amd64/vmm/ (props changed) projects/ifnet/sys/boot/ (props changed) projects/ifnet/sys/cddl/contrib/opensolaris/ (props changed) projects/ifnet/sys/conf/ (props changed) projects/ifnet/sys/contrib/ipfilter/ (props changed) projects/ifnet/sys/dev/hyperv/ (props changed) projects/ifnet/usr.bin/procstat/ (props changed) projects/ifnet/usr.sbin/bhyve/ (props changed) projects/ifnet/usr.sbin/bhyvectl/ (props changed) projects/ifnet/usr.sbin/bhyveload/ (props changed) projects/ifnet/usr.sbin/bsdinstall/scripts/docsinstall (props changed) projects/ifnet/usr.sbin/jail/ (props changed) Modified: projects/ifnet/Makefile.inc1 ============================================================================== --- projects/ifnet/Makefile.inc1 Thu Oct 24 09:27:06 2013 (r257045) +++ projects/ifnet/Makefile.inc1 Thu Oct 24 10:18:08 2013 (r257046) @@ -128,8 +128,11 @@ OSRELDATE= 0 .endif .if !defined(VERSION) -VERSION!= uname -srp -VERSION+= ${OSRELDATE} +REVISION!= make -C ${.CURDIR}/release -V REVISION +BRANCH!= make -C ${.CURDIR}/release -V BRANCH +SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ + ${.CURDIR}/sys/sys/param.h +VERSION= FreeBSD ${REVISION}-${BRANCH} ${TARGET_ARCH} ${SRCRELDATE} .endif KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 @@ -329,7 +332,7 @@ TARGET_ABI= gnueabi .else TARGET_ABI= unknown .endif -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0 XFLAGS+= -target ${TARGET_TRIPLE} .endif .endif @@ -1377,12 +1380,10 @@ _binutils= gnu/usr.bin/binutils # If an full path to an external cross compiler is given, don't build # a cross compiler. .if ${XCC:M/*} == "" && ${MK_CROSS_COMPILER} != "no" -.if ${MK_CLANG} != "no" && (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") +.if (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && ${TARGET} != "pc98" _clang= usr.bin/clang _clang_libs= lib/clang -.endif - -.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98") +.else _cc= gnu/usr.bin/cc .endif .endif @@ -1722,6 +1723,13 @@ delete-old-libs: chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ rm ${RM_I} "${DESTDIR}/$${file}" <&3; \ fi; \ + for ext in debug symbols; do \ + if ! [ -e "${DESTDIR}/$${file}" ] && [ -f \ + "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \ + rm ${RM_I} "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" \ + <&3; \ + fi; \ + done; \ done @echo ">>> Old libraries removed" @@ -1733,6 +1741,11 @@ check-old-libs: if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ echo "${DESTDIR}/$${file}"; \ fi; \ + for ext in debug symbols; do \ + if [ -f "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \ + echo "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}"; \ + fi; \ + done; \ done delete-old-dirs: @@ -1830,7 +1843,7 @@ NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOU CPUTYPE=${XDEV_CPUTYPE} XDDIR=${XDEV_ARCH}-freebsd -XDTP=/usr/${XDDIR} +XDTP=usr/${XDDIR} CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ @@ -1843,8 +1856,8 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN} -CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN} -XDDESTDIR=${DESTDIR}${XDTP} +CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN} +XDDESTDIR=${DESTDIR}/${XDTP} .if !defined(OSREL) OSREL!= uname -r | sed -e 's/[-(].*//' .endif @@ -1924,6 +1937,7 @@ _xi-libraries: _xi-links: ${_+_}cd ${XDDESTDIR}/usr/bin; \ + mkdir -p ../../../../usr/bin; \ for i in *; do \ ln -sf ../../${XDTP}/usr/bin/$$i \ ../../../../usr/bin/${XDDIR}-$$i; \ Modified: projects/ifnet/ObsoleteFiles.inc ============================================================================== --- projects/ifnet/ObsoleteFiles.inc Thu Oct 24 09:27:06 2013 (r257045) +++ projects/ifnet/ObsoleteFiles.inc Thu Oct 24 10:18:08 2013 (r257046) @@ -38,29 +38,38 @@ # xargs -n1 | sort | uniq -d; # done -# 20131015: removal of RCS from base -OLD_FILES+=usr/bin/ci -OLD_FILES+=usr/bin/co -OLD_FILES+=usr/bin/ident -OLD_FILES+=usr/bin/merge -OLD_FILES+=usr/bin/rcs -OLD_FILES+=usr/bin/rcsclean -OLD_FILES+=usr/bin/rcsdiff -OLD_FILES+=usr/bin/rcsfreeze -OLD_FILES+=usr/bin/rcsmerge -OLD_FILES+=usr/bin/rlog -OLD_FILES+=usr/share/man/man1/ci.1.gz -OLD_FILES+=usr/share/man/man1/co.1.gz -OLD_FILES+=usr/share/man/man1/ident.1.gz -OLD_FILES+=usr/share/man/man1/merge.1.gz -OLD_FILES+=usr/share/man/man1/rcs.1.gz -OLD_FILES+=usr/share/man/man1/rcsclean.1.gz -OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz -OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz -OLD_FILES+=usr/share/man/man1/rcsintro.1.gz -OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz -OLD_FILES+=usr/share/man/man1/rlog.1.gz -OLD_FILES+=usr/share/man/man5/rcsfile.5.gz +# 20131014: libbsdyml becomes private +OLD_FILES+=usr/lib/libbsdyml.a +OLD_FILES+=usr/lib/libbsdyml.so +OLD_LIBS+=usr/lib/libbsdyml.so.0 +OLD_FILES+=usr/lib/libbsdyml_p.a +OLD_FILES+=usr/lib32/libbsdyml.a +OLD_FILES+=usr/lib32/libbsdyml.so +OLD_LIBS+=usr/lib32/libbsdyml.so.0 +OLD_FILES+=usr/lib32/libbsdyml_p.a +OLD_FILES+=usr/share/man/man3/libbsdyml.3.gz +OLD_FILES+=usr/include/bsdyml.h +# 20131013: Removal of the ATF tools +OLD_FILES+=etc/atf/FreeBSD.conf +OLD_FILES+=etc/atf/atf-run.hooks +OLD_FILES+=etc/atf/common.conf +OLD_FILES+=usr/bin/atf-config +OLD_FILES+=usr/bin/atf-report +OLD_FILES+=usr/bin/atf-run +OLD_FILES+=usr/bin/atf-version +OLD_FILES+=usr/share/atf/atf-run.hooks +OLD_FILES+=usr/share/examples/atf/atf-run.hooks +OLD_FILES+=usr/share/examples/atf/tests-results.css +OLD_FILES+=usr/share/man/man1/atf-config.1.gz +OLD_FILES+=usr/share/man/man1/atf-report.1.gz +OLD_FILES+=usr/share/man/man1/atf-run.1.gz +OLD_FILES+=usr/share/man/man1/atf-version.1.gz +OLD_FILES+=usr/share/man/man5/atf-formats.5.gz +OLD_FILES+=usr/share/man/man7/atf.7.gz +OLD_FILES+=usr/share/xml/atf/tests-results.dtd +OLD_FILES+=usr/share/xsl/atf/tests-results.xsl +# 20131009: freebsd-version moved from /libexec to /bin +OLD_FILES+=libexec/freebsd-version # 20131001: ar and ranlib from binutils not used OLD_FILES+=usr/bin/gnu-ar OLD_FILES+=usr/bin/gnu-ranlib @@ -88,7 +97,7 @@ OLD_FILES+=usr/include/lwres/result.h OLD_FILES+=usr/include/lwres/version.h OLD_FILES+=usr/lib/liblwres.a OLD_FILES+=usr/lib/liblwres.so -OLD_LIBS+=usr/lib/liblwres.so.50 +OLD_LIBS+=usr/lib/liblwres.so.90 OLD_FILES+=usr/lib/liblwres_p.a OLD_FILES+=usr/sbin/arpaname OLD_FILES+=usr/sbin/ddns-confgen @@ -98,6 +107,7 @@ OLD_FILES+=usr/sbin/dnssec-keygen OLD_FILES+=usr/sbin/dnssec-revoke OLD_FILES+=usr/sbin/dnssec-settime OLD_FILES+=usr/sbin/dnssec-signzone +OLD_FILES+=usr/sbin/dnssec-verify OLD_FILES+=usr/sbin/genrandom OLD_FILES+=usr/sbin/isc-hmac-fixup OLD_FILES+=usr/sbin/lwresd @@ -261,6 +271,7 @@ OLD_FILES+=usr/share/man/man8/dnssec-key OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-verify.8.gz OLD_FILES+=usr/share/man/man8/genrandom.8.gz OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz OLD_FILES+=usr/share/man/man8/lwresd.8.gz @@ -295,6 +306,8 @@ OLD_DIRS+=var/named/var/run OLD_DIRS+=var/named/var/run/named OLD_DIRS+=var/named/var/stats OLD_DIRS+=var/run/named +# 20130923: example moved +OLD_FILES+=usr/share/examples/bsdconfig/browse_packages.sh # 20130908: libssh becomes private OLD_FILES+=usr/lib/libssh.a OLD_FILES+=usr/lib/libssh.so @@ -6114,6 +6127,13 @@ OLD_LIBS+=usr/lib/libkse.so.1 OLD_LIBS+=usr/lib/liblwres.so.3 OLD_LIBS+=usr/lib/pam_ftp.so.2 +# 20131013: Removal of the ATF tools +OLD_DIRS+=etc/atf +OLD_DIRS+=usr/share/examples/atf +OLD_DIRS+=usr/share/xml/atf +OLD_DIRS+=usr/share/xml +OLD_DIRS+=usr/share/xsl/atf +OLD_DIRS+=usr/share/xsl # 20040925: bind9 import OLD_DIRS+=usr/share/doc/bind/html OLD_DIRS+=usr/share/doc/bind/misc Modified: projects/ifnet/UPDATING ============================================================================== --- projects/ifnet/UPDATING Thu Oct 24 09:27:06 2013 (r257045) +++ projects/ifnet/UPDATING Thu Oct 24 10:18:08 2013 (r257046) @@ -16,8 +16,8 @@ from older versions of FreeBSD, try WITH 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 +NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW: + FreeBSD 11.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They also substantially impact @@ -31,9 +31,33 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) -20131006: - RCS has been removed from the base system. If you need RCS - install either devel/rcs or devel/rcs57. +20131014: + libbsdyml has been renamed to libyaml and moved to /usr/lib/private. + This will break ports-mgmt/pkg. Rebuild the port, or upgrade to pkg + 1.1.4_8 and verify bsdyml not linked in, before running "make + delete-old-libs": + # make -C /usr/ports/ports-mgmt/pkg build deinstall install clean + or + # pkg install pkg; ldd /usr/local/sbin/pkg | grep bsdyml + +20131010: + The rc.d/jail script has been updated to support jail(8) + configuration file. The "jail__*" rc.conf(5) variables + for per-jail configuration are automatically converted to + /var/run/jail..conf before the jail(8) utility is invoked. + This is transparently backward compatible. See below about some + incompatibilities and rc.conf(5) manual page for more details. + + These variables are now deprecated in favor of jail(8) configuration + file. One can use "rc.d/jail config " command to generate + a jail(8) configuration file in /var/run/jail..conf without + running the jail(8) utility. The default pathname of the + configuration file is /etc/jail.conf and can be specified by + using $jail_conf or $jail__conf variables. + + Please note that jail_devfs_ruleset accepts an integer at + this moment. Please consider to rewrite the ruleset name + with an integer. 20130930: BIND has been removed from the base system. If all you need @@ -77,19 +101,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 has been updated to use this support. A new gcc is required to build the aesni module on both i386 and amd64. -20130827: - Thomas Dickey (vendor author thereof) reports that dialog(1) since - 2011/10/18 has a bug in handling --hline. Testers and I noticed the - --hline is not ignored but displayed as a NULL string, regardless of - value. This will cause confusion in some bsdconfig dialogs where the - --hline is used to inform users which keybindings to use. This will - likewise affect any other persons relying on --hline. It also looks - rather strange seeing "[]" at the bottom of dialog(1) widgets when - passing --hline "anything". Thomas said he will have a look in a few - weeks. NOTE: The "[]" brackets appear with the left-edge where it - would normally appear given the width of text to display, but the - displayed text is not there (part of the bug). - 20130821: The PADLOCK_RNG and RDRAND_RNG kernel options are now devices. Thus "device padlock_rng" and "device rdrand_rng" should be Modified: projects/ifnet/bin/Makefile ============================================================================== --- projects/ifnet/bin/Makefile Thu Oct 24 09:27:06 2013 (r257045) +++ projects/ifnet/bin/Makefile Thu Oct 24 10:18:08 2013 (r257046) @@ -15,6 +15,7 @@ SUBDIR= cat \ echo \ ed \ expr \ + freebsd-version \ getfacl \ hostname \ kenv \ Modified: projects/ifnet/bin/ps/print.c ============================================================================== --- projects/ifnet/bin/ps/print.c Thu Oct 24 09:27:06 2013 (r257045) +++ projects/ifnet/bin/ps/print.c Thu Oct 24 10:18:08 2013 (r257046) @@ -797,8 +797,6 @@ char * emulname(KINFO *k, VARENT *ve __unused) { - if (k->ki_p->ki_emul == NULL) - return (NULL); return (strdup(k->ki_p->ki_emul)); } @@ -827,7 +825,6 @@ out: char * loginclass(KINFO *k, VARENT *ve __unused) { - char *s; /* * Don't display login class for system processes; @@ -837,8 +834,5 @@ loginclass(KINFO *k, VARENT *ve __unused if (k->ki_p->ki_flag & P_SYSTEM) { return (strdup("-")); } - s = k->ki_p->ki_loginclass; - if (s == NULL) - return (NULL); - return (strdup(s)); + return (strdup(k->ki_p->ki_loginclass)); } Modified: projects/ifnet/bin/sh/jobs.c ============================================================================== --- projects/ifnet/bin/sh/jobs.c Thu Oct 24 09:27:06 2013 (r257045) +++ projects/ifnet/bin/sh/jobs.c Thu Oct 24 10:18:08 2013 (r257046) @@ -978,7 +978,6 @@ int waitforjob(struct job *jp, int *origstatus) { #if JOBS - pid_t mypgrp = getpgrp(); int propagate_int = jp->jobctl && jp->foreground; #endif int status; @@ -992,7 +991,7 @@ waitforjob(struct job *jp, int *origstat dotrap(); #if JOBS if (jp->jobctl) { - if (tcsetpgrp(ttyfd, mypgrp) < 0) + if (tcsetpgrp(ttyfd, rootpid) < 0) error("tcsetpgrp failed, errno=%d\n", errno); } if (jp->state == JOBSTOPPED) Modified: projects/ifnet/bin/sh/miscbltin.c ============================================================================== --- projects/ifnet/bin/sh/miscbltin.c Thu Oct 24 09:27:06 2013 (r257045) +++ projects/ifnet/bin/sh/miscbltin.c Thu Oct 24 10:18:08 2013 (r257046) @@ -405,6 +405,9 @@ static const struct limits limits[] = { #ifdef RLIMIT_NPTS { "pseudo-terminals", (char *)0, RLIMIT_NPTS, 1, 'p' }, #endif +#ifdef RLIMIT_KQUEUES + { "kqueues", (char *)0, RLIMIT_KQUEUES, 1, 'k' }, +#endif { (char *) 0, (char *)0, 0, 0, '\0' } }; @@ -421,7 +424,7 @@ ulimitcmd(int argc __unused, char **argv struct rlimit limit; what = 'f'; - while ((optc = nextopt("HSatfdsmcnuvlbpw")) != '\0') + while ((optc = nextopt("HSatfdsmcnuvlbpwk")) != '\0') switch (optc) { case 'H': how = HARD; Modified: projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Thu Oct 24 09:27:06 2013 (r257045) +++ projects/ifnet/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Thu Oct 24 10:18:08 2013 (r257046) @@ -2,7 +2,7 @@ .\" CDDL HEADER START .\" .\" The contents of this file are subject to the terms of the -.\" Common Development and Distribution License (the "License"). +.\" 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 @@ -18,653 +18,660 @@ .\" .\" CDDL HEADER END .\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved. -.TH dtrace 1M "5 Sep 2006" "SunOS 5.11" "System Administration Commands" -.SH NAME -dtrace \- DTrace dynamic tracing compiler and tracing utility -.SH SYNOPSIS -.LP -.nf -\fBdtrace\fR [\fB-32\fR | \fB-64\fR] [\fB-aACeFGHhlqSvVwZ\fR] [\fB-b\fR \fIbufsz\fR] [\fB-c\fR \fIcmd\fR] - [\fB-D\fR \fIname\fR [\fI=value\fR]] [\fB-I\fR \fIpath\fR] [\fB-L\fR \fIpath\fR] [\fB-o\fR \fIoutput\fR] - [\fB-s\fR \fIscript\fR] [\fB-U\fR \fIname\fR] [\fB-x\fR \fIarg\fR [\fI=val\fR]] - [\fB-X\fR a | c | s | t] [\fB-p\fR \fIpid\fR] - [\fB-P\fR \fIprovider\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-m\fR [\fIprovider:\fR] \fImodule\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-f\fR [[\fIprovider:\fR] \fImodule:\fR] \fIfunction\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]] - [\fB-i\fR \fIprobe-id\fR [[\fIpredicate\fR] \fIaction\fR]] -.fi - -.SH DESCRIPTION -.sp -.LP -DTrace is a comprehensive dynamic tracing framework for the Solaris Operating System. DTrace provides a powerful infrastructure that permits administrators, developers, and service personnel to concisely answer arbitrary questions about the behavior of the operating system and user programs. -.sp -.LP -The \fISolaris Dynamic Tracing Guide\fR describes how to use DTrace to observe, debug, and tune system behavior. Refer to this book for a detailed description of DTrace features, including the bundled DTrace observability -tools, instrumentation providers, and the D programming language. -.sp -.LP -The \fBdtrace\fR command provides a generic interface to the essential services provided by the DTrace facility, including: -.RS +4 -.TP -.ie t \(bu -.el o +.\" +.\" $FreeBSD$ +.\" +.Dd October 5, 2013 +.Dt DTRACE 1 +.Os +.Sh NAME +.Nm dtrace +.Nd dynamic tracing compiler and tracing utility +.Sh SYNOPSIS +.Nm +.Op Fl 32 | Fl 64 +.Op Fl aACeFGhHlqSvVwZ +.Op Fl b Ar bufsz +.Op Fl c Ar cmd +.Op Fl D Ar name Op Ns = Ns value +.Op Fl I Ar path +.Op Fl L Ar path +.Op Fl o Ar output +.Op Fl s Ar script +.Op Fl U Ar name +.Op Fl x Ar arg Op Ns = Ns value +.Op Fl X Cm a | c | s | t +.Op Fl p Ar pid +.Op Fl P Ar provider Oo Oo Ar predicate Oc Ar action Oc +.Op Fl m Oo Ar provider : Oc Ar module Oo Oo Ar predicate Oc Ar action Oc +.Op Fl f Oo Oo Ar provider : Oc Ar module : Oc Ar function Oo Oo Ar predicate \ + Oc Ar action Oc +.Op Fl n Oo Oo Oo Ar provider : Oc Ar module : Oc Ar function : Oc Ar name \ + Oo Oo Ar predicate Oc Ar action Oc +.Op Fl i Ar probe-id Oo Oo Ar predicate Oc Ar action Oc +.Sh DESCRIPTION +DTrace is a comprehensive dynamic tracing framework ported from Solaris. +DTrace provides a powerful infrastructure that permits administrators, +developers, and service personnel to concisely answer arbitrary questions about +the behavior of the operating system and user programs. +.Pp +The +.Nm +command provides a generic interface to the essential services provided by the +DTrace facility, including: +.Bl -bullet -offset indent +.It Options that list the set of probes and providers currently published by DTrace -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that enable probes directly using any of the probe description specifiers (provider, module, function, name) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that run the D compiler and compile one or more D program files or programs written directly on the command line -.RE -.RS +4 -.TP -.ie t \(bu -.el o +.It +Options that enable probes directly using any of the probe description +specifiers (provider, module, function, name) +.It +Options that run the D compiler and compile one or more D program files or +programs written directly on the command line +.It Options that generate anonymous tracing programs -.RE -.RS +4 -.TP -.ie t \(bu -.el o +.It Options that generate program stability reports -.RE -.RS +4 -.TP -.ie t \(bu -.el o -Options that modify DTrace tracing and buffering behavior and enable additional D compiler features -.RE -.sp -.LP -You can use \fBdtrace\fR to create D scripts by using it in a \fB#!\fR declaration to create an interpreter file. You can also use \fBdtrace\fR to attempt to compile D programs and determine their properties without actually enabling tracing using the \fB-e\fR option. See \fBOPTIONS\fR. See the \fISolaris Dynamic Tracing Guide\fR for detailed examples of how to use the \fBdtrace\fR utility to perform these tasks. -.SH OPTIONS -.sp -.LP -The arguments accepted by the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, and \fB-i\fR options can include an optional D language \fIpredicate\fR enclosed in slashes \fB//\fR and optional D language \fIaction\fR statement list enclosed in braces \fB{}\fR. D program code specified on the command line must be appropriately quoted to avoid intepretation of meta-characters by the shell. -.sp -.LP +.It +Options that modify DTrace tracing and buffering behavior and enable +additional D compiler features +.El +.Pp +You can use +.Nm +to create D scripts by using it in a shebang declaration to create an +interpreter file. +You can also use +.Nm +to attempt to compile D programs and determine their properties without +actually enabling traces using the +.Fl e +option. +.Sh OPTIONS +The arguments accepted by the +.Fl P , +.Fl m , +.Fl f , +.Fl n , +and +.Fl i +options can include an optional D language +.Ar predicate +enclosed in slashes and an optional D language +.Ar action +statement list enclosed in braces. +D program code specified on the command line must be appropriately quoted to +avoid interpretation of meta-characters by the shell. +.Pp The following options are supported: -.sp -.ne 2 -.mk -.na -\fB\fB-32\fR | \fB-64\fR\fR -.ad -.sp .6 -.RS 4n -The D compiler produces programs using the native data model of the operating system kernel. You can use the \fBisainfo\fR \fB-b\fR command to determine the current operating system data model. If the \fB-32\fR option is specified, \fBdtrace\fR forces -the D compiler to compile a D program using the 32-bit data model. If the \fB-64\fR option is specified, \fBdtrace\fR forces the D compiler to compile a D program using the 64-bit data model. These options are typically not required as \fBdtrace\fR selects the -native data model as the default. The data model affects the sizes of integer types and other language properties. D programs compiled for either data model can be executed on both 32-bit and 64-bit kernels. The \fB-32\fR and \fB-64\fR options also determine the ELF file format -(ELF32 or ELF64) produced by the \fB-G\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-a\fR\fR -.ad -.sp .6 -.RS 4n -Claim anonymous tracing state and display the traced data. You can combine the \fB-a\fR option with the \fB-e\fR option to force \fBdtrace\fR to exit immediately after consuming the anonymous tracing state rather than continuing to wait for new -data. See the \fISolaris Dynamic Tracing Guide\fR for more information about anonymous tracing. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-A\fR\fR -.ad -.sp .6 -.RS 4n -Generate \fBdriver.conf\fR(4) directives for anonymous tracing. This option constructs a set of \fBdtrace\fR(7D) configuration file directives to enable the specified probes for anonymous tracing and then exits. By default, \fBdtrace\fR attempts to store the directives to the file \fB/kernel/drv/dtrace.conf\fR. You can modify this behavior if you use the \fB-o\fR option to specify an alternate output file. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-b\fR \fIbufsz\fR\fR -.ad -.sp .6 -.RS 4n -Set principal trace buffer size (\fIbufsz\fR). The trace buffer size can include any of the size suffixes \fBk\fR, \fBm\fR, \fBg\fR, or \fBt\fR. If the buffer space cannot be allocated, \fBdtrace\fR attempts -to reduce the buffer size or exit depending on the setting of the \fBbufresize\fR property. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-c\fR \fIcmd\fR\fR -.ad -.sp .6 -.RS 4n -Run the specified command \fIcmd\fR and exit upon its completion. If more than one \fB-c\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status for each child process as it -terminates. The process-ID of the first command is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for more information -on macro variables. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-C\fR\fR -.ad -.sp .6 -.RS 4n -Run the C preprocessor \fBcpp\fR(1) over D programs before compiling them. You can pass options to the C preprocessor using the \fB-D\fR, \fB-U\fR, \fB-I\fR, and \fB-H\fR options. You can select the degree of C standard conformance if you use the \fB-X\fR option. For a description of the set of tokens defined by the D compiler when invoking the C preprocessor, see \fB-X\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-D\fR \fIname\fR \fB[=\fR\fIvalue\fR\fB]\fR\fR -.ad -.sp .6 -.RS 4n -Define \fIname\fR when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). If you specify the equals sign (\fB=\fR) -and additional \fIvalue\fR, the name is assigned the corresponding value. This option passes the \fB-D\fR option to each \fBcpp\fR invocation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-e\fR\fR -.ad -.sp .6 -.RS 4n -Exit after compiling any requests and consuming anonymous tracing state (\fB-a\fR option) but prior to enabling any probes. You can combine this option with the \fB-a\fR option to print anonymous tracing data and exit. You can also combine this option with D -compiler options. This combination verifies that the programs compile without actually executing them and enabling the corresponding instrumentation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-f\fR\fB[[\fR\fIprovider\fR\fB:]\fR\fImodule\fR\fB:]\fR\fIfunction\fR\fB[[\fR\fIpredicate\fR\fB]\fR\fIaction\fR\fB]]\fR\fR -.ad -.sp .6 -.RS 4n -Specify function name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function\fR, \fImodule:function\fR, or \fIfunction\fR. -Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIfunction\fR are specified in the description, all probes with the corresponding \fIfunction\fR are matched. -The \fB-f\fR argument can be suffixed with an optional D probe clause. You can specify more than one \fB-f\fR option on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-F\fR\fR -.ad -.sp .6 -.RS 4n -Coalesce trace output by identifying function entry and return. Function entry probe reports are indented and their output is prefixed with \fB->\fR. Function return probe reports are unindented and their output is prefixed with \fB<-\fR\&. System call -entry probe reports are indented and their output is prefixed with \fB=>\fR. System call return probe reports are unindented and their output is prefixed with \fB<=\fR\&. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-G\fR\fR -.ad -.sp .6 -.RS 4n -Generate an ELF file containing an embedded DTrace program. The DTrace probes specified in the program are saved inside of a relocatable ELF object which can be linked into another program. If the \fB-o\fR option is present, the ELF file is saved using the pathname specified -as the argument for this operand. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fB\fIfilename\fR.d\fR, then the ELF file is saved using the name \fB\fIfilename\fR.o\fR. -Otherwise the ELF file is saved using the name \fBd.out\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-H\fR\fR -.ad -.sp .6 -.RS 4n -Print the pathnames of included files when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). This option passes the \fB-H\fR option -to each \fBcpp\fR invocation, causing it to display the list of pathnames, one for each line, to \fBstderr\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-h\fR\fR -.ad -.sp .6 -.RS 4n -Generate a header file containing macros that correspond to probes in the specified provider definitions. This option should be used to generate a header file that is included by other source files for later use with the \fB-G\fR option. If the \fB-o\fR option -is present, the header file is saved using the pathname specified as the argument for that option. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fIfilename\fR\fB\&.d\fR, then the header file is saved -using the name \fIfilename\fR\fB\&.h\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-i\fR \fIprobe-id\fR\fB[[\fR\fIpredicate\fR] \fIaction\fR\fB]\fR\fR -.ad -.sp .6 -.RS 4n -Specify probe identifier (\fIprobe-id\fR) to trace or list (\fB-l\fR option). You can specify probe IDs using decimal integers as shown by \fBdtrace\fR \fB-l\fR. The \fB-i\fR argument can be suffixed with an optional -D probe clause. You can specify more than one \fB-i\fR option at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-I\fR \fIpath\fR\fR -.ad -.sp .6 -.RS 4n -Add the specified directory \fIpath\fR to the search path for \fB#include\fR files when invoking \fBcpp\fR(1) (enabled -using the \fB-C\fR option). This option passes the \fB-I\fR option to each \fBcpp\fR invocation. The specified \fIpath\fR is inserted into the search path ahead of the default directory list. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-L\fR \fIpath\fR\fR -.ad -.sp .6 -.RS 4n -Add the specified directory \fIpath\fR to the search path for DTrace libraries. DTrace libraries are used to contain common definitions that can be used when writing D programs. The specified \fIpath\fR is added after the default library -search path. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-l\fR\fR -.ad -.sp .6 -.RS 4n -List probes instead of enabling them. If the \fB-l\fR option is specified, \fBdtrace\fR produces a report of the probes matching the descriptions given using the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, \fB-i\fR, -and \fB-s\fR options. If none of these options are specified, this option lists all probes. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-m\fR [[\fIprovider:\fR] \fImodule:\fR [[\fIpredicate\fR] \fIaction\fR]]\fR -.ad -.sp .6 -.RS 4n -Specify module name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module\fR or \fImodule\fR. Unspecified probe description fields are left blank and match -any probes regardless of the values in those fields. If no qualifiers other than \fImodule\fR are specified in the description, all probes with a corresponding \fImodule\fR are matched. The \fB-m\fR argument can be suffixed with an optional D -probe clause. More than one \fB-m\fR option can be specified on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]\fR -.ad -.sp .6 -.RS 4n -Specify probe name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function:name\fR, \fImodule:function:name\fR, \fIfunction:name\fR, -or \fIname\fR. Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIname\fR are specified in the description, all probes with a corresponding \fIname\fR are -matched. The \fB-n\fR argument can be suffixed with an optional D probe clause. More than one \fB-n\fR option can be specified on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-o\fR \fIoutput\fR\fR -.ad -.sp .6 -.RS 4n -Specify the \fIoutput\fR file for the \fB-A\fR , \fB-G\fR, and \fB-l\fR options, or for the traced data itself. If the \fB-A\fR option is present and \fB-o\fR is not present, the default output file is \fB/kernel/drv/dtrace.conf\fR. If the \fB-G\fR option is present and the \fB-s\fR option's argument is of the form \fB\fIfilename\fR.d\fR and \fB-o\fR is not present, the default output file is \fB\fIfilename\fR.o\fR. -Otherwise the default output file is \fBd.out\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-p\fR \fIpid\fR\fR -.ad -.sp .6 -.RS 4n -Grab the specified process-ID \fIpid\fR, cache its symbol tables, and exit upon its completion. If more than one \fB-p\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status -for each process as it terminates. The first process-ID is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for -more information on macro variables. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-P\fR \fIprovider\fR \fB[[\fR\fIpredicate\fR\fB]\fR \fIaction\fR]\fR -.ad -.sp .6 -.RS 4n -Specify provider name to trace or list (\fB-l\fR option). The remaining probe description fields module, function, and name are left blank and match any probes regardless of the values in those fields. The \fB-P\fR argument can be suffixed with an optional D -probe clause. You can specify more than one \fB-P\fR option on the command line at a time. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-q\fR\fR -.ad -.sp .6 -.RS 4n -Set quiet mode. \fBdtrace\fR suppresses messages such as the number of probes matched by the specified options and D programs and does not print column headers, the CPU ID, the probe ID, or insert newlines into the output. Only data traced and formatted by D program -statements such as \fBtrace()\fR and \fBprintf()\fR is displayed to \fBstdout\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-s\fR\fR -.ad -.sp .6 -.RS 4n -Compile the specified D program source file. If the \fB-e\fR option is present, the program is compiled but instrumentation is not enabled. If the \fB-l\fR option is present, the program is compiled and the set of probes matched by it is listed, but instrumentation -is not enabled. If none of \fB-e\fR, \fB-l\fR, \fB-G\fR, or \fB-A\fR are present, the instrumentation specified by the D program is enabled and tracing begins. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-S\fR\fR -.ad -.sp .6 -.RS 4n -Show D compiler intermediate code. The D compiler produces a report of the intermediate code generated for each D program to \fBstderr\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-U\fR \fIname\fR\fR -.ad -.sp .6 -.RS 4n -Undefine the specified \fIname\fR when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). This option passes the \fB-U\fR option to each \fBcpp\fR invocation. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-v\fR\fR -.ad -.sp .6 -.RS 4n -Set verbose mode. If the \fB-v\fR option is specified, \fBdtrace\fR produces a program stability report showing the minimum interface stability and dependency level for the specified D programs. DTrace stability levels are explained in further detail in the \fISolaris Dynamic Tracing Guide\fR. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-V\fR\fR -.ad -.sp .6 -.RS 4n -Report the highest D programming interface version supported by \fBdtrace\fR. The version information is printed to \fBstdout\fR and the \fBdtrace\fR command exits. Refer to the \fISolaris Dynamic Tracing Guide\fR for -more information about DTrace versioning features. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-w\fR\fR -.ad -.sp .6 -.RS 4n -Permit destructive actions in D programs specified using the \fB-s\fR, \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, or \fB-i\fR options. If the \fB-w\fR option is not specified, \fBdtrace\fR does not -permit the compilation or enabling of a D program that contains destructive actions. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-x\fR \fIarg\fR [\fI=val\fR]\fR -.ad -.sp .6 -.RS 4n -Enable or modify a DTrace runtime option or D compiler option. The list of options is found in the \fISolaris Dynamic Tracing Guide\fR. Boolean options are enabled by specifying their name. Options with values are set by separating the option name and -value with an equals sign (\fB=\fR). -.RE - -.sp -.ne 2 -.mk -.na -\fB\fB-X\fR \fBa | c | s | t\fR\fR -.ad -.sp .6 -.RS 4n -Specify the degree of conformance to the ISO C standard that should be selected when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). -The \fB-X\fR option argument affects the value and presence of the \fB__STDC__\fR macro depending upon the value of the argument letter. -.sp -The \fB-X\fR option supports the following arguments: -.sp -.ne 2 -.mk -.na -\fB\fBa\fR\fR -.ad -.RS 5n -.rt -Default. ISO C plus K&R compatibility extensions, with semantic changes required by ISO C. This is the default mode if \fB-X\fR is not specified. The predefined macro \fB__STDC__\fR has a value of 0 when \fBcpp\fR is invoked in conjunction -with the \fB-Xa\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fBc\fR\fR -.ad -.RS 5n -.rt -Conformance. Strictly conformant ISO C, without K&R C compatibility extensions. The predefined macro \fB__STDC__\fR has a value of 1 when \fBcpp\fR is invoked in conjunction with the \fB-Xc\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fBs\fR\fR -.ad -.RS 5n -.rt -K&R C only. The macro \fB__STDC__\fR is not defined when \fBcpp\fR is invoked in conjunction with the \fB-Xs\fR option. -.RE - -.sp -.ne 2 -.mk -.na -\fB\fBt\fR\fR -.ad -.RS 5n -.rt -Transition. ISO C plus K&R C compatibility extensions, without semantic changes required by ISO C. The predefined macro \fB__STDC__\fR has a value of 0 when \fBcpp\fR is invoked in conjunction with the \fB-Xt\fR option. -.RE - -As the \fB-X\fR option only affects how the D compiler invokes the C preprocessor, the \fB-Xa\fR and \fB-Xt\fR options are equivalent from the perspective of D and both are provided only to ease re-use of settings from a C build environment. -.sp -Regardless of the \fB-X\fR mode, the following additional C preprocessor definitions are always specified and valid in all modes: -.RS +4 -.TP -.ie t \(bu -.el o -\fB__sun\fR -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__unix\fR -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__SVR4\fR -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__sparc\fR (on SPARC systems only) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__sparcv9\fR (on SPARC systems only when 64-bit programs are compiled) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__i386\fR (on x86 systems only when 32-bit programs are compiled) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__amd64\fR (on x86 systems only when 64-bit programs are compiled) -.RE -.RS +4 -.TP -.ie t \(bu -.el o -\fB__\fI`uname -s`\fR_\fI`uname -r`\fR\fR (for example, \fB__SunOS_5_10\fR) -.RE -.RS +4 -.TP *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sat Oct 26 18:03:42 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 65BFCEF7; Sat, 26 Oct 2013 18:03:42 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4FF332B12; Sat, 26 Oct 2013 18:03:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9QI3gAr072270; Sat, 26 Oct 2013 18:03:42 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9QI3bOl072233; Sat, 26 Oct 2013 18:03:37 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201310261803.r9QI3bOl072233@svn.freebsd.org> From: Gleb Smirnoff Date: Sat, 26 Oct 2013 18:03:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257177 - in projects/ifnet: . contrib/gperf/src contrib/llvm/tools/clang/tools/driver contrib/subversion/subversion/libsvn_subr etc etc/keys etc/mtree etc/pkg lib/libcrypt lib/libcrypt... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Oct 2013 18:03:42 -0000 Author: glebius Date: Sat Oct 26 18:03:36 2013 New Revision: 257177 URL: http://svnweb.freebsd.org/changeset/base/257177 Log: Merge head r256150 through r257176. Added: projects/ifnet/etc/keys/ - copied from r257176, head/etc/keys/ projects/ifnet/etc/mtree/BSD.tests.dist - copied unchanged from r257176, head/etc/mtree/BSD.tests.dist projects/ifnet/etc/pkg/ - copied from r257176, head/etc/pkg/ projects/ifnet/share/man/man7/tests.7 - copied unchanged from r257176, head/share/man/man7/tests.7 projects/ifnet/share/mk/plain.test.mk - copied unchanged from r257176, head/share/mk/plain.test.mk projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_spi.c - copied unchanged from r257176, head/sys/arm/broadcom/bcm2835/bcm2835_spi.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_spireg.h - copied unchanged from r257176, head/sys/arm/broadcom/bcm2835/bcm2835_spireg.h projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_spivar.h - copied unchanged from r257176, head/sys/arm/broadcom/bcm2835/bcm2835_spivar.h projects/ifnet/sys/dev/spibus/ofw_spibus.c - copied unchanged from r257176, head/sys/dev/spibus/ofw_spibus.c projects/ifnet/sys/mips/conf/ALFA_HORNET_UB - copied unchanged from r257176, head/sys/mips/conf/ALFA_HORNET_UB projects/ifnet/sys/mips/conf/ALFA_HORNET_UB.hints - copied unchanged from r257176, head/sys/mips/conf/ALFA_HORNET_UB.hints projects/ifnet/sys/powerpc/mpc85xx/pci_mpc85xx.c - copied unchanged from r257176, head/sys/powerpc/mpc85xx/pci_mpc85xx.c projects/ifnet/tests/ - copied from r257176, head/tests/ projects/ifnet/tools/build/options/WITHOUT_NMTREE - copied unchanged from r257176, head/tools/build/options/WITHOUT_NMTREE projects/ifnet/tools/build/options/WITHOUT_TESTS - copied unchanged from r257176, head/tools/build/options/WITHOUT_TESTS Deleted: projects/ifnet/sys/powerpc/include/trap_aim.h projects/ifnet/sys/powerpc/include/trap_booke.h projects/ifnet/sys/powerpc/mpc85xx/pci_fdt.c projects/ifnet/tools/build/options/WITH_NMTREE Modified: projects/ifnet/Makefile.inc1 projects/ifnet/ObsoleteFiles.inc projects/ifnet/UPDATING projects/ifnet/contrib/gperf/src/options.cc projects/ifnet/contrib/gperf/src/search.cc projects/ifnet/contrib/llvm/tools/clang/tools/driver/driver.cpp projects/ifnet/contrib/subversion/subversion/libsvn_subr/opt.c projects/ifnet/contrib/subversion/subversion/libsvn_subr/version.c projects/ifnet/etc/Makefile projects/ifnet/etc/mtree/BSD.root.dist projects/ifnet/etc/mtree/BSD.usr.dist projects/ifnet/lib/libcrypt/Makefile projects/ifnet/lib/libcrypt/tests/Makefile projects/ifnet/sbin/hastctl/hastctl.c projects/ifnet/sbin/hastd/control.c projects/ifnet/sbin/hastd/hast.h projects/ifnet/sbin/hastd/primary.c projects/ifnet/sbin/hastd/secondary.c projects/ifnet/sbin/mdconfig/mdconfig.8 projects/ifnet/share/man/man5/src.conf.5 projects/ifnet/share/man/man7/Makefile projects/ifnet/share/man/man7/hier.7 projects/ifnet/share/mk/bsd.files.mk projects/ifnet/share/mk/bsd.own.mk projects/ifnet/share/mk/bsd.test.mk projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/ifnet/sys/arm/broadcom/bcm2835/files.bcm2835 projects/ifnet/sys/arm/conf/RPI-B projects/ifnet/sys/arm/lpc/if_lpe.c projects/ifnet/sys/arm/lpc/lpc_mmc.c projects/ifnet/sys/arm/mv/mv_sata.c projects/ifnet/sys/boot/fdt/dts/bcm2835.dtsi projects/ifnet/sys/boot/fdt/dts/db78460.dts projects/ifnet/sys/boot/uboot/lib/disk.c projects/ifnet/sys/boot/uboot/lib/glue.c projects/ifnet/sys/cam/ata/ata_da.c projects/ifnet/sys/cam/scsi/scsi_da.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/ifnet/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c projects/ifnet/sys/cddl/dev/sdt/sdt.c projects/ifnet/sys/compat/linprocfs/linprocfs.c projects/ifnet/sys/compat/linux/linux_ioctl.c projects/ifnet/sys/compat/ndis/kern_ndis.c projects/ifnet/sys/compat/ndis/subr_ndis.c projects/ifnet/sys/compat/ndis/subr_usbd.c projects/ifnet/sys/conf/NOTES projects/ifnet/sys/conf/files projects/ifnet/sys/conf/files.powerpc projects/ifnet/sys/dev/ae/if_ae.c projects/ifnet/sys/dev/age/if_age.c projects/ifnet/sys/dev/alc/if_alc.c projects/ifnet/sys/dev/ale/if_ale.c projects/ifnet/sys/dev/an/if_an.c projects/ifnet/sys/dev/ath/ath_dfs/null/dfs_null.c projects/ifnet/sys/dev/ath/ath_rate/sample/sample.c projects/ifnet/sys/dev/ath/if_ath.c projects/ifnet/sys/dev/ath/if_ath_beacon.c projects/ifnet/sys/dev/ath/if_ath_btcoex.c projects/ifnet/sys/dev/ath/if_ath_keycache.c projects/ifnet/sys/dev/ath/if_ath_lna_div.c projects/ifnet/sys/dev/ath/if_ath_rx.c projects/ifnet/sys/dev/ath/if_ath_rx_edma.c projects/ifnet/sys/dev/ath/if_ath_spectral.c projects/ifnet/sys/dev/ath/if_ath_sysctl.c projects/ifnet/sys/dev/ath/if_ath_tdma.c projects/ifnet/sys/dev/ath/if_ath_tx.c projects/ifnet/sys/dev/ath/if_ath_tx_edma.c projects/ifnet/sys/dev/bce/if_bce.c projects/ifnet/sys/dev/bce/if_bcereg.h projects/ifnet/sys/dev/bfe/if_bfe.c projects/ifnet/sys/dev/bge/if_bge.c projects/ifnet/sys/dev/bm/if_bm.c projects/ifnet/sys/dev/bwi/bwimac.c projects/ifnet/sys/dev/bwi/bwiphy.c projects/ifnet/sys/dev/bwi/bwirf.c projects/ifnet/sys/dev/bwi/if_bwi.c projects/ifnet/sys/dev/bwi/if_bwi_pci.c projects/ifnet/sys/dev/bwn/if_bwn.c projects/ifnet/sys/dev/cadence/if_cgem.c projects/ifnet/sys/dev/cas/if_cas.c projects/ifnet/sys/dev/ce/if_ce.c projects/ifnet/sys/dev/cesa/cesa.c projects/ifnet/sys/dev/cm/smc90cx6.c projects/ifnet/sys/dev/cp/if_cp.c projects/ifnet/sys/dev/cs/if_cs.c projects/ifnet/sys/dev/ctau/if_ct.c projects/ifnet/sys/dev/cx/if_cx.c projects/ifnet/sys/dev/cxgb/cxgb_adapter.h projects/ifnet/sys/dev/cxgb/cxgb_main.c projects/ifnet/sys/dev/cxgbe/adapter.h projects/ifnet/sys/dev/dc/dcphy.c projects/ifnet/sys/dev/dc/if_dc.c projects/ifnet/sys/dev/dc/pnphy.c projects/ifnet/sys/dev/de/if_de.c projects/ifnet/sys/dev/e1000/if_em.c projects/ifnet/sys/dev/e1000/if_igb.c projects/ifnet/sys/dev/e1000/if_lem.c projects/ifnet/sys/dev/ed/if_ed.c projects/ifnet/sys/dev/ed/if_ed_3c503.c projects/ifnet/sys/dev/ed/if_ed_hpp.c projects/ifnet/sys/dev/ed/if_ed_pccard.c projects/ifnet/sys/dev/ed/if_ed_rtl80x9.c projects/ifnet/sys/dev/en/if_en_pci.c projects/ifnet/sys/dev/en/midway.c projects/ifnet/sys/dev/ep/if_ep.c projects/ifnet/sys/dev/et/if_et.c projects/ifnet/sys/dev/ex/if_ex.c projects/ifnet/sys/dev/fatm/if_fatm.c projects/ifnet/sys/dev/fdt/fdt_common.c projects/ifnet/sys/dev/fdt/fdt_slicer.c projects/ifnet/sys/dev/fdt/fdtbus.c projects/ifnet/sys/dev/fe/if_fe.c projects/ifnet/sys/dev/fe/if_fe_pccard.c projects/ifnet/sys/dev/ffec/if_ffec.c projects/ifnet/sys/dev/firewire/if_fwe.c projects/ifnet/sys/dev/firewire/if_fwip.c projects/ifnet/sys/dev/fxp/if_fxp.c projects/ifnet/sys/dev/fxp/inphy.c projects/ifnet/sys/dev/gem/if_gem.c projects/ifnet/sys/dev/hatm/if_hatm.c projects/ifnet/sys/dev/hatm/if_hatm_intr.c projects/ifnet/sys/dev/hatm/if_hatm_ioctl.c projects/ifnet/sys/dev/hatm/if_hatm_rx.c projects/ifnet/sys/dev/hatm/if_hatm_tx.c projects/ifnet/sys/dev/hme/if_hme.c projects/ifnet/sys/dev/hme/if_hme_pci.c projects/ifnet/sys/dev/ic/ns16550.h projects/ifnet/sys/dev/ie/if_ie.c projects/ifnet/sys/dev/if_ndis/if_ndis.c projects/ifnet/sys/dev/if_ndis/if_ndis_pccard.c projects/ifnet/sys/dev/if_ndis/if_ndis_pci.c projects/ifnet/sys/dev/if_ndis/if_ndis_usb.c projects/ifnet/sys/dev/iicbus/if_ic.c projects/ifnet/sys/dev/ipw/if_ipw.c projects/ifnet/sys/dev/iscsi/icl.c projects/ifnet/sys/dev/iwi/if_iwi.c projects/ifnet/sys/dev/iwn/if_iwn.c projects/ifnet/sys/dev/iwn/if_iwnreg.h projects/ifnet/sys/dev/iwn/if_iwnvar.h projects/ifnet/sys/dev/ixgb/if_ixgb.h projects/ifnet/sys/dev/ixgbe/ixgbe.h projects/ifnet/sys/dev/ixgbe/ixv.h projects/ifnet/sys/dev/jme/if_jme.c projects/ifnet/sys/dev/le/lance.c projects/ifnet/sys/dev/lge/if_lge.c projects/ifnet/sys/dev/lmc/if_lmc.c projects/ifnet/sys/dev/malo/if_malo.c projects/ifnet/sys/dev/malo/if_malo_pci.c projects/ifnet/sys/dev/malo/if_malohal.c projects/ifnet/sys/dev/mge/if_mge.c projects/ifnet/sys/dev/mii/mii.c projects/ifnet/sys/dev/msk/if_msk.c projects/ifnet/sys/dev/mwl/if_mwl.c projects/ifnet/sys/dev/mwl/if_mwl_pci.c projects/ifnet/sys/dev/mxge/if_mxge.c projects/ifnet/sys/dev/my/if_my.c projects/ifnet/sys/dev/netmap/netmap.c projects/ifnet/sys/dev/nfe/if_nfe.c projects/ifnet/sys/dev/nge/if_nge.c projects/ifnet/sys/dev/nve/if_nve.c projects/ifnet/sys/dev/nxge/if_nxge.c projects/ifnet/sys/dev/oce/oce_if.h projects/ifnet/sys/dev/ofw/ofw_bus_subr.c projects/ifnet/sys/dev/ofw/ofw_bus_subr.h projects/ifnet/sys/dev/ofw/ofw_nexus.c projects/ifnet/sys/dev/patm/if_patm.c projects/ifnet/sys/dev/patm/if_patm_attach.c projects/ifnet/sys/dev/patm/if_patm_intr.c projects/ifnet/sys/dev/patm/if_patm_ioctl.c projects/ifnet/sys/dev/patm/if_patm_rx.c projects/ifnet/sys/dev/patm/if_patm_tx.c projects/ifnet/sys/dev/pci/pci.c projects/ifnet/sys/dev/pci/pci_private.h projects/ifnet/sys/dev/pci/pcireg.h projects/ifnet/sys/dev/pci/pcivar.h projects/ifnet/sys/dev/pcn/if_pcn.c projects/ifnet/sys/dev/pdq/if_fpa.c projects/ifnet/sys/dev/pdq/pdq_freebsd.h projects/ifnet/sys/dev/pdq/pdq_ifsubr.c projects/ifnet/sys/dev/ppbus/if_plip.c projects/ifnet/sys/dev/ral/rt2560.c projects/ifnet/sys/dev/ral/rt2661.c projects/ifnet/sys/dev/ral/rt2860.c projects/ifnet/sys/dev/re/if_re.c projects/ifnet/sys/dev/rt/if_rt.c projects/ifnet/sys/dev/sbni/if_sbni.c projects/ifnet/sys/dev/sf/if_sf.c projects/ifnet/sys/dev/sfxge/sfxge.c projects/ifnet/sys/dev/sfxge/sfxge.h projects/ifnet/sys/dev/sge/if_sge.c projects/ifnet/sys/dev/sis/if_sis.c projects/ifnet/sys/dev/sk/if_sk.c projects/ifnet/sys/dev/smc/if_smc.c projects/ifnet/sys/dev/sn/if_sn.c projects/ifnet/sys/dev/spibus/spibus.c projects/ifnet/sys/dev/spibus/spibusvar.h projects/ifnet/sys/dev/ste/if_ste.c projects/ifnet/sys/dev/stge/if_stge.c projects/ifnet/sys/dev/ti/if_ti.c projects/ifnet/sys/dev/tl/if_tl.c projects/ifnet/sys/dev/tsec/if_tsec.c projects/ifnet/sys/dev/tx/if_tx.c projects/ifnet/sys/dev/txp/if_txp.c projects/ifnet/sys/dev/uart/uart_cpu_fdt.c projects/ifnet/sys/dev/uart/uart_dev_ns8250.c projects/ifnet/sys/dev/usb/net/if_aue.c projects/ifnet/sys/dev/usb/net/if_axe.c projects/ifnet/sys/dev/usb/net/if_cdce.c projects/ifnet/sys/dev/usb/net/if_cue.c projects/ifnet/sys/dev/usb/net/if_kue.c projects/ifnet/sys/dev/usb/net/if_mos.c projects/ifnet/sys/dev/usb/net/if_rue.c projects/ifnet/sys/dev/usb/net/if_udav.c projects/ifnet/sys/dev/usb/net/if_usie.c projects/ifnet/sys/dev/usb/net/uhso.c projects/ifnet/sys/dev/usb/net/usb_ethernet.c projects/ifnet/sys/dev/usb/serial/u3g.c projects/ifnet/sys/dev/usb/usb_pf.c projects/ifnet/sys/dev/usb/usbdevs projects/ifnet/sys/dev/usb/wlan/if_rsu.c projects/ifnet/sys/dev/usb/wlan/if_rum.c projects/ifnet/sys/dev/usb/wlan/if_run.c projects/ifnet/sys/dev/usb/wlan/if_uath.c projects/ifnet/sys/dev/usb/wlan/if_upgt.c projects/ifnet/sys/dev/usb/wlan/if_ural.c projects/ifnet/sys/dev/usb/wlan/if_urtw.c projects/ifnet/sys/dev/usb/wlan/if_urtwn.c projects/ifnet/sys/dev/usb/wlan/if_zyd.c projects/ifnet/sys/dev/vge/if_vge.c projects/ifnet/sys/dev/virtio/network/if_vtnet.c projects/ifnet/sys/dev/vmware/vmxnet3/if_vmx.c projects/ifnet/sys/dev/vr/if_vr.c projects/ifnet/sys/dev/vte/if_vte.c projects/ifnet/sys/dev/vx/if_vx.c projects/ifnet/sys/dev/vx/if_vx_pci.c projects/ifnet/sys/dev/wb/if_wb.c projects/ifnet/sys/dev/wi/if_wi.c projects/ifnet/sys/dev/wi/if_wi_pccard.c projects/ifnet/sys/dev/wi/if_wi_pci.c projects/ifnet/sys/dev/wl/if_wl.c projects/ifnet/sys/dev/wpi/if_wpi.c projects/ifnet/sys/dev/xe/if_xe.c projects/ifnet/sys/dev/xl/if_xl.c projects/ifnet/sys/fs/nfs/nfsport.h projects/ifnet/sys/geom/geom_disk.c projects/ifnet/sys/geom/geom_disk.h projects/ifnet/sys/kern/kern_jail.c projects/ifnet/sys/kern/kern_poll.c projects/ifnet/sys/kern/sys_socket.c projects/ifnet/sys/net/bpf.c projects/ifnet/sys/net/bridgestp.c projects/ifnet/sys/net/ieee8023ad_lacp.c projects/ifnet/sys/net/if_arcsubr.c projects/ifnet/sys/net/if_atmsubr.c projects/ifnet/sys/net/if_clone.c projects/ifnet/sys/net/if_disc.c projects/ifnet/sys/net/if_edsc.c projects/ifnet/sys/net/if_ef.c projects/ifnet/sys/net/if_enc.c projects/ifnet/sys/net/if_epair.c projects/ifnet/sys/net/if_ethersubr.c projects/ifnet/sys/net/if_faith.c projects/ifnet/sys/net/if_fddisubr.c projects/ifnet/sys/net/if_fwsubr.c projects/ifnet/sys/net/if_gif.c projects/ifnet/sys/net/if_gre.c projects/ifnet/sys/net/if_iso88025subr.c projects/ifnet/sys/net/if_loop.c projects/ifnet/sys/net/if_mib.c projects/ifnet/sys/net/if_spppfr.c projects/ifnet/sys/net/if_spppsubr.c projects/ifnet/sys/net/if_stf.c projects/ifnet/sys/net/if_tap.c projects/ifnet/sys/net/if_tun.c projects/ifnet/sys/net/if_vlan.c projects/ifnet/sys/net/pfil.c projects/ifnet/sys/net/raw_cb.c projects/ifnet/sys/net/raw_usrreq.c projects/ifnet/sys/net/route.c projects/ifnet/sys/net/rtsock.c projects/ifnet/sys/net80211/ieee80211.c projects/ifnet/sys/net80211/ieee80211_action.c projects/ifnet/sys/net80211/ieee80211_adhoc.c projects/ifnet/sys/net80211/ieee80211_ageq.c projects/ifnet/sys/net80211/ieee80211_amrr.c projects/ifnet/sys/net80211/ieee80211_ddb.c projects/ifnet/sys/net80211/ieee80211_dfs.c projects/ifnet/sys/net80211/ieee80211_freebsd.c projects/ifnet/sys/net80211/ieee80211_hostap.c projects/ifnet/sys/net80211/ieee80211_ht.c projects/ifnet/sys/net80211/ieee80211_input.c projects/ifnet/sys/net80211/ieee80211_ioctl.c projects/ifnet/sys/net80211/ieee80211_mesh.c projects/ifnet/sys/net80211/ieee80211_monitor.c projects/ifnet/sys/net80211/ieee80211_node.c projects/ifnet/sys/net80211/ieee80211_output.c projects/ifnet/sys/net80211/ieee80211_power.c projects/ifnet/sys/net80211/ieee80211_proto.c projects/ifnet/sys/net80211/ieee80211_proto.h projects/ifnet/sys/net80211/ieee80211_radiotap.c projects/ifnet/sys/net80211/ieee80211_regdomain.c projects/ifnet/sys/net80211/ieee80211_scan.c projects/ifnet/sys/net80211/ieee80211_scan_sta.c projects/ifnet/sys/net80211/ieee80211_wds.c projects/ifnet/sys/netatalk/aarp.c projects/ifnet/sys/netatalk/at_control.c projects/ifnet/sys/netatalk/ddp_input.c projects/ifnet/sys/netatalk/ddp_output.c projects/ifnet/sys/netatalk/ddp_pcb.c projects/ifnet/sys/netatalk/ddp_usrreq.c projects/ifnet/sys/netgraph/netflow/netflow.c projects/ifnet/sys/netgraph/ng_bridge.c projects/ifnet/sys/netgraph/ng_cisco.c projects/ifnet/sys/netgraph/ng_eiface.c projects/ifnet/sys/netgraph/ng_fec.c projects/ifnet/sys/netgraph/ng_iface.c projects/ifnet/sys/netgraph/ng_ipfw.c projects/ifnet/sys/netgraph/ng_one2many.c projects/ifnet/sys/netgraph/ng_sppp.c projects/ifnet/sys/netinet/if_atm.c projects/ifnet/sys/netinet/if_ether.c projects/ifnet/sys/netinet/igmp.c projects/ifnet/sys/netinet/in_gif.c projects/ifnet/sys/netinet/in_mcast.c projects/ifnet/sys/netinet/in_pcb.c projects/ifnet/sys/netinet/in_proto.c projects/ifnet/sys/netinet/in_rmx.c projects/ifnet/sys/netinet/ip_carp.c projects/ifnet/sys/netinet/ip_divert.c projects/ifnet/sys/netinet/ip_gre.c projects/ifnet/sys/netinet/ip_icmp.c projects/ifnet/sys/netinet/ip_ipsec.c projects/ifnet/sys/netinet/ip_mroute.c projects/ifnet/sys/netinet/ip_output.c projects/ifnet/sys/netinet/raw_ip.c projects/ifnet/sys/netinet/tcp_hostcache.c projects/ifnet/sys/netinet/tcp_input.c projects/ifnet/sys/netinet/tcp_offload.c projects/ifnet/sys/netinet/tcp_reass.c projects/ifnet/sys/netinet/tcp_sack.c projects/ifnet/sys/netinet/tcp_subr.c projects/ifnet/sys/netinet/tcp_syncache.c projects/ifnet/sys/netinet/tcp_timewait.c projects/ifnet/sys/netinet/tcp_usrreq.c projects/ifnet/sys/netinet/udp_usrreq.c projects/ifnet/sys/netinet6/dest6.c projects/ifnet/sys/netinet6/frag6.c projects/ifnet/sys/netinet6/icmp6.c projects/ifnet/sys/netinet6/in6_gif.c projects/ifnet/sys/netinet6/in6_ifattach.c projects/ifnet/sys/netinet6/in6_mcast.c projects/ifnet/sys/netinet6/in6_pcb.c projects/ifnet/sys/netinet6/in6_proto.c projects/ifnet/sys/netinet6/in6_rmx.c projects/ifnet/sys/netinet6/in6_src.c projects/ifnet/sys/netinet6/ip6_forward.c projects/ifnet/sys/netinet6/ip6_input.c projects/ifnet/sys/netinet6/ip6_ipsec.c projects/ifnet/sys/netinet6/ip6_mroute.c projects/ifnet/sys/netinet6/ip6_output.c projects/ifnet/sys/netinet6/mld6.c projects/ifnet/sys/netinet6/nd6.c projects/ifnet/sys/netinet6/nd6_rtr.c projects/ifnet/sys/netinet6/raw_ip6.c projects/ifnet/sys/netinet6/route6.c projects/ifnet/sys/netinet6/scope6.c projects/ifnet/sys/netinet6/udp6_usrreq.c projects/ifnet/sys/netipsec/ipsec.c projects/ifnet/sys/netipsec/ipsec_input.c projects/ifnet/sys/netipsec/ipsec_output.c projects/ifnet/sys/netipsec/key.c projects/ifnet/sys/netipsec/xform_ipip.c projects/ifnet/sys/netipx/ipx.c projects/ifnet/sys/netipx/ipx_input.c projects/ifnet/sys/netipx/ipx_outputfl.c projects/ifnet/sys/netipx/ipx_pcb.c projects/ifnet/sys/netipx/ipx_usrreq.c projects/ifnet/sys/netnatm/natm.c projects/ifnet/sys/netnatm/natm_pcb.c projects/ifnet/sys/netpfil/ipfw/ip_fw2.c projects/ifnet/sys/netpfil/ipfw/ip_fw_dynamic.c projects/ifnet/sys/netpfil/ipfw/ip_fw_log.c projects/ifnet/sys/netpfil/ipfw/ip_fw_nat.c projects/ifnet/sys/netpfil/pf/if_pflog.c projects/ifnet/sys/netpfil/pf/if_pfsync.c projects/ifnet/sys/netpfil/pf/pf.c projects/ifnet/sys/netpfil/pf/pf_if.c projects/ifnet/sys/netpfil/pf/pf_ioctl.c projects/ifnet/sys/netpfil/pf/pf_lb.c projects/ifnet/sys/netpfil/pf/pf_osfp.c projects/ifnet/sys/nfs/bootp_subr.c projects/ifnet/sys/nfsclient/nfs_vfsops.c projects/ifnet/sys/nfsclient/nfs_vnops.c projects/ifnet/sys/nfsserver/nfs_srvkrpc.c projects/ifnet/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/ifnet/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h projects/ifnet/sys/ofed/include/linux/list.h projects/ifnet/sys/pci/if_rl.c projects/ifnet/sys/powerpc/aim/mmu_oea.c projects/ifnet/sys/powerpc/aim/mp_cpudep.c projects/ifnet/sys/powerpc/booke/pmap.c projects/ifnet/sys/powerpc/include/intr_machdep.h projects/ifnet/sys/powerpc/include/psl.h projects/ifnet/sys/powerpc/include/trap.h projects/ifnet/sys/powerpc/mpc85xx/atpic.c projects/ifnet/sys/powerpc/mpc85xx/fsl_sdhc.c projects/ifnet/sys/powerpc/ofw/openpic_ofw.c projects/ifnet/sys/powerpc/powermac/powermac_thermal.c projects/ifnet/sys/powerpc/powerpc/exec_machdep.c projects/ifnet/sys/powerpc/powerpc/genassym.c projects/ifnet/sys/powerpc/powerpc/intr_machdep.c projects/ifnet/sys/powerpc/powerpc/nexus.c projects/ifnet/sys/powerpc/powerpc/pic_if.m projects/ifnet/sys/powerpc/pseries/platform_chrp.c projects/ifnet/sys/security/mac_ifoff/mac_ifoff.c projects/ifnet/sys/sparc64/include/bus.h projects/ifnet/sys/sparc64/include/bus_private.h projects/ifnet/sys/sparc64/pci/fire.c projects/ifnet/sys/sparc64/pci/psycho.c projects/ifnet/sys/sparc64/pci/schizo.c projects/ifnet/sys/sparc64/sbus/sbus.c projects/ifnet/sys/sparc64/sparc64/bus_machdep.c projects/ifnet/sys/sys/sdt.h projects/ifnet/sys/x86/x86/io_apic.c projects/ifnet/usr.sbin/bhyve/ioapic.c projects/ifnet/usr.sbin/pkg/Makefile projects/ifnet/usr.sbin/pkg/config.c projects/ifnet/usr.sbin/pkg/config.h projects/ifnet/usr.sbin/pkg/pkg.c Directory Properties: projects/ifnet/ (props changed) projects/ifnet/contrib/llvm/ (props changed) projects/ifnet/contrib/llvm/tools/clang/ (props changed) projects/ifnet/contrib/subversion/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/boot/ (props changed) projects/ifnet/sys/cddl/contrib/opensolaris/ (props changed) projects/ifnet/sys/conf/ (props changed) projects/ifnet/usr.sbin/bhyve/ (props changed) Modified: projects/ifnet/Makefile.inc1 ============================================================================== --- projects/ifnet/Makefile.inc1 Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/Makefile.inc1 Sat Oct 26 18:03:36 2013 (r257177) @@ -58,6 +58,7 @@ # use that new version. And the new (dynamically-linked) /bin/sh # will expect to find appropriate libraries in /lib and /libexec. # +SRCDIR?= ${.CURDIR} .if defined(SUBDIR_OVERRIDE) SUBDIR= ${SUBDIR_OVERRIDE} .else @@ -84,6 +85,9 @@ SUBDIR+=secure SUBDIR+=share .endif SUBDIR+=sys usr.bin usr.sbin +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .if ${MK_OFED} != "no" SUBDIR+=contrib/ofed .endif @@ -128,10 +132,10 @@ OSRELDATE= 0 .endif .if !defined(VERSION) -REVISION!= make -C ${.CURDIR}/release -V REVISION -BRANCH!= make -C ${.CURDIR}/release -V BRANCH +REVISION!= make -C ${SRCDIR}/release -V REVISION +BRANCH!= make -C ${SRCDIR}/release -V BRANCH SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ - ${.CURDIR}/sys/sys/param.h + ${SRCDIR}/sys/sys/param.h VERSION= FreeBSD ${REVISION}-${BRANCH} ${TARGET_ARCH} ${SRCRELDATE} .endif @@ -488,6 +492,10 @@ _worldtmp: mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${WORLDTMP}/usr/lib >/dev/null .endif +.if ${MK_TESTS} != "no" + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ + -p ${WORLDTMP}${TESTSBASE} >/dev/null +.endif .for _mtree in ${LOCAL_MTREE} mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null .endfor Modified: projects/ifnet/ObsoleteFiles.inc ============================================================================== --- projects/ifnet/ObsoleteFiles.inc Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/ObsoleteFiles.inc Sat Oct 26 18:03:36 2013 (r257177) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20131023: remove never used iscsi directory +OLD_DIRS+=usr/share/examples/iscsi # 20131014: libbsdyml becomes private OLD_FILES+=usr/lib/libbsdyml.a OLD_FILES+=usr/lib/libbsdyml.so @@ -2491,6 +2493,7 @@ OLD_FILES+=usr/sbin/zfs OLD_FILES+=usr/sbin/zpool # 20070423: rc.bluetooth (examples) removed OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth +OLD_DIRS+=usr/share/examples/netgraph/bluetooth # 20070421: worm.4 removed OLD_FILES+=usr/share/man/man4/worm.4.gz # 20070417: trunk(4) renamed to lagg(4) Modified: projects/ifnet/UPDATING ============================================================================== --- projects/ifnet/UPDATING Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/UPDATING Sat Oct 26 18:03:36 2013 (r257177) @@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131025: + The default version of mtree is nmtree which is obtained from + NetBSD. The output is generally the same, but may vary + slightly. If you found you need identical output adding + "-F freebsd9" to the command line should do the trick. For the + time being, the old mtree is available as fmtree. + 20131014: libbsdyml has been renamed to libyaml and moved to /usr/lib/private. This will break ports-mgmt/pkg. Rebuild the port, or upgrade to pkg Modified: projects/ifnet/contrib/gperf/src/options.cc ============================================================================== --- projects/ifnet/contrib/gperf/src/options.cc Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/contrib/gperf/src/options.cc Sat Oct 26 18:03:36 2013 (r257177) @@ -281,7 +281,7 @@ Options::print_options () const { putchar (*arg); arg++; - if (*arg >= 'A' && *arg <= 'Z' || *arg >= 'a' && *arg <= 'z') + if ( (*arg >= 'A' && *arg <= 'Z') || (*arg >= 'a' && *arg <= 'z') ) { putchar (*arg); arg++; @@ -293,7 +293,9 @@ Options::print_options () const putchar (*arg); arg++; } - while (*arg >= 'A' && *arg <= 'Z' || *arg >= 'a' && *arg <= 'z' || *arg == '-'); + while ( (*arg >= 'A' && *arg <= 'Z') || + (*arg >= 'a' && *arg <= 'z') || + *arg == '-'); if (*arg == '=') { putchar (*arg); Modified: projects/ifnet/contrib/gperf/src/search.cc ============================================================================== --- projects/ifnet/contrib/gperf/src/search.cc Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/contrib/gperf/src/search.cc Sat Oct 26 18:03:36 2013 (r257177) @@ -36,7 +36,10 @@ /* ============================== Portability ============================== */ /* Assume ISO C++ 'for' scoping rule. */ -#define for if (0) ; else for +/* This code is used to work around scoping issues with visual studio 6 from + * 1998. Comment it out here to queisce numerous -Wdangling-else warnings + * from clang. +#define for if (0) ; else for */ /* Dynamically allocated array with dynamic extent: Modified: projects/ifnet/contrib/llvm/tools/clang/tools/driver/driver.cpp ============================================================================== --- projects/ifnet/contrib/llvm/tools/clang/tools/driver/driver.cpp Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/contrib/llvm/tools/clang/tools/driver/driver.cpp Sat Oct 26 18:03:36 2013 (r257177) @@ -284,11 +284,13 @@ static void ParseProgName(SmallVectorImp } suffixes [] = { { "clang", false, false }, { "clang++", true, false }, + { "clang-CC", true, false }, { "clang-c++", true, false }, { "clang-cc", false, false }, { "clang-cpp", false, true }, { "clang-g++", true, false }, { "clang-gcc", false, false }, + { "CC", true, false }, { "cc", false, false }, { "cpp", false, true }, { "++", true, false }, Modified: projects/ifnet/contrib/subversion/subversion/libsvn_subr/opt.c ============================================================================== --- projects/ifnet/contrib/subversion/subversion/libsvn_subr/opt.c Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/contrib/subversion/subversion/libsvn_subr/opt.c Sat Oct 26 18:03:36 2013 (r257177) @@ -1115,10 +1115,8 @@ svn_opt__print_version_info(const char * return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER); SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n" - " compiled %s, %s on %s\n\n"), + " compiled on %s\n\n"), pgm_name, SVN_VERSION, - svn_version_ext_build_date(info), - svn_version_ext_build_time(info), svn_version_ext_build_host(info))); SVN_ERR(svn_cmdline_printf(pool, "%s\n", svn_version_ext_copyright(info))); Modified: projects/ifnet/contrib/subversion/subversion/libsvn_subr/version.c ============================================================================== --- projects/ifnet/contrib/subversion/subversion/libsvn_subr/version.c Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/contrib/subversion/subversion/libsvn_subr/version.c Sat Oct 26 18:03:36 2013 (r257177) @@ -125,8 +125,8 @@ svn_version_extended(svn_boolean_t verbo { svn_version_extended_t *info = apr_pcalloc(pool, sizeof(*info)); - info->build_date = __DATE__; - info->build_time = __TIME__; + info->build_date = NULL; + info->build_time = NULL; info->build_host = SVN_BUILD_HOST; info->copyright = apr_pstrdup (pool, _("Copyright (C) 2013 The Apache Software Foundation.\n" Modified: projects/ifnet/etc/Makefile ============================================================================== --- projects/ifnet/etc/Makefile Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/etc/Makefile Sat Oct 26 18:03:36 2013 (r257177) @@ -139,6 +139,9 @@ BIN1+= regdomain.xml BIN2= netstart pccard_ether rc.suspend rc.resume MTREE= BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist +.if ${MK_TESTS} != "no" +MTREE+= BSD.tests.dist +.endif .if ${MK_SENDMAIL} != "no" MTREE+= BSD.sendmail.dist .endif @@ -221,7 +224,11 @@ distribution: ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install ${_+_}cd ${.CURDIR}/devd; ${MAKE} install ${_+_}cd ${.CURDIR}/gss; ${MAKE} install + ${_+_}cd ${.CURDIR}/keys; ${MAKE} install ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install +.if ${MK_PKGBOOTSTRAP} != "no" + ${_+_}cd ${.CURDIR}/pkg; ${MAKE} install +.endif ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install ${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall ${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap @@ -314,6 +321,9 @@ MTREES+= mtree/BSD.debug.dist /usr/lib .if ${MK_GROFF} != "no" MTREES+= mtree/BSD.groff.dist /usr .endif +.if ${MK_TESTS} != "no" +MTREES+= mtree/BSD.tests.dist ${TESTSBASE} +.endif .if ${MK_SENDMAIL} != "no" MTREES+= mtree/BSD.sendmail.dist / .endif Modified: projects/ifnet/etc/mtree/BSD.root.dist ============================================================================== --- projects/ifnet/etc/mtree/BSD.root.dist Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/etc/mtree/BSD.root.dist Sat Oct 26 18:03:36 2013 (r257177) @@ -34,6 +34,14 @@ .. gss .. + keys + pkg + revoked + .. + trusted + .. + .. + .. mail .. mtree @@ -52,6 +60,8 @@ weekly .. .. + pkg + .. ppp .. rc.d Copied: projects/ifnet/etc/mtree/BSD.tests.dist (from r257176, head/etc/mtree/BSD.tests.dist) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/etc/mtree/BSD.tests.dist Sat Oct 26 18:03:36 2013 (r257177, copy of r257176, head/etc/mtree/BSD.tests.dist) @@ -0,0 +1,12 @@ +# $FreeBSD$ +# +# Please see the file src/etc/mtree/README before making changes to this file. +# + +/set type=dir uname=root gname=wheel mode=0755 +. + lib + libcrypt + .. + .. +.. Modified: projects/ifnet/etc/mtree/BSD.usr.dist ============================================================================== --- projects/ifnet/etc/mtree/BSD.usr.dist Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/etc/mtree/BSD.usr.dist Sat Oct 26 18:03:36 2013 (r257177) @@ -325,8 +325,6 @@ .. ipfw .. - iscsi - .. jails .. kld @@ -360,8 +358,6 @@ mdoc .. netgraph - bluetooth - .. .. pc-sysinstall .. Modified: projects/ifnet/lib/libcrypt/Makefile ============================================================================== --- projects/ifnet/lib/libcrypt/Makefile Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/lib/libcrypt/Makefile Sat Oct 26 18:03:36 2013 (r257177) @@ -37,4 +37,9 @@ WARNS?= 2 PRECIOUSLIB= +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include +.include Modified: projects/ifnet/lib/libcrypt/tests/Makefile ============================================================================== --- projects/ifnet/lib/libcrypt/tests/Makefile Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/lib/libcrypt/tests/Makefile Sat Oct 26 18:03:36 2013 (r257177) @@ -2,6 +2,8 @@ # exercise libcrypt +TESTSDIR= ${TESTSBASE}/lib/libcrypt + ATF_TESTS_C= crypt_tests CFLAGS+= -I${.CURDIR:H} Modified: projects/ifnet/sbin/hastctl/hastctl.c ============================================================================== --- projects/ifnet/sbin/hastctl/hastctl.c Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/sbin/hastctl/hastctl.c Sat Oct 26 18:03:36 2013 (r257177) @@ -355,6 +355,13 @@ control_list(struct nv *nv) (uintmax_t)nv_get_uint64(nv, "stat_write_error%u", ii), (uintmax_t)nv_get_uint64(nv, "stat_delete_error%u", ii), (uintmax_t)nv_get_uint64(nv, "stat_flush_error%u", ii)); + printf(" queues: " + "local: %ju, send: %ju, recv: %ju, done: %ju, idle: %ju\n", + (uintmax_t)nv_get_uint64(nv, "local_queue_size%u", ii), + (uintmax_t)nv_get_uint64(nv, "send_queue_size%u", ii), + (uintmax_t)nv_get_uint64(nv, "recv_queue_size%u", ii), + (uintmax_t)nv_get_uint64(nv, "done_queue_size%u", ii), + (uintmax_t)nv_get_uint64(nv, "idle_queue_size%u", ii)); } return (ret); } Modified: projects/ifnet/sbin/hastd/control.c ============================================================================== --- projects/ifnet/sbin/hastd/control.c Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/sbin/hastd/control.c Sat Oct 26 18:03:36 2013 (r257177) @@ -215,6 +215,16 @@ control_status_worker(struct hast_resour "stat_delete_error%u", no); nv_add_uint64(nvout, nv_get_uint64(cnvin, "stat_flush_error"), "stat_flush_error%u", no); + nv_add_uint64(nvout, nv_get_uint64(cnvin, "idle_queue_size"), + "idle_queue_size%u", no); + nv_add_uint64(nvout, nv_get_uint64(cnvin, "local_queue_size"), + "local_queue_size%u", no); + nv_add_uint64(nvout, nv_get_uint64(cnvin, "send_queue_size"), + "send_queue_size%u", no); + nv_add_uint64(nvout, nv_get_uint64(cnvin, "recv_queue_size"), + "recv_queue_size%u", no); + nv_add_uint64(nvout, nv_get_uint64(cnvin, "done_queue_size"), + "done_queue_size%u", no); end: if (cnvin != NULL) nv_free(cnvin); @@ -478,6 +488,7 @@ ctrl_thread(void *arg) nv_add_uint64(nvout, res->hr_stat_flush_error + res->hr_stat_activemap_flush_error, "stat_flush_error"); + res->output_status_aux(nvout); nv_add_int16(nvout, 0, "error"); break; case CONTROL_RELOAD: Modified: projects/ifnet/sbin/hastd/hast.h ============================================================================== --- projects/ifnet/sbin/hastd/hast.h Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/sbin/hastd/hast.h Sat Oct 26 18:03:36 2013 (r257177) @@ -137,6 +137,8 @@ struct hastd_config { #define HAST_CHECKSUM_CRC32 1 #define HAST_CHECKSUM_SHA256 2 +struct nv; + /* * Structure that describes single resource. */ @@ -254,6 +256,9 @@ struct hast_resource { /* Number of activemap flush errors. */ uint64_t hr_stat_activemap_flush_error; + /* Function to output worker specific info on control status request. */ + void (*output_status_aux)(struct nv *); + /* Next resource. */ TAILQ_ENTRY(hast_resource) hr_next; }; Modified: projects/ifnet/sbin/hastd/primary.c ============================================================================== --- projects/ifnet/sbin/hastd/primary.c Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/sbin/hastd/primary.c Sat Oct 26 18:03:36 2013 (r257177) @@ -108,6 +108,7 @@ struct hio { * until some in-progress requests are freed. */ static TAILQ_HEAD(, hio) hio_free_list; +static size_t hio_free_list_size; static pthread_mutex_t hio_free_list_lock; static pthread_cond_t hio_free_list_cond; /* @@ -116,20 +117,26 @@ static pthread_cond_t hio_free_list_cond * responsible for managing his own send list. */ static TAILQ_HEAD(, hio) *hio_send_list; +static size_t *hio_send_list_size; static pthread_mutex_t *hio_send_list_lock; static pthread_cond_t *hio_send_list_cond; +#define hio_send_local_list_size hio_send_list_size[0] +#define hio_send_remote_list_size hio_send_list_size[1] /* * There is one recv list for every component, although local components don't * use recv lists as local requests are done synchronously. */ static TAILQ_HEAD(, hio) *hio_recv_list; +static size_t *hio_recv_list_size; static pthread_mutex_t *hio_recv_list_lock; static pthread_cond_t *hio_recv_list_cond; +#define hio_recv_remote_list_size hio_recv_list_size[1] /* * Request is placed on done list by the slowest component (the one that * decreased hio_countdown from 1 to 0). */ static TAILQ_HEAD(, hio) hio_done_list; +static size_t hio_done_list_size; static pthread_mutex_t hio_done_list_lock; static pthread_cond_t hio_done_list_cond; /* @@ -170,6 +177,7 @@ static pthread_mutex_t metadata_lock; _wakeup = TAILQ_EMPTY(&hio_##name##_list[(ncomp)]); \ TAILQ_INSERT_TAIL(&hio_##name##_list[(ncomp)], (hio), \ hio_next[(ncomp)]); \ + hio_##name##_list_size[(ncomp)]++; \ mtx_unlock(&hio_##name##_list_lock[ncomp]); \ if (_wakeup) \ cv_broadcast(&hio_##name##_list_cond[(ncomp)]); \ @@ -180,6 +188,7 @@ static pthread_mutex_t metadata_lock; mtx_lock(&hio_##name##_list_lock); \ _wakeup = TAILQ_EMPTY(&hio_##name##_list); \ TAILQ_INSERT_TAIL(&hio_##name##_list, (hio), hio_##name##_next);\ + hio_##name##_list_size++; \ mtx_unlock(&hio_##name##_list_lock); \ if (_wakeup) \ cv_broadcast(&hio_##name##_list_cond); \ @@ -196,6 +205,8 @@ static pthread_mutex_t metadata_lock; _last = true; \ } \ if (hio != NULL) { \ + PJDLOG_ASSERT(hio_##name##_list_size[(ncomp)] != 0); \ + hio_##name##_list_size[(ncomp)]--; \ TAILQ_REMOVE(&hio_##name##_list[(ncomp)], (hio), \ hio_next[(ncomp)]); \ } \ @@ -207,6 +218,8 @@ static pthread_mutex_t metadata_lock; cv_wait(&hio_##name##_list_cond, \ &hio_##name##_list_lock); \ } \ + PJDLOG_ASSERT(hio_##name##_list_size != 0); \ + hio_##name##_list_size--; \ TAILQ_REMOVE(&hio_##name##_list, (hio), hio_##name##_next); \ mtx_unlock(&hio_##name##_list_lock); \ } while (0) @@ -239,6 +252,22 @@ static void *sync_thread(void *arg); static void *guard_thread(void *arg); static void +output_status_aux(struct nv *nvout) +{ + + nv_add_uint64(nvout, (uint64_t)hio_free_list_size, + "idle_queue_size"); + nv_add_uint64(nvout, (uint64_t)hio_send_local_list_size, + "local_queue_size"); + nv_add_uint64(nvout, (uint64_t)hio_send_remote_list_size, + "send_queue_size"); + nv_add_uint64(nvout, (uint64_t)hio_recv_remote_list_size, + "recv_queue_size"); + nv_add_uint64(nvout, (uint64_t)hio_done_list_size, + "done_queue_size"); +} + +static void cleanup(struct hast_resource *res) { int rerrno; @@ -355,6 +384,12 @@ init_environment(struct hast_resource *r "Unable to allocate %zu bytes of memory for send lists.", sizeof(hio_send_list[0]) * ncomps); } + hio_send_list_size = malloc(sizeof(hio_send_list_size[0]) * ncomps); + if (hio_send_list_size == NULL) { + primary_exitx(EX_TEMPFAIL, + "Unable to allocate %zu bytes of memory for send list counters.", + sizeof(hio_send_list_size[0]) * ncomps); + } hio_send_list_lock = malloc(sizeof(hio_send_list_lock[0]) * ncomps); if (hio_send_list_lock == NULL) { primary_exitx(EX_TEMPFAIL, @@ -373,6 +408,12 @@ init_environment(struct hast_resource *r "Unable to allocate %zu bytes of memory for recv lists.", sizeof(hio_recv_list[0]) * ncomps); } + hio_recv_list_size = malloc(sizeof(hio_recv_list_size[0]) * ncomps); + if (hio_recv_list_size == NULL) { + primary_exitx(EX_TEMPFAIL, + "Unable to allocate %zu bytes of memory for recv list counters.", + sizeof(hio_recv_list_size[0]) * ncomps); + } hio_recv_list_lock = malloc(sizeof(hio_recv_list_lock[0]) * ncomps); if (hio_recv_list_lock == NULL) { primary_exitx(EX_TEMPFAIL, @@ -393,16 +434,18 @@ init_environment(struct hast_resource *r } /* - * Initialize lists, their locks and theirs condition variables. + * Initialize lists, their counters, locks and condition variables. */ TAILQ_INIT(&hio_free_list); mtx_init(&hio_free_list_lock); cv_init(&hio_free_list_cond); for (ii = 0; ii < HAST_NCOMPONENTS; ii++) { TAILQ_INIT(&hio_send_list[ii]); + hio_send_list_size[ii] = 0; mtx_init(&hio_send_list_lock[ii]); cv_init(&hio_send_list_cond[ii]); TAILQ_INIT(&hio_recv_list[ii]); + hio_recv_list_size[ii] = 0; mtx_init(&hio_recv_list_lock[ii]); cv_init(&hio_recv_list_cond[ii]); rw_init(&hio_remote_lock[ii]); @@ -445,6 +488,7 @@ init_environment(struct hast_resource *r hio->hio_ggio.gctl_length = MAXPHYS; hio->hio_ggio.gctl_error = 0; TAILQ_INSERT_HEAD(&hio_free_list, hio, hio_free_next); + hio_free_list_size++; } } @@ -781,6 +825,7 @@ init_remote(struct hast_resource *res, s free(map); goto close; } + mtx_lock(&res->hr_amp_lock); /* * Merge local and remote bitmaps. */ @@ -790,7 +835,6 @@ init_remote(struct hast_resource *res, s * Now that we merged bitmaps from both nodes, flush it to the * disk before we start to synchronize. */ - mtx_lock(&res->hr_amp_lock); (void)hast_activemap_flush(res); } nv_free(nvin); @@ -963,6 +1007,7 @@ hastd_primary(struct hast_resource *res) } gres = res; + res->output_status_aux = output_status_aux; mode = pjdlog_mode_get(); debuglevel = pjdlog_debug_get(); @@ -1617,6 +1662,7 @@ remote_send_thread(void *arg) mtx_lock(&hio_recv_list_lock[ncomp]); wakeup = TAILQ_EMPTY(&hio_recv_list[ncomp]); TAILQ_INSERT_TAIL(&hio_recv_list[ncomp], hio, hio_next[ncomp]); + hio_recv_list_size[ncomp]++; mtx_unlock(&hio_recv_list_lock[ncomp]); if (hast_proto_send(res, res->hr_remoteout, nv, data, data != NULL ? length : 0) == -1) { @@ -1635,6 +1681,7 @@ remote_send_thread(void *arg) mtx_lock(&hio_recv_list_lock[ncomp]); TAILQ_REMOVE(&hio_recv_list[ncomp], hio, hio_next[ncomp]); + hio_recv_list_size[ncomp]--; mtx_unlock(&hio_recv_list_lock[ncomp]); goto done_queue; } @@ -1719,6 +1766,7 @@ remote_recv_thread(void *arg) PJDLOG_ASSERT(hio != NULL); TAILQ_REMOVE(&hio_recv_list[ncomp], hio, hio_next[ncomp]); + hio_recv_list_size[ncomp]--; mtx_unlock(&hio_recv_list_lock[ncomp]); goto done_queue; } @@ -1742,6 +1790,7 @@ remote_recv_thread(void *arg) if (hio->hio_ggio.gctl_seq == seq) { TAILQ_REMOVE(&hio_recv_list[ncomp], hio, hio_next[ncomp]); + hio_recv_list_size[ncomp]--; break; } } @@ -1838,6 +1887,7 @@ done_queue: mtx_lock(&hio_recv_list_lock[ncomp]); TAILQ_INSERT_TAIL(&hio_recv_list[ncomp], hio, hio_next[ncomp]); + hio_recv_list_size[ncomp]++; mtx_unlock(&hio_recv_list_lock[ncomp]); } else { /* @@ -1860,6 +1910,7 @@ done_queue: mtx_lock(&hio_recv_list_lock[ncomp]); TAILQ_INSERT_TAIL(&hio_recv_list[ncomp], hio, hio_next[ncomp]); + hio_recv_list_size[ncomp]++; mtx_unlock(&hio_recv_list_lock[ncomp]); continue; default: Modified: projects/ifnet/sbin/hastd/secondary.c ============================================================================== --- projects/ifnet/sbin/hastd/secondary.c Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/sbin/hastd/secondary.c Sat Oct 26 18:03:36 2013 (r257177) @@ -82,18 +82,21 @@ static struct hast_resource *gres; * until some in-progress requests are freed. */ static TAILQ_HEAD(, hio) hio_free_list; +static size_t hio_free_list_size; static pthread_mutex_t hio_free_list_lock; static pthread_cond_t hio_free_list_cond; /* * Disk thread (the one that does I/O requests) takes requests from this list. */ static TAILQ_HEAD(, hio) hio_disk_list; +static size_t hio_disk_list_size; static pthread_mutex_t hio_disk_list_lock; static pthread_cond_t hio_disk_list_cond; /* * Thread that sends requests back to primary takes requests from this list. */ static TAILQ_HEAD(, hio) hio_send_list; +static size_t hio_send_list_size; static pthread_mutex_t hio_send_list_lock; static pthread_cond_t hio_send_list_cond; @@ -112,6 +115,7 @@ static void *send_thread(void *arg); mtx_lock(&hio_##name##_list_lock); \ _wakeup = TAILQ_EMPTY(&hio_##name##_list); \ TAILQ_INSERT_TAIL(&hio_##name##_list, (hio), hio_next); \ + hio_##name##_list_size++; \ mtx_unlock(&hio_##name##_list_lock); \ if (_wakeup) \ cv_broadcast(&hio_##name##_list_cond); \ @@ -122,11 +126,22 @@ static void *send_thread(void *arg); cv_wait(&hio_##name##_list_cond, \ &hio_##name##_list_lock); \ } \ + PJDLOG_ASSERT(hio_##name##_list_size != 0); \ + hio_##name##_list_size--; \ TAILQ_REMOVE(&hio_##name##_list, (hio), hio_next); \ mtx_unlock(&hio_##name##_list_lock); \ } while (0) static void +output_status_aux(struct nv *nvout) +{ + + nv_add_uint64(nvout, (uint64_t)hio_free_list_size, "idle_queue_size"); + nv_add_uint64(nvout, (uint64_t)hio_disk_list_size, "local_queue_size"); + nv_add_uint64(nvout, (uint64_t)hio_send_list_size, "send_queue_size"); +} + +static void hio_clear(struct hio *hio) { @@ -190,6 +205,7 @@ init_environment(void) } hio_clear(hio); TAILQ_INSERT_HEAD(&hio_free_list, hio, hio_next); + hio_free_list_size++; } } @@ -441,6 +457,7 @@ hastd_secondary(struct hast_resource *re } gres = res; + res->output_status_aux = output_status_aux; mode = pjdlog_mode_get(); debuglevel = pjdlog_debug_get(); Modified: projects/ifnet/sbin/mdconfig/mdconfig.8 ============================================================================== --- projects/ifnet/sbin/mdconfig/mdconfig.8 Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/sbin/mdconfig/mdconfig.8 Sat Oct 26 18:03:36 2013 (r257177) @@ -89,6 +89,9 @@ Options indicate an action to be perform Attach a memory disk. This will configure and attach a memory disk with the parameters specified and attach it to the system. +If the +.Fl u Ar unit +option is not provided, the newly created device name will be printed on stdout. .It Fl d Detach a memory disk from the system and release all resources. .It Fl r @@ -209,9 +212,12 @@ that might adversely affect the system. Enable/disable readonly mode. .El .It Fl u Ar unit -Request a specific unit number for the +Request a specific unit number or device name for the .Xr md 4 device instead of automatic allocation. +If a device name is specified, it must be start with +.Dq md +followed by the unit number. .El .Pp The last form, @@ -237,19 +243,19 @@ with .Pa /tmp/boot.flp as backing storage: .Pp -.Dl mdconfig -a -t vnode -f /tmp/boot.flp -u 4 +.Dl mdconfig -a -t vnode -f /tmp/boot.flp -u md4 .Pp Detach and free all resources used by .Pa /dev/md4 : .Pp -.Dl mdconfig -d -u 4 +.Dl mdconfig -d -u md4 .Pp Create a 128MByte swap backed disk, initialize an .Xr ffs 7 file system on it, and mount it on .Pa /tmp : .Bd -literal -offset indent -mdconfig -a -t swap -s 128M -u 10 +mdconfig -a -t swap -s 128M -u md10 newfs -U /dev/md10 mount /dev/md10 /tmp chmod 1777 /tmp @@ -263,7 +269,7 @@ are implied .Pc : .Bd -literal -offset indent dd if=/dev/zero of=somebackingfile bs=1k count=5k -mdconfig -f somebackingfile -u 0 +mdconfig -f somebackingfile -u md0 bsdlabel -w md0 auto newfs md0c mount /dev/md0c /mnt @@ -290,7 +296,7 @@ is used to skip over the header informat .Pa md1.nop to the start of the filesystem in the image. .Bd -literal -offset indent -mdconfig -f diskimage.img -u 1 +mdconfig -f diskimage.img -u md1 gnop create -o 512K md1 mount /dev/md1.nop /mnt .Ed Modified: projects/ifnet/share/man/man5/src.conf.5 ============================================================================== --- projects/ifnet/share/man/man5/src.conf.5 Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/share/man/man5/src.conf.5 Sat Oct 26 18:03:36 2013 (r257177) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\" $FreeBSD$ -.Dd October 6, 2013 +.Dd October 25, 2013 .Dt SRC.CONF 5 .Os .Sh NAME @@ -208,10 +208,6 @@ When set, it also enforces the following .Va WITHOUT_CLANG_EXTRAS .It .Va WITHOUT_CLANG_FULL -.It -.Va WITHOUT_CLANG_IS_CC -.It -.Va WITHOUT_LLDB .El .It Va WITH_CLANG .\" from FreeBSD: head/tools/build/options/WITH_CLANG 221730 2011-05-10 11:14:40Z ru @@ -323,11 +319,7 @@ When set, it also enforces the following .It .Va WITHOUT_CLANG_FULL .It -.Va WITHOUT_CLANG_IS_CC -.It .Va WITHOUT_GROFF -.It -.Va WITHOUT_LLDB .El .It Va WITH_DEBUG_FILES .\" from FreeBSD: head/tools/build/options/WITH_DEBUG_FILES 251512 2013-06-07 21:40:02Z emaste @@ -772,14 +764,14 @@ Set to not build NLS catalogs. .\" from FreeBSD: head/tools/build/options/WITHOUT_NLS_CATALOGS 156932 2006-03-21 07:50:50Z ru Set to not build NLS catalog support for .Xr csh 1 . -.It Va WITH_NMTREE -.\" from FreeBSD: head/tools/build/options/WITH_NMTREE 245435 2013-01-14 20:38:32Z brooks +.It Va WITHOUT_NMTREE +.\" from FreeBSD: head/tools/build/options/WITHOUT_NMTREE 257138 2013-10-25 22:45:18Z brooks Set to install -.Xr nmtree 8 +.Xr fmtree 8 as .Xr mtree 8 . By default -.Xr fmtree 8 +.Xr nmtree 8 is installed as .Xr mtree 8 . .It Va WITHOUT_NS_CACHING @@ -910,7 +902,7 @@ This includes .Xr rsh 1 , etc. .It Va WITHOUT_RCS -.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 156932 2006-03-21 07:50:50Z ru +.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 256198 2013-10-09 17:07:20Z gjb Set to not build .Xr rcs 1 and related utilities. @@ -1030,13 +1022,9 @@ When set, it also enforces the following .It .Va WITHOUT_CLANG_FULL .It -.Va WITHOUT_CLANG_IS_CC -.It .Va WITHOUT_GCC .It .Va WITHOUT_GDB -.It -.Va WITHOUT_LLDB .El .It Va WITHOUT_UNBOUND .\" from FreeBSD: head/tools/build/options/WITHOUT_UNBOUND 255597 2013-09-15 14:51:23Z des Modified: projects/ifnet/share/man/man7/Makefile ============================================================================== --- projects/ifnet/share/man/man7/Makefile Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/share/man/man7/Makefile Sat Oct 26 18:03:36 2013 (r257177) @@ -29,6 +29,10 @@ MAN= adding_user.7 \ sticky.7 \ tuning.7 +.if ${MK_TESTS} != "no" +MAN+= tests.7 +.endif + MLINKS= intro.7 miscellaneous.7 MLINKS+= security.7 securelevel.7 MLINKS+= c99.7 c.7 Modified: projects/ifnet/share/man/man7/hier.7 ============================================================================== --- projects/ifnet/share/man/man7/hier.7 Sat Oct 26 17:58:36 2013 (r257176) +++ projects/ifnet/share/man/man7/hier.7 Sat Oct 26 18:03:36 2013 (r257177) @@ -32,7 +32,7 @@ .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd January 21, 2010 +.Dd October 23, 2013 .Dt HIER 7 .Os .Sh NAME @@ -94,6 +94,15 @@ bluetooth configuration files gnats configuration files; see .Xr send-pr 1 +.It Pa keys/ +known trusted and revoked keys. +.Pp +.Bl -tag -width ".Pa keys/pkg/" -compact +.It Pa keys/pkg/ +fingerprints for +.Xr pkg 8 +.El +.Pp .It Pa localtime local timezone information; see @@ -692,6 +701,12 @@ source code for files in source code for files in .Pa /usr/sbin .El +.Pp +.It Pa tests/ +The +.Fx +test suite. +See tests(7) for more details. .El .It Pa /var/ multi-purpose log, temporary, transient, and spool files @@ -720,6 +735,14 @@ directory containing output spool files .Pp .It Pa backups/ miscellaneous backup files +.It Pa cache/ +miscellaneous cached files +.Bl -tag -width ".Pa pkg/" -compact +.It Pa pkg/ +cached packages for +.Xr pkg 8 +.El +.Pp .It Pa crash/ default directory to store kernel crash dumps; see .Xr crash 8 Copied: projects/ifnet/share/man/man7/tests.7 (from r257176, head/share/man/man7/tests.7) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/share/man/man7/tests.7 Sat Oct 26 18:03:36 2013 (r257177, copy of r257176, head/share/man/man7/tests.7) @@ -0,0 +1,199 @@ +.\" $FreeBSD$ +.\" $NetBSD: tests.kyua.7,v 1.2 2013/07/20 21:39:59 wiz Exp $ +.\" +.\" Copyright (c) 2010 The NetBSD Foundation, Inc. +.\" 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 NETBSD FOUNDATION, INC. AND +.\" CONTRIBUTORS ``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 FOUNDATION OR CONTRIBUTORS 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. +.\" +.Dd October 19, 2013 +.Dt TESTS 7 +.Os +.Sh NAME +.Nm tests +.Nd introduction to the FreeBSD test suite +.Sh DESCRIPTION +The +.Fx +test suite provides a collection of automated tests for two major purposes. +On the one hand, the test suite aids +.Em developers +in catching bugs and regressions in the code when they performing modifications +to the source tree. +On the other hand, the test suite allows +.Em end users +(and, in particular, system administrators) to verify that fresh installations +of the +.Fx +operating system behave correctly in their hardware platform and also to ensure +that the system does not suffer from regressions during regular system +operation and maintenance. +.Pp +The +.Fx +test suite is installed under the +.Pa /usr/tests +hierarchy. +.Pp +This manual page describes how to execute the test suite and how to configure +some of its optional features. +.Ss When to run the tests? +Before diving into the details of how to run the test suite, here are some +scenarios in which you should be running them: +.Bl -bullet -offset indent +.It +After a fresh installation of +.Fx +to ensure that the system works correctly on your hardware platform. +.It +After an upgrade of +.Fx +to a different version to ensure that the new code works well on your +hardware platform and that the upgrade did not introduce regressions in your +configuration. +.It +After performing changes to the source tree to catch any bugs and/or regressions +introduced by the modifications. +.It +Periodically, maybe from a +.Xr cron 8 +job, to ensure that any changes to the system (such as the installation of +third-party packages or manual modifications to configuration files) do not +introduce unexpected failures. +.El +.Ss Running the tests +First of all, you will need to install the +.Sq ports/devel/kyua +package. +.Pp +Use the following command to run the whole test suite: +.Bd -literal -offset indent +$ kyua test -k /usr/tests/Kyuafile +.Ed +.Pp +The above will go through all test programs in +.Pa /usr/tests +recursively, execute them, store their results and debugging data in Kyua +database (by default in +.Pa ~/.kyua/store.db ) , +and print a summary of the results. +This summary includes a brief count of all total tests run and how many of +them failed. +.Pp +It is possible to restrict which tests to run by providing their names in +the command line. +For example, this would execute the tests for the +.Xr cp 1 +and +.Xr cut 1 +utilities: +.Bd -literal -offset indent +$ kyua test -k /usr/tests/Kyuafile bin/cp usr.bin/cut +.Ed +.Ss Obtaining reports of the tests execution +Additional information of the results of the execution can be later extracted +from the database by using the various reporting commands of Kyua. +For example, the following would extract a plain-text report of the executed +tests and show which ones failed: +.Bd -literal -offset indent +$ kyua report +.Ed +.Pp +This other example would generate an HTML report ready to be published on a +web server: +.Bd -literal -offset indent +$ kyua report-html --output ~/public_html/tests +.Ed +.Pp +For further details on the command-line interface of Kyua, please refer +to its manual page +.Xr kyua 1 . +.\".Ss Configuring the tests +.\"Some test cases in the +.\".Fx +.\"test suite require the administrator to manually set up some configuration +.\"properties before they can run. +.\"Unless these properties are defined, the tests that require them will be marked +.\"as skipped and thus they will not be really executed. +.\".Pp +.\"Test suites are configured by defining the values to their configuration +.\"variables in +.\".Pa /usr/local/etc/kyua/kyua.conf . +.\"The format of this file is detailed in +.\".Xr kyua.conf 5 . +.\".Pp +.\"The following configuration variables are available in the +.\".Fx +.\"test suite: +.\".Bl -tag +.\".It NONE REGISTERED YET +.\"TBD. +.Ss What to do if something fails? +If there is +.Em any failure +during the execution of the test suite, please considering reporting it to the *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sat Oct 26 18:22:23 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A661F6D3; Sat, 26 Oct 2013 18:22:23 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 837E82BFA; Sat, 26 Oct 2013 18:22:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9QIMNJP079297; Sat, 26 Oct 2013 18:22:23 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9QIMGO0079256; Sat, 26 Oct 2013 18:22:16 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201310261822.r9QIMGO0079256@svn.freebsd.org> From: Gleb Smirnoff Date: Sat, 26 Oct 2013 18:22:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257181 - in projects/ifnet/sys: amd64/amd64 compat/linsysfs compat/linux dev/sfxge dev/sn dev/xe net80211 netinet/libalias netinet6 netipsec netnatm netpfil/ipfw netpfil/pf powerpc/aim... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Oct 2013 18:22:23 -0000 Author: glebius Date: Sat Oct 26 18:22:16 2013 New Revision: 257181 URL: http://svnweb.freebsd.org/changeset/base/257181 Log: Merge head r256150 through r257180. Modified: projects/ifnet/sys/amd64/amd64/bpf_jit_machdep.c projects/ifnet/sys/compat/linsysfs/linsysfs.c projects/ifnet/sys/compat/linux/linux_socket.c projects/ifnet/sys/dev/sfxge/sfxge_dma.c projects/ifnet/sys/dev/sfxge/sfxge_ev.c projects/ifnet/sys/dev/sfxge/sfxge_intr.c projects/ifnet/sys/dev/sn/if_sn_isa.c projects/ifnet/sys/dev/xe/if_xe_pccard.c projects/ifnet/sys/net80211/ieee80211_phy.c projects/ifnet/sys/net80211/ieee80211_ratectl.c projects/ifnet/sys/net80211/ieee80211_ratectl_none.c projects/ifnet/sys/netinet/libalias/alias_db.c projects/ifnet/sys/netinet6/ip6_id.c projects/ifnet/sys/netipsec/keysock.c projects/ifnet/sys/netipsec/xform_ah.c projects/ifnet/sys/netipsec/xform_esp.c projects/ifnet/sys/netnatm/natm_proto.c projects/ifnet/sys/netpfil/ipfw/ip_dn_io.c projects/ifnet/sys/netpfil/ipfw/ip_dummynet.c projects/ifnet/sys/netpfil/pf/pf_ruleset.c projects/ifnet/sys/netpfil/pf/pf_table.c projects/ifnet/sys/powerpc/aim/machdep.c projects/ifnet/sys/powerpc/aim/mmu_oea64.c projects/ifnet/sys/powerpc/booke/machdep.c projects/ifnet/sys/powerpc/booke/machdep_e500.c projects/ifnet/sys/powerpc/booke/pmap.c projects/ifnet/sys/powerpc/include/pmap.h projects/ifnet/sys/powerpc/include/tlb.h projects/ifnet/sys/powerpc/include/vmparam.h projects/ifnet/sys/powerpc/mpc85xx/mpc85xx.c projects/ifnet/sys/powerpc/mpc85xx/mpc85xx.h projects/ifnet/sys/powerpc/powerpc/bus_machdep.c Directory Properties: projects/ifnet/ (props changed) projects/ifnet/sys/ (props changed) Modified: projects/ifnet/sys/amd64/amd64/bpf_jit_machdep.c ============================================================================== --- projects/ifnet/sys/amd64/amd64/bpf_jit_machdep.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/amd64/amd64/bpf_jit_machdep.c Sat Oct 26 18:22:16 2013 (r257181) @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #else #include Modified: projects/ifnet/sys/compat/linsysfs/linsysfs.c ============================================================================== --- projects/ifnet/sys/compat/linsysfs/linsysfs.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/compat/linsysfs/linsysfs.c Sat Oct 26 18:22:16 2013 (r257181) @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include Modified: projects/ifnet/sys/compat/linux/linux_socket.c ============================================================================== --- projects/ifnet/sys/compat/linux/linux_socket.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/compat/linux/linux_socket.c Sat Oct 26 18:22:16 2013 (r257181) @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -60,7 +61,6 @@ __FBSDID("$FreeBSD$"); #ifdef INET6 #include #include -#include #endif #ifdef COMPAT_LINUX32 Modified: projects/ifnet/sys/dev/sfxge/sfxge_dma.c ============================================================================== --- projects/ifnet/sys/dev/sfxge/sfxge_dma.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/dev/sfxge/sfxge_dma.c Sat Oct 26 18:22:16 2013 (r257181) @@ -32,6 +32,10 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include +#include +#include #include Modified: projects/ifnet/sys/dev/sfxge/sfxge_ev.c ============================================================================== --- projects/ifnet/sys/dev/sfxge/sfxge_ev.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/dev/sfxge/sfxge_ev.c Sat Oct 26 18:22:16 2013 (r257181) @@ -31,7 +31,12 @@ __FBSDID("$FreeBSD$"); #include +#include +#include +#include +#include #include +#include #include "common/efx.h" Modified: projects/ifnet/sys/dev/sfxge/sfxge_intr.c ============================================================================== --- projects/ifnet/sys/dev/sfxge/sfxge_intr.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/dev/sfxge/sfxge_intr.c Sat Oct 26 18:22:16 2013 (r257181) @@ -32,9 +32,13 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include +#include #include #include #include +#include #include #include Modified: projects/ifnet/sys/dev/sn/if_sn_isa.c ============================================================================== --- projects/ifnet/sys/dev/sn/if_sn_isa.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/dev/sn/if_sn_isa.c Sat Oct 26 18:22:16 2013 (r257181) @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include Modified: projects/ifnet/sys/dev/xe/if_xe_pccard.c ============================================================================== --- projects/ifnet/sys/dev/xe/if_xe_pccard.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/dev/xe/if_xe_pccard.c Sat Oct 26 18:22:16 2013 (r257181) @@ -32,7 +32,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include +#include #include #include Modified: projects/ifnet/sys/net80211/ieee80211_phy.c ============================================================================== --- projects/ifnet/sys/net80211/ieee80211_phy.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/net80211/ieee80211_phy.c Sat Oct 26 18:22:16 2013 (r257181) @@ -35,12 +35,16 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include +#include +#include + #include #include Modified: projects/ifnet/sys/net80211/ieee80211_ratectl.c ============================================================================== --- projects/ifnet/sys/net80211/ieee80211_ratectl.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/net80211/ieee80211_ratectl.c Sat Oct 26 18:22:16 2013 (r257181) @@ -30,9 +30,12 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include +#include +#include #include #include Modified: projects/ifnet/sys/net80211/ieee80211_ratectl_none.c ============================================================================== --- projects/ifnet/sys/net80211/ieee80211_ratectl_none.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/net80211/ieee80211_ratectl_none.c Sat Oct 26 18:22:16 2013 (r257181) @@ -29,13 +29,16 @@ __FBSDID("$FreeBSD$"); #include "opt_wlan.h" #include +#include #include +#include #include #include #include #include #include +#include #ifdef INET #include Modified: projects/ifnet/sys/netinet/libalias/alias_db.c ============================================================================== --- projects/ifnet/sys/netinet/libalias/alias_db.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/netinet/libalias/alias_db.c Sat Oct 26 18:22:16 2013 (r257181) @@ -146,6 +146,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/ifnet/sys/netinet6/ip6_id.c ============================================================================== --- projects/ifnet/sys/netinet6/ip6_id.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/netinet6/ip6_id.c Sat Oct 26 18:22:16 2013 (r257181) @@ -97,6 +97,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include Modified: projects/ifnet/sys/netipsec/keysock.c ============================================================================== --- projects/ifnet/sys/netipsec/keysock.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/netipsec/keysock.c Sat Oct 26 18:22:16 2013 (r257181) @@ -52,9 +52,9 @@ #include #include +#include #include #include -#include #include Modified: projects/ifnet/sys/netipsec/xform_ah.c ============================================================================== --- projects/ifnet/sys/netipsec/xform_ah.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/netipsec/xform_ah.c Sat Oct 26 18:22:16 2013 (r257181) @@ -45,6 +45,8 @@ #include #include #include +#include +#include #include #include Modified: projects/ifnet/sys/netipsec/xform_esp.c ============================================================================== --- projects/ifnet/sys/netipsec/xform_esp.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/netipsec/xform_esp.c Sat Oct 26 18:22:16 2013 (r257181) @@ -44,7 +44,9 @@ #include #include #include +#include #include +#include #include #include Modified: projects/ifnet/sys/netnatm/natm_proto.c ============================================================================== --- projects/ifnet/sys/netnatm/natm_proto.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/netnatm/natm_proto.c Sat Oct 26 18:22:16 2013 (r257181) @@ -41,6 +41,8 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include #include #include #include Modified: projects/ifnet/sys/netpfil/ipfw/ip_dn_io.c ============================================================================== --- projects/ifnet/sys/netpfil/ipfw/ip_dn_io.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/netpfil/ipfw/ip_dn_io.c Sat Oct 26 18:22:16 2013 (r257181) @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/ifnet/sys/netpfil/ipfw/ip_dummynet.c ============================================================================== --- projects/ifnet/sys/netpfil/ipfw/ip_dummynet.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/netpfil/ipfw/ip_dummynet.c Sat Oct 26 18:22:16 2013 (r257181) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/ifnet/sys/netpfil/pf/pf_ruleset.c ============================================================================== --- projects/ifnet/sys/netpfil/pf/pf_ruleset.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/netpfil/pf/pf_ruleset.c Sat Oct 26 18:22:16 2013 (r257181) @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #ifdef INET6 Modified: projects/ifnet/sys/netpfil/pf/pf_table.c ============================================================================== --- projects/ifnet/sys/netpfil/pf/pf_table.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/netpfil/pf/pf_table.c Sat Oct 26 18:22:16 2013 (r257181) @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/ifnet/sys/powerpc/aim/machdep.c ============================================================================== --- projects/ifnet/sys/powerpc/aim/machdep.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/powerpc/aim/machdep.c Sat Oct 26 18:22:16 2013 (r257181) @@ -775,3 +775,11 @@ va_to_vsid(pmap_t pm, vm_offset_t va) } #endif + +vm_offset_t +pmap_early_io_map(vm_paddr_t pa, vm_size_t size) +{ + + return (pa); +} + Modified: projects/ifnet/sys/powerpc/aim/mmu_oea64.c ============================================================================== --- projects/ifnet/sys/powerpc/aim/mmu_oea64.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/powerpc/aim/mmu_oea64.c Sat Oct 26 18:22:16 2013 (r257181) @@ -498,15 +498,7 @@ moea64_add_ofw_mappings(mmu_t mmup, phan qsort(translations, sz, sizeof (*translations), om_cmp); for (i = 0; i < sz; i++) { - CTR3(KTR_PMAP, "translation: pa=%#x va=%#x len=%#x", - (uint32_t)(translations[i].om_pa_lo), translations[i].om_va, - translations[i].om_len); - - if (translations[i].om_pa_lo % PAGE_SIZE) - panic("OFW translation not page-aligned!"); - pa_base = translations[i].om_pa_lo; - #ifdef __powerpc64__ pa_base += (vm_offset_t)translations[i].om_pa_hi << 32; #else @@ -514,6 +506,14 @@ moea64_add_ofw_mappings(mmu_t mmup, phan panic("OFW translations above 32-bit boundary!"); #endif + if (pa_base % PAGE_SIZE) + panic("OFW translation not page-aligned (phys)!"); + if (translations[i].om_va % PAGE_SIZE) + panic("OFW translation not page-aligned (virt)!"); + + CTR3(KTR_PMAP, "translation: pa=%#zx va=%#x len=%#x", + pa_base, translations[i].om_va, translations[i].om_len); + /* Now enter the pages for this mapping */ DISABLE_TRANS(msr); @@ -690,9 +690,9 @@ moea64_early_bootstrap(mmu_t mmup, vm_of hwphyssz = 0; TUNABLE_ULONG_FETCH("hw.physmem", (u_long *) &hwphyssz); for (i = 0, j = 0; i < regions_sz; i++, j += 2) { - CTR3(KTR_PMAP, "region: %#x - %#x (%#x)", regions[i].mr_start, - regions[i].mr_start + regions[i].mr_size, - regions[i].mr_size); + CTR3(KTR_PMAP, "region: %#zx - %#zx (%#zx)", + regions[i].mr_start, regions[i].mr_start + + regions[i].mr_size, regions[i].mr_size); if (hwphyssz != 0 && (physsz + regions[i].mr_size) >= hwphyssz) { if (physsz < hwphyssz) { Modified: projects/ifnet/sys/powerpc/booke/machdep.c ============================================================================== --- projects/ifnet/sys/powerpc/booke/machdep.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/powerpc/booke/machdep.c Sat Oct 26 18:22:16 2013 (r257181) @@ -350,13 +350,18 @@ booke_init(uint32_t arg1, uint32_t arg2) if (OF_init((void *)dtbp) != 0) while (1); - if (fdt_immr_addr(CCSRBAR_VA) != 0) - while (1); - OF_interpret("perform-fixup", 0); /* Set up TLB initially */ - booke_init_tlb(fdt_immr_pa); + tlb1_init(); + + /* Set up IMMR */ + if (fdt_immr_addr(0) == 0) { + fdt_immr_va = pmap_early_io_map(fdt_immr_pa, fdt_immr_size); + } else { + printf("Warning: SOC base registers could not be found!\n"); + fdt_immr_va = 0; + } /* Reset Time Base */ mttb(0); Modified: projects/ifnet/sys/powerpc/booke/machdep_e500.c ============================================================================== --- projects/ifnet/sys/powerpc/booke/machdep_e500.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/powerpc/booke/machdep_e500.c Sat Oct 26 18:22:16 2013 (r257181) @@ -47,8 +47,6 @@ void booke_init_tlb(vm_paddr_t fdt_immr_pa) { - /* Initialize TLB1 handling */ - tlb1_init(fdt_immr_pa); } void Modified: projects/ifnet/sys/powerpc/booke/pmap.c ============================================================================== --- projects/ifnet/sys/powerpc/booke/pmap.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/powerpc/booke/pmap.c Sat Oct 26 18:22:16 2013 (r257181) @@ -113,7 +113,6 @@ extern uint32_t *bootinfo; extern uint32_t bp_ntlb1s; #endif -vm_paddr_t ccsrbar_pa; vm_paddr_t kernload; vm_offset_t kernstart; vm_size_t kernsize; @@ -2662,22 +2661,25 @@ mmu_booke_mapdev_attr(mmu_t mmu, vm_padd void *res; uintptr_t va; vm_size_t sz; + int i; /* - * CCSR is premapped. Note that (pa + size - 1) is there to make sure - * we don't wrap around. Devices on the local bus typically extend all - * the way up to and including 0xffffffff. In that case (pa + size) - * would be 0. This creates a false positive (i.e. we think it's - * within the CCSR) and not create a mapping. - */ - if (ma == VM_MEMATTR_DEFAULT && pa >= ccsrbar_pa && - (pa + size - 1) < (ccsrbar_pa + CCSRBAR_SIZE)) { - va = CCSRBAR_VA + (pa - ccsrbar_pa); - return ((void *)va); + * Check if this is premapped in TLB1. Note: this should probably also + * check whether a sequence of TLB1 entries exist that match the + * requirement, but now only checks the easy case. + */ + if (ma == VM_MEMATTR_DEFAULT) { + for (i = 0; i < tlb1_idx; i++) { + if (!(tlb1[i].mas1 & MAS1_VALID)) + continue; + if (pa >= tlb1[i].phys && + (pa + size) <= (tlb1[i].phys + tlb1[i].size)) + return (void *)(tlb1[i].virt + + (pa - tlb1[i].phys)); + } } - if (size < PAGE_SIZE) - size = PAGE_SIZE; + size = roundup(size, PAGE_SIZE); if (pa >= (VM_MAXUSER_ADDRESS + PAGE_SIZE) && (pa + size - 1) < VM_MIN_KERNEL_ADDRESS) @@ -2899,9 +2901,8 @@ tlb0_print_tlbentries(void) /* * TLB1 mapping notes: * - * TLB1[0] CCSRBAR - * TLB1[1] Kernel text and data. - * TLB1[2-15] Additional kernel text and data mappings (if required), PCI + * TLB1[0] Kernel text and data. + * TLB1[1-15] Additional kernel text and data mappings (if required), PCI * windows, other devices mappings. */ @@ -3094,14 +3095,12 @@ tlb1_mapin_region(vm_offset_t va, vm_pad * assembler level setup done in locore.S. */ void -tlb1_init(vm_offset_t ccsrbar) +tlb1_init() { - uint32_t mas0, mas1, mas3; + uint32_t mas0, mas1, mas2, mas3; uint32_t tsz; u_int i; - ccsrbar_pa = ccsrbar; - if (bootinfo != NULL && bootinfo[0] != 1) { tlb1_idx = *((uint16_t *)(bootinfo + 8)); } else @@ -3117,22 +3116,23 @@ tlb1_init(vm_offset_t ccsrbar) if ((mas1 & MAS1_VALID) == 0) continue; + mas2 = mfspr(SPR_MAS2); mas3 = mfspr(SPR_MAS3); tlb1[i].mas1 = mas1; tlb1[i].mas2 = mfspr(SPR_MAS2); tlb1[i].mas3 = mas3; + tlb1[i].virt = mas2 & MAS2_EPN_MASK; + tlb1[i].phys = mas3 & MAS3_RPN; if (i == 0) kernload = mas3 & MAS3_RPN; tsz = (mas1 & MAS1_TSIZE_MASK) >> MAS1_TSIZE_SHIFT; - kernsize += (tsz > 0) ? tsize2size(tsz) : 0; + tlb1[i].size = (tsz > 0) ? tsize2size(tsz) : 0; + kernsize += tlb1[i].size; } - /* Map in CCSRBAR. */ - tlb1_set_entry(CCSRBAR_VA, ccsrbar, CCSRBAR_SIZE, _TLB_ENTRY_IO); - #ifdef SMP bp_ntlb1s = tlb1_idx; #endif @@ -3145,6 +3145,43 @@ tlb1_init(vm_offset_t ccsrbar) set_mas4_defaults(); } +vm_offset_t +pmap_early_io_map(vm_paddr_t pa, vm_size_t size) +{ + static vm_offset_t early_io_map_base = VM_MAX_KERNEL_ADDRESS; + vm_paddr_t pa_base; + vm_offset_t va, sz; + int i; + + KASSERT(!pmap_bootstrapped, ("Do not use after PMAP is up!")); + + for (i = 0; i < tlb1_idx; i++) { + if (!(tlb1[i].mas1 & MAS1_VALID)) + continue; + if (pa >= tlb1[i].phys && (pa + size) <= + (tlb1[i].phys + tlb1[i].size)) + return (tlb1[i].virt + (pa - tlb1[i].phys)); + } + + pa_base = trunc_page(pa); + size = roundup(size + (pa - pa_base), PAGE_SIZE); + va = early_io_map_base + (pa - pa_base); + + do { + sz = 1 << (ilog2(size) & ~1); + tlb1_set_entry(early_io_map_base, pa_base, sz, _TLB_ENTRY_IO); + size -= sz; + pa_base += sz; + early_io_map_base += sz; + } while (size > 0); + +#ifdef SMP + bp_ntlb1s = tlb1_idx; +#endif + + return (va); +} + /* * Setup MAS4 defaults. * These values are loaded to MAS0-2 on a TLB miss. Modified: projects/ifnet/sys/powerpc/include/pmap.h ============================================================================== --- projects/ifnet/sys/powerpc/include/pmap.h Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/powerpc/include/pmap.h Sat Oct 26 18:22:16 2013 (r257181) @@ -254,6 +254,8 @@ extern void pmap_dumpsys_unmap(struct pm extern struct pmap_md *pmap_scan_md(struct pmap_md *); +vm_offset_t pmap_early_io_map(vm_paddr_t pa, vm_size_t size); + #endif #endif /* !_MACHINE_PMAP_H_ */ Modified: projects/ifnet/sys/powerpc/include/tlb.h ============================================================================== --- projects/ifnet/sys/powerpc/include/tlb.h Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/powerpc/include/tlb.h Sat Oct 26 18:22:16 2013 (r257181) @@ -126,6 +126,9 @@ #if !defined(LOCORE) typedef struct tlb_entry { + vm_paddr_t phys; + vm_offset_t virt; + vm_size_t size; uint32_t mas1; uint32_t mas2; uint32_t mas3; @@ -134,7 +137,7 @@ typedef struct tlb_entry { void tlb0_print_tlbentries(void); void tlb1_inval_entry(unsigned int); -void tlb1_init(vm_offset_t); +void tlb1_init(void); void tlb1_print_entries(void); void tlb1_print_tlbentries(void); #endif /* !LOCORE */ Modified: projects/ifnet/sys/powerpc/include/vmparam.h ============================================================================== --- projects/ifnet/sys/powerpc/include/vmparam.h Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/powerpc/include/vmparam.h Sat Oct 26 18:22:16 2013 (r257181) @@ -108,12 +108,6 @@ #else /* Book-E */ -/* - * Kernel CCSRBAR location. We make this the reset location. - */ -#define CCSRBAR_VA 0xfef00000 -#define CCSRBAR_SIZE 0x00100000 - #define KERNBASE 0xc0000000 /* start of kernel virtual */ #define VM_MIN_KERNEL_ADDRESS KERNBASE Modified: projects/ifnet/sys/powerpc/mpc85xx/mpc85xx.c ============================================================================== --- projects/ifnet/sys/powerpc/mpc85xx/mpc85xx.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/powerpc/mpc85xx/mpc85xx.c Sat Oct 26 18:22:16 2013 (r257181) @@ -41,6 +41,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include /* Modified: projects/ifnet/sys/powerpc/mpc85xx/mpc85xx.h ============================================================================== --- projects/ifnet/sys/powerpc/mpc85xx/mpc85xx.h Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/powerpc/mpc85xx/mpc85xx.h Sat Oct 26 18:22:16 2013 (r257181) @@ -33,6 +33,7 @@ /* * Configuration control and status registers */ +#define CCSRBAR_VA fdt_immr_va #define OCP85XX_CCSRBAR (CCSRBAR_VA + 0x0) #define OCP85XX_BPTR (CCSRBAR_VA + 0x20) Modified: projects/ifnet/sys/powerpc/powerpc/bus_machdep.c ============================================================================== --- projects/ifnet/sys/powerpc/powerpc/bus_machdep.c Sat Oct 26 18:19:36 2013 (r257180) +++ projects/ifnet/sys/powerpc/powerpc/bus_machdep.c Sat Oct 26 18:22:16 2013 (r257181) @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #define MAX_EARLYBOOT_MAPPINGS 6 static struct { + vm_offset_t virt; bus_addr_t addr; bus_size_t size; int flags; @@ -86,10 +87,12 @@ bs_gen_map(bus_addr_t addr, bus_size_t s KASSERT(earlyboot_map_idx < MAX_EARLYBOOT_MAPPINGS, ("%s: too many early boot mapping requests", __func__)); earlyboot_mappings[earlyboot_map_idx].addr = addr; + earlyboot_mappings[earlyboot_map_idx].virt = + pmap_early_io_map(addr, size); earlyboot_mappings[earlyboot_map_idx].size = size; earlyboot_mappings[earlyboot_map_idx].flags = flags; + *bshp = earlyboot_mappings[earlyboot_map_idx].virt; earlyboot_map_idx++; - *bshp = addr; } else { ma = VM_MEMATTR_DEFAULT; switch (flags) { @@ -110,13 +113,13 @@ void bs_remap_earlyboot(void) { int i; - vm_offset_t pa, spa; + vm_offset_t pa, spa, va; vm_memattr_t ma; for (i = 0; i < earlyboot_map_idx; i++) { spa = earlyboot_mappings[i].addr; - if (pmap_dev_direct_mapped(spa, earlyboot_mappings[i].size) - == 0) + if (spa == earlyboot_mappings[i].virt && + pmap_dev_direct_mapped(spa, earlyboot_mappings[i].size) == 0) continue; ma = VM_MEMATTR_DEFAULT; @@ -130,8 +133,10 @@ bs_remap_earlyboot(void) } pa = trunc_page(spa); + va = trunc_page(earlyboot_mappings[i].virt); while (pa < spa + earlyboot_mappings[i].size) { - pmap_kenter_attr(pa, pa, ma); + pmap_kenter_attr(va, pa, ma); + va += PAGE_SIZE; pa += PAGE_SIZE; } } From owner-svn-src-projects@FreeBSD.ORG Sat Oct 26 18:47:17 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BADBEE0E; Sat, 26 Oct 2013 18:47:17 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A518E2CF7; Sat, 26 Oct 2013 18:47:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9QIlHld086477; Sat, 26 Oct 2013 18:47:17 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9QIlCAd086447; Sat, 26 Oct 2013 18:47:12 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201310261847.r9QIlCAd086447@svn.freebsd.org> From: Andrew Turner Date: Sat, 26 Oct 2013 18:47:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257185 - in projects/arm_eabi_vfp: . bin/ps bin/sh cddl/contrib/opensolaris/cmd/zfs contrib/binutils/gas/config contrib/gcclibs/libssp contrib/gperf/src contrib/jemalloc contrib/jemall... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Oct 2013 18:47:17 -0000 Author: andrew Date: Sat Oct 26 18:47:10 2013 New Revision: 257185 URL: http://svnweb.freebsd.org/changeset/base/257185 Log: MFC to r257184 Added: projects/arm_eabi_vfp/etc/keys/ - copied from r257184, head/etc/keys/ projects/arm_eabi_vfp/etc/mtree/BSD.tests.dist - copied unchanged from r257184, head/etc/mtree/BSD.tests.dist projects/arm_eabi_vfp/etc/pkg/ - copied from r257184, head/etc/pkg/ projects/arm_eabi_vfp/share/man/man7/tests.7 - copied unchanged from r257184, head/share/man/man7/tests.7 projects/arm_eabi_vfp/share/man/man9/getenv.9 - copied unchanged from r257184, head/share/man/man9/getenv.9 projects/arm_eabi_vfp/share/mk/plain.test.mk - copied unchanged from r257184, head/share/mk/plain.test.mk projects/arm_eabi_vfp/sys/arm/broadcom/bcm2835/bcm2835_bsc.c - copied unchanged from r257184, head/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/arm_eabi_vfp/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h - copied unchanged from r257184, head/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h projects/arm_eabi_vfp/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h - copied unchanged from r257184, head/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h projects/arm_eabi_vfp/sys/arm/broadcom/bcm2835/bcm2835_spi.c - copied unchanged from r257184, head/sys/arm/broadcom/bcm2835/bcm2835_spi.c projects/arm_eabi_vfp/sys/arm/broadcom/bcm2835/bcm2835_spireg.h - copied unchanged from r257184, head/sys/arm/broadcom/bcm2835/bcm2835_spireg.h projects/arm_eabi_vfp/sys/arm/broadcom/bcm2835/bcm2835_spivar.h - copied unchanged from r257184, head/sys/arm/broadcom/bcm2835/bcm2835_spivar.h projects/arm_eabi_vfp/sys/arm/conf/IMX53-QSB - copied unchanged from r257184, head/sys/arm/conf/IMX53-QSB projects/arm_eabi_vfp/sys/arm/conf/RADXA - copied unchanged from r257184, head/sys/arm/conf/RADXA projects/arm_eabi_vfp/sys/arm/rockchip/ - copied from r257184, head/sys/arm/rockchip/ projects/arm_eabi_vfp/sys/boot/fdt/dts/beri-sim.dts - copied unchanged from r257184, head/sys/boot/fdt/dts/beri-sim.dts projects/arm_eabi_vfp/sys/boot/fdt/dts/beripad-de4.dts - copied unchanged from r257184, head/sys/boot/fdt/dts/beripad-de4.dts projects/arm_eabi_vfp/sys/boot/fdt/dts/imx53-qsb.dts - copied unchanged from r257184, head/sys/boot/fdt/dts/imx53-qsb.dts projects/arm_eabi_vfp/sys/boot/fdt/dts/rk3188-radxa.dts - copied unchanged from r257184, head/sys/boot/fdt/dts/rk3188-radxa.dts projects/arm_eabi_vfp/sys/boot/fdt/dts/rk3188.dtsi - copied unchanged from r257184, head/sys/boot/fdt/dts/rk3188.dtsi - copied unchanged from r257184, head/sys/dev/fdt/fdt_ic_if.m projects/arm_eabi_vfp/sys/dev/ffec/ - copied from r257184, head/sys/dev/ffec/ projects/arm_eabi_vfp/sys/dev/iwn/if_iwn_debug.h - copied unchanged from r257184, head/sys/dev/iwn/if_iwn_debug.h projects/arm_eabi_vfp/sys/dev/ofw/ofw_nexus.c - copied unchanged from r257184, head/sys/dev/ofw/ofw_nexus.c projects/arm_eabi_vfp/sys/dev/ofw/ofw_nexus.h - copied unchanged from r257184, head/sys/dev/ofw/ofw_nexus.h projects/arm_eabi_vfp/sys/dev/spibus/ofw_spibus.c - copied unchanged from r257184, head/sys/dev/spibus/ofw_spibus.c projects/arm_eabi_vfp/sys/dev/usb/controller/dwc_otg_fdt.c - copied unchanged from r257184, head/sys/dev/usb/controller/dwc_otg_fdt.c projects/arm_eabi_vfp/sys/mips/beri/beri_pic.c - copied unchanged from r257184, head/sys/mips/beri/beri_pic.c projects/arm_eabi_vfp/sys/mips/conf/ALFA_HORNET_UB - copied unchanged from r257184, head/sys/mips/conf/ALFA_HORNET_UB projects/arm_eabi_vfp/sys/mips/conf/ALFA_HORNET_UB.hints - copied unchanged from r257184, head/sys/mips/conf/ALFA_HORNET_UB.hints projects/arm_eabi_vfp/sys/mips/conf/BERI_DE4_BASE - copied unchanged from r257184, head/sys/mips/conf/BERI_DE4_BASE projects/arm_eabi_vfp/sys/mips/conf/BERI_SIM_BASE - copied unchanged from r257184, head/sys/mips/conf/BERI_SIM_BASE projects/arm_eabi_vfp/sys/mips/conf/BERI_SIM_SDROOT - copied unchanged from r257184, head/sys/mips/conf/BERI_SIM_SDROOT projects/arm_eabi_vfp/sys/powerpc/mpc85xx/pci_mpc85xx.c - copied unchanged from r257184, head/sys/powerpc/mpc85xx/pci_mpc85xx.c projects/arm_eabi_vfp/sys/powerpc/ofw/openpic_ofw.c - copied unchanged from r257184, head/sys/powerpc/ofw/openpic_ofw.c projects/arm_eabi_vfp/sys/powerpc/powerpc/clock.c - copied unchanged from r257184, head/sys/powerpc/powerpc/clock.c projects/arm_eabi_vfp/sys/powerpc/powerpc/nexus.c - copied unchanged from r257184, head/sys/powerpc/powerpc/nexus.c projects/arm_eabi_vfp/sys/powerpc/powerpc/vm_machdep.c - copied unchanged from r257184, head/sys/powerpc/powerpc/vm_machdep.c projects/arm_eabi_vfp/tests/ - copied from r257184, head/tests/ projects/arm_eabi_vfp/tools/build/options/WITHOUT_NMTREE - copied unchanged from r257184, head/tools/build/options/WITHOUT_NMTREE projects/arm_eabi_vfp/tools/build/options/WITHOUT_TESTS - copied unchanged from r257184, head/tools/build/options/WITHOUT_TESTS projects/arm_eabi_vfp/tools/tools/atsectl/ - copied from r257184, head/tools/tools/atsectl/ Directory Properties: projects/arm_eabi_vfp/sys/dev/fdt/fdt_ic_if.m (props changed) Deleted: projects/arm_eabi_vfp/share/man/man4/isf.4 projects/arm_eabi_vfp/sys/arm/broadcom/bcm2835/dwc_otg_brcm.c projects/arm_eabi_vfp/sys/dev/isf/ projects/arm_eabi_vfp/sys/kern/dtio_kdtrace.c projects/arm_eabi_vfp/sys/mips/conf/BERI_SIM.hints projects/arm_eabi_vfp/sys/modules/dtrace/dtio/ projects/arm_eabi_vfp/sys/powerpc/aim/clock.c projects/arm_eabi_vfp/sys/powerpc/aim/nexus.c projects/arm_eabi_vfp/sys/powerpc/aim/vm_machdep.c projects/arm_eabi_vfp/sys/powerpc/booke/clock.c projects/arm_eabi_vfp/sys/powerpc/booke/vm_machdep.c projects/arm_eabi_vfp/sys/powerpc/include/trap_aim.h projects/arm_eabi_vfp/sys/powerpc/include/trap_booke.h projects/arm_eabi_vfp/sys/powerpc/mambo/mambo_openpic.c projects/arm_eabi_vfp/sys/powerpc/mpc85xx/nexus.c projects/arm_eabi_vfp/sys/powerpc/mpc85xx/pci_fdt.c projects/arm_eabi_vfp/sys/powerpc/powermac/openpic_macio.c projects/arm_eabi_vfp/sys/powerpc/powerpc/openpic_fdt.c projects/arm_eabi_vfp/tools/build/options/WITH_NMTREE projects/arm_eabi_vfp/usr.sbin/isfctl/ Modified: projects/arm_eabi_vfp/Makefile.inc1 projects/arm_eabi_vfp/ObsoleteFiles.inc projects/arm_eabi_vfp/UPDATING projects/arm_eabi_vfp/bin/ps/print.c projects/arm_eabi_vfp/bin/sh/miscbltin.c projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/arm_eabi_vfp/contrib/binutils/gas/config/tc-mips.c projects/arm_eabi_vfp/contrib/binutils/gas/config/tc-mips.h projects/arm_eabi_vfp/contrib/gcclibs/libssp/ssp.c projects/arm_eabi_vfp/contrib/gperf/src/options.cc projects/arm_eabi_vfp/contrib/gperf/src/search.cc projects/arm_eabi_vfp/contrib/jemalloc/ChangeLog projects/arm_eabi_vfp/contrib/jemalloc/FREEBSD-diffs projects/arm_eabi_vfp/contrib/jemalloc/FREEBSD-upgrade projects/arm_eabi_vfp/contrib/jemalloc/VERSION projects/arm_eabi_vfp/contrib/jemalloc/doc/jemalloc.3 projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/arena.h projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/private_namespace.h projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/tcache.h projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/jemalloc.h projects/arm_eabi_vfp/contrib/jemalloc/src/arena.c projects/arm_eabi_vfp/contrib/jemalloc/src/chunk.c projects/arm_eabi_vfp/contrib/jemalloc/src/ctl.c projects/arm_eabi_vfp/contrib/jemalloc/src/jemalloc.c projects/arm_eabi_vfp/contrib/llvm/tools/clang/tools/driver/driver.cpp projects/arm_eabi_vfp/contrib/subversion/subversion/libsvn_subr/opt.c projects/arm_eabi_vfp/contrib/subversion/subversion/libsvn_subr/version.c projects/arm_eabi_vfp/etc/Makefile projects/arm_eabi_vfp/etc/login.conf projects/arm_eabi_vfp/etc/mtree/BSD.root.dist projects/arm_eabi_vfp/etc/mtree/BSD.usr.dist projects/arm_eabi_vfp/etc/netstart projects/arm_eabi_vfp/etc/rc.d/jail projects/arm_eabi_vfp/etc/rc.d/rtadvd projects/arm_eabi_vfp/include/pthread.h projects/arm_eabi_vfp/lib/libc/gen/popen.c projects/arm_eabi_vfp/lib/libc/gen/syslog.c projects/arm_eabi_vfp/lib/libc/iconv/citrus_mapper.c projects/arm_eabi_vfp/lib/libc/sys/getrlimit.2 projects/arm_eabi_vfp/lib/libcrypt/Makefile projects/arm_eabi_vfp/lib/libcrypt/tests/Makefile projects/arm_eabi_vfp/lib/libutil/login_class.3 projects/arm_eabi_vfp/lib/libutil/login_class.c projects/arm_eabi_vfp/sbin/fsck_ffs/ea.c projects/arm_eabi_vfp/sbin/geom/class/part/geom_part.c projects/arm_eabi_vfp/sbin/growfs/debug.c projects/arm_eabi_vfp/sbin/hastctl/hastctl.c projects/arm_eabi_vfp/sbin/hastd/control.c projects/arm_eabi_vfp/sbin/hastd/hast.h projects/arm_eabi_vfp/sbin/hastd/primary.c projects/arm_eabi_vfp/sbin/hastd/secondary.c projects/arm_eabi_vfp/sbin/ifconfig/ifconfig.8 projects/arm_eabi_vfp/sbin/mdconfig/mdconfig.8 projects/arm_eabi_vfp/sbin/mdconfig/mdconfig.c projects/arm_eabi_vfp/share/man/man4/Makefile projects/arm_eabi_vfp/share/man/man4/ahci.4 projects/arm_eabi_vfp/share/man/man5/src.conf.5 projects/arm_eabi_vfp/share/man/man7/Makefile projects/arm_eabi_vfp/share/man/man7/hier.7 projects/arm_eabi_vfp/share/man/man9/Makefile projects/arm_eabi_vfp/share/man/man9/disk.9 projects/arm_eabi_vfp/share/mk/bsd.files.mk projects/arm_eabi_vfp/share/mk/bsd.own.mk projects/arm_eabi_vfp/share/mk/bsd.test.mk projects/arm_eabi_vfp/sys/amd64/amd64/bpf_jit_machdep.c projects/arm_eabi_vfp/sys/arm/allwinner/a10_wdog.c projects/arm_eabi_vfp/sys/arm/arm/stack_machdep.c projects/arm_eabi_vfp/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/arm_eabi_vfp/sys/arm/broadcom/bcm2835/bcm2835_wdog.c projects/arm_eabi_vfp/sys/arm/broadcom/bcm2835/files.bcm2835 projects/arm_eabi_vfp/sys/arm/conf/RPI-B projects/arm_eabi_vfp/sys/arm/freescale/imx/files.imx53 projects/arm_eabi_vfp/sys/arm/lpc/if_lpe.c projects/arm_eabi_vfp/sys/arm/lpc/lpc_mmc.c projects/arm_eabi_vfp/sys/arm/mv/gpio.c projects/arm_eabi_vfp/sys/arm/mv/mv_sata.c projects/arm_eabi_vfp/sys/arm/xscale/ixp425/if_npe.c projects/arm_eabi_vfp/sys/arm/xscale/ixp425/ixp425_mem.c projects/arm_eabi_vfp/sys/boot/fdt/dts/bcm2835.dtsi projects/arm_eabi_vfp/sys/boot/fdt/dts/db78460.dts projects/arm_eabi_vfp/sys/boot/fdt/dts/digi-ccwmx53.dts projects/arm_eabi_vfp/sys/boot/i386/libi386/Makefile projects/arm_eabi_vfp/sys/boot/i386/libi386/smbios.c projects/arm_eabi_vfp/sys/boot/uboot/lib/disk.c projects/arm_eabi_vfp/sys/boot/uboot/lib/glue.c projects/arm_eabi_vfp/sys/cam/ata/ata_da.c projects/arm_eabi_vfp/sys/cam/ata/ata_pmp.c projects/arm_eabi_vfp/sys/cam/ata/ata_xpt.c projects/arm_eabi_vfp/sys/cam/cam_ccb.h projects/arm_eabi_vfp/sys/cam/cam_periph.c projects/arm_eabi_vfp/sys/cam/cam_periph.h projects/arm_eabi_vfp/sys/cam/cam_queue.c projects/arm_eabi_vfp/sys/cam/cam_queue.h projects/arm_eabi_vfp/sys/cam/cam_sim.c projects/arm_eabi_vfp/sys/cam/cam_sim.h projects/arm_eabi_vfp/sys/cam/cam_xpt.c projects/arm_eabi_vfp/sys/cam/cam_xpt.h projects/arm_eabi_vfp/sys/cam/cam_xpt_internal.h projects/arm_eabi_vfp/sys/cam/cam_xpt_sim.h projects/arm_eabi_vfp/sys/cam/ctl/ctl_backend_block.c projects/arm_eabi_vfp/sys/cam/ctl/ctl_frontend_cam_sim.c projects/arm_eabi_vfp/sys/cam/ctl/scsi_ctl.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_all.h projects/arm_eabi_vfp/sys/cam/scsi/scsi_cd.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_ch.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_da.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_enc.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_enc_internal.h projects/arm_eabi_vfp/sys/cam/scsi/scsi_enc_safte.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_enc_ses.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_pass.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_pt.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_sa.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_sg.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_targ_bh.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_target.c projects/arm_eabi_vfp/sys/cam/scsi/scsi_xpt.c projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c projects/arm_eabi_vfp/sys/cddl/dev/dtrace/amd64/dtrace_isa.c projects/arm_eabi_vfp/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c projects/arm_eabi_vfp/sys/cddl/dev/sdt/sdt.c projects/arm_eabi_vfp/sys/compat/linprocfs/linprocfs.c projects/arm_eabi_vfp/sys/compat/linsysfs/linsysfs.c projects/arm_eabi_vfp/sys/compat/linux/linux_ioctl.c projects/arm_eabi_vfp/sys/compat/linux/linux_socket.c projects/arm_eabi_vfp/sys/compat/ndis/kern_ndis.c projects/arm_eabi_vfp/sys/compat/ndis/subr_ndis.c projects/arm_eabi_vfp/sys/compat/ndis/subr_usbd.c projects/arm_eabi_vfp/sys/conf/NOTES projects/arm_eabi_vfp/sys/conf/files projects/arm_eabi_vfp/sys/conf/files.powerpc projects/arm_eabi_vfp/sys/conf/options.mips projects/arm_eabi_vfp/sys/dev/ae/if_ae.c projects/arm_eabi_vfp/sys/dev/age/if_age.c projects/arm_eabi_vfp/sys/dev/aha/aha.c projects/arm_eabi_vfp/sys/dev/ahci/ahci.c projects/arm_eabi_vfp/sys/dev/ahci/ahci.h projects/arm_eabi_vfp/sys/dev/aic7xxx/aic79xx.c projects/arm_eabi_vfp/sys/dev/aic7xxx/aic7xxx.c projects/arm_eabi_vfp/sys/dev/alc/if_alc.c projects/arm_eabi_vfp/sys/dev/ale/if_ale.c projects/arm_eabi_vfp/sys/dev/an/if_an.c projects/arm_eabi_vfp/sys/dev/ata/ata-all.c projects/arm_eabi_vfp/sys/dev/ath/ath_dfs/null/dfs_null.c projects/arm_eabi_vfp/sys/dev/ath/ath_rate/sample/sample.c projects/arm_eabi_vfp/sys/dev/ath/if_ath.c projects/arm_eabi_vfp/sys/dev/ath/if_ath_beacon.c projects/arm_eabi_vfp/sys/dev/ath/if_ath_btcoex.c projects/arm_eabi_vfp/sys/dev/ath/if_ath_keycache.c projects/arm_eabi_vfp/sys/dev/ath/if_ath_lna_div.c projects/arm_eabi_vfp/sys/dev/ath/if_ath_rx.c projects/arm_eabi_vfp/sys/dev/ath/if_ath_rx_edma.c projects/arm_eabi_vfp/sys/dev/ath/if_ath_spectral.c projects/arm_eabi_vfp/sys/dev/ath/if_ath_sysctl.c projects/arm_eabi_vfp/sys/dev/ath/if_ath_tdma.c projects/arm_eabi_vfp/sys/dev/ath/if_ath_tx.c projects/arm_eabi_vfp/sys/dev/ath/if_ath_tx_edma.c projects/arm_eabi_vfp/sys/dev/bce/if_bce.c projects/arm_eabi_vfp/sys/dev/bce/if_bcereg.h projects/arm_eabi_vfp/sys/dev/bfe/if_bfe.c projects/arm_eabi_vfp/sys/dev/bge/if_bge.c projects/arm_eabi_vfp/sys/dev/bm/if_bm.c projects/arm_eabi_vfp/sys/dev/buslogic/bt.c projects/arm_eabi_vfp/sys/dev/bwi/bwimac.c projects/arm_eabi_vfp/sys/dev/bwi/bwiphy.c projects/arm_eabi_vfp/sys/dev/bwi/bwirf.c projects/arm_eabi_vfp/sys/dev/bwi/if_bwi.c projects/arm_eabi_vfp/sys/dev/bwi/if_bwi_pci.c projects/arm_eabi_vfp/sys/dev/bwn/if_bwn.c projects/arm_eabi_vfp/sys/dev/cadence/if_cgem.c projects/arm_eabi_vfp/sys/dev/cas/if_cas.c projects/arm_eabi_vfp/sys/dev/ce/if_ce.c projects/arm_eabi_vfp/sys/dev/cesa/cesa.c projects/arm_eabi_vfp/sys/dev/cfi/cfi_bus_nexus.c projects/arm_eabi_vfp/sys/dev/cm/smc90cx6.c projects/arm_eabi_vfp/sys/dev/cp/if_cp.c projects/arm_eabi_vfp/sys/dev/cs/if_cs.c projects/arm_eabi_vfp/sys/dev/ctau/if_ct.c projects/arm_eabi_vfp/sys/dev/cx/if_cx.c projects/arm_eabi_vfp/sys/dev/cxgb/cxgb_adapter.h projects/arm_eabi_vfp/sys/dev/cxgb/cxgb_main.c projects/arm_eabi_vfp/sys/dev/cxgbe/adapter.h projects/arm_eabi_vfp/sys/dev/dc/dcphy.c projects/arm_eabi_vfp/sys/dev/dc/if_dc.c projects/arm_eabi_vfp/sys/dev/dc/pnphy.c projects/arm_eabi_vfp/sys/dev/de/if_de.c projects/arm_eabi_vfp/sys/dev/drm2/i915/i915_drv.c projects/arm_eabi_vfp/sys/dev/e1000/if_em.c projects/arm_eabi_vfp/sys/dev/e1000/if_igb.c projects/arm_eabi_vfp/sys/dev/e1000/if_lem.c projects/arm_eabi_vfp/sys/dev/ed/if_ed.c projects/arm_eabi_vfp/sys/dev/ed/if_ed_3c503.c projects/arm_eabi_vfp/sys/dev/ed/if_ed_hpp.c projects/arm_eabi_vfp/sys/dev/ed/if_ed_pccard.c projects/arm_eabi_vfp/sys/dev/ed/if_ed_rtl80x9.c projects/arm_eabi_vfp/sys/dev/en/if_en_pci.c projects/arm_eabi_vfp/sys/dev/en/midway.c projects/arm_eabi_vfp/sys/dev/ep/if_ep.c projects/arm_eabi_vfp/sys/dev/et/if_et.c projects/arm_eabi_vfp/sys/dev/ex/if_ex.c projects/arm_eabi_vfp/sys/dev/fatm/if_fatm.c projects/arm_eabi_vfp/sys/dev/fdt/fdt_common.c projects/arm_eabi_vfp/sys/dev/fdt/fdt_common.h projects/arm_eabi_vfp/sys/dev/fdt/fdt_mips.c projects/arm_eabi_vfp/sys/dev/fdt/fdt_pci.c projects/arm_eabi_vfp/sys/dev/fdt/fdt_powerpc.c projects/arm_eabi_vfp/sys/dev/fdt/fdt_slicer.c projects/arm_eabi_vfp/sys/dev/fdt/fdtbus.c projects/arm_eabi_vfp/sys/dev/fdt/simplebus.c projects/arm_eabi_vfp/sys/dev/fe/if_fe.c projects/arm_eabi_vfp/sys/dev/fe/if_fe_pccard.c projects/arm_eabi_vfp/sys/dev/firewire/if_fwe.c projects/arm_eabi_vfp/sys/dev/firewire/if_fwip.c projects/arm_eabi_vfp/sys/dev/firewire/sbp_targ.c projects/arm_eabi_vfp/sys/dev/fxp/if_fxp.c projects/arm_eabi_vfp/sys/dev/fxp/inphy.c projects/arm_eabi_vfp/sys/dev/gem/if_gem.c projects/arm_eabi_vfp/sys/dev/hatm/if_hatm.c projects/arm_eabi_vfp/sys/dev/hatm/if_hatm_intr.c projects/arm_eabi_vfp/sys/dev/hatm/if_hatm_ioctl.c projects/arm_eabi_vfp/sys/dev/hatm/if_hatm_rx.c projects/arm_eabi_vfp/sys/dev/hatm/if_hatm_tx.c projects/arm_eabi_vfp/sys/dev/hme/if_hme.c projects/arm_eabi_vfp/sys/dev/hme/if_hme_pci.c projects/arm_eabi_vfp/sys/dev/ic/ns16550.h projects/arm_eabi_vfp/sys/dev/ie/if_ie.c projects/arm_eabi_vfp/sys/dev/if_ndis/if_ndis.c projects/arm_eabi_vfp/sys/dev/if_ndis/if_ndis_pccard.c projects/arm_eabi_vfp/sys/dev/if_ndis/if_ndis_pci.c projects/arm_eabi_vfp/sys/dev/if_ndis/if_ndis_usb.c projects/arm_eabi_vfp/sys/dev/iicbus/if_ic.c projects/arm_eabi_vfp/sys/dev/ipw/if_ipw.c projects/arm_eabi_vfp/sys/dev/iscsi/icl.c projects/arm_eabi_vfp/sys/dev/isp/isp_freebsd.c projects/arm_eabi_vfp/sys/dev/iwi/if_iwi.c projects/arm_eabi_vfp/sys/dev/iwn/if_iwn.c projects/arm_eabi_vfp/sys/dev/iwn/if_iwnreg.h projects/arm_eabi_vfp/sys/dev/iwn/if_iwnvar.h projects/arm_eabi_vfp/sys/dev/ixgb/if_ixgb.h projects/arm_eabi_vfp/sys/dev/ixgbe/ixgbe.h projects/arm_eabi_vfp/sys/dev/ixgbe/ixv.h projects/arm_eabi_vfp/sys/dev/jme/if_jme.c projects/arm_eabi_vfp/sys/dev/le/lance.c projects/arm_eabi_vfp/sys/dev/lge/if_lge.c projects/arm_eabi_vfp/sys/dev/lmc/if_lmc.c projects/arm_eabi_vfp/sys/dev/malo/if_malo.c projects/arm_eabi_vfp/sys/dev/malo/if_malo_pci.c projects/arm_eabi_vfp/sys/dev/malo/if_malohal.c projects/arm_eabi_vfp/sys/dev/md/md.c projects/arm_eabi_vfp/sys/dev/mge/if_mge.c projects/arm_eabi_vfp/sys/dev/mii/acphy.c projects/arm_eabi_vfp/sys/dev/mii/amphy.c projects/arm_eabi_vfp/sys/dev/mii/atphy.c projects/arm_eabi_vfp/sys/dev/mii/axphy.c projects/arm_eabi_vfp/sys/dev/mii/bmtphy.c projects/arm_eabi_vfp/sys/dev/mii/brgphy.c projects/arm_eabi_vfp/sys/dev/mii/ciphy.c projects/arm_eabi_vfp/sys/dev/mii/e1000phy.c projects/arm_eabi_vfp/sys/dev/mii/gentbi.c projects/arm_eabi_vfp/sys/dev/mii/icsphy.c projects/arm_eabi_vfp/sys/dev/mii/ip1000phy.c projects/arm_eabi_vfp/sys/dev/mii/jmphy.c projects/arm_eabi_vfp/sys/dev/mii/lxtphy.c projects/arm_eabi_vfp/sys/dev/mii/mii.c projects/arm_eabi_vfp/sys/dev/mii/mii_physubr.c projects/arm_eabi_vfp/sys/dev/mii/mlphy.c projects/arm_eabi_vfp/sys/dev/mii/nsgphy.c projects/arm_eabi_vfp/sys/dev/mii/nsphy.c projects/arm_eabi_vfp/sys/dev/mii/nsphyter.c projects/arm_eabi_vfp/sys/dev/mii/pnaphy.c projects/arm_eabi_vfp/sys/dev/mii/qsphy.c projects/arm_eabi_vfp/sys/dev/mii/rdcphy.c projects/arm_eabi_vfp/sys/dev/mii/rgephy.c projects/arm_eabi_vfp/sys/dev/mii/rlphy.c projects/arm_eabi_vfp/sys/dev/mii/rlswitch.c projects/arm_eabi_vfp/sys/dev/mii/smcphy.c projects/arm_eabi_vfp/sys/dev/mii/smscphy.c projects/arm_eabi_vfp/sys/dev/mii/tdkphy.c projects/arm_eabi_vfp/sys/dev/mii/tlphy.c projects/arm_eabi_vfp/sys/dev/mii/truephy.c projects/arm_eabi_vfp/sys/dev/mii/ukphy.c projects/arm_eabi_vfp/sys/dev/mii/xmphy.c projects/arm_eabi_vfp/sys/dev/mpt/mpt_cam.c projects/arm_eabi_vfp/sys/dev/msk/if_msk.c projects/arm_eabi_vfp/sys/dev/mvs/mvs.c projects/arm_eabi_vfp/sys/dev/mwl/if_mwl.c projects/arm_eabi_vfp/sys/dev/mwl/if_mwl_pci.c projects/arm_eabi_vfp/sys/dev/mxge/if_mxge.c projects/arm_eabi_vfp/sys/dev/my/if_my.c projects/arm_eabi_vfp/sys/dev/netmap/netmap.c projects/arm_eabi_vfp/sys/dev/nfe/if_nfe.c projects/arm_eabi_vfp/sys/dev/nge/if_nge.c projects/arm_eabi_vfp/sys/dev/nve/if_nve.c projects/arm_eabi_vfp/sys/dev/nxge/if_nxge.c projects/arm_eabi_vfp/sys/dev/oce/oce_hw.c projects/arm_eabi_vfp/sys/dev/oce/oce_hw.h projects/arm_eabi_vfp/sys/dev/oce/oce_if.c projects/arm_eabi_vfp/sys/dev/oce/oce_if.h projects/arm_eabi_vfp/sys/dev/oce/oce_mbox.c projects/arm_eabi_vfp/sys/dev/oce/oce_queue.c projects/arm_eabi_vfp/sys/dev/oce/oce_sysctl.c projects/arm_eabi_vfp/sys/dev/oce/oce_util.c projects/arm_eabi_vfp/sys/dev/ofw/ofw_bus.h projects/arm_eabi_vfp/sys/dev/ofw/ofw_bus_if.m projects/arm_eabi_vfp/sys/dev/ofw/ofw_bus_subr.c projects/arm_eabi_vfp/sys/dev/ofw/ofw_bus_subr.h projects/arm_eabi_vfp/sys/dev/ofw/ofw_console.c projects/arm_eabi_vfp/sys/dev/ofw/ofw_fdt.c projects/arm_eabi_vfp/sys/dev/ofw/ofw_iicbus.c projects/arm_eabi_vfp/sys/dev/ofw/openfirm.c projects/arm_eabi_vfp/sys/dev/ofw/openfirm.h projects/arm_eabi_vfp/sys/dev/patm/if_patm.c projects/arm_eabi_vfp/sys/dev/patm/if_patm_attach.c projects/arm_eabi_vfp/sys/dev/patm/if_patm_intr.c projects/arm_eabi_vfp/sys/dev/patm/if_patm_ioctl.c projects/arm_eabi_vfp/sys/dev/patm/if_patm_rx.c projects/arm_eabi_vfp/sys/dev/patm/if_patm_tx.c projects/arm_eabi_vfp/sys/dev/pci/pci.c projects/arm_eabi_vfp/sys/dev/pci/pci_private.h projects/arm_eabi_vfp/sys/dev/pci/pcireg.h projects/arm_eabi_vfp/sys/dev/pci/pcivar.h projects/arm_eabi_vfp/sys/dev/pcn/if_pcn.c projects/arm_eabi_vfp/sys/dev/pdq/if_fpa.c projects/arm_eabi_vfp/sys/dev/pdq/pdq_freebsd.h projects/arm_eabi_vfp/sys/dev/pdq/pdq_ifsubr.c projects/arm_eabi_vfp/sys/dev/ppbus/if_plip.c projects/arm_eabi_vfp/sys/dev/ral/rt2560.c projects/arm_eabi_vfp/sys/dev/ral/rt2661.c projects/arm_eabi_vfp/sys/dev/ral/rt2860.c projects/arm_eabi_vfp/sys/dev/re/if_re.c projects/arm_eabi_vfp/sys/dev/rt/if_rt.c projects/arm_eabi_vfp/sys/dev/sbni/if_sbni.c projects/arm_eabi_vfp/sys/dev/sf/if_sf.c projects/arm_eabi_vfp/sys/dev/sfxge/sfxge.c projects/arm_eabi_vfp/sys/dev/sfxge/sfxge.h projects/arm_eabi_vfp/sys/dev/sfxge/sfxge_dma.c projects/arm_eabi_vfp/sys/dev/sfxge/sfxge_ev.c projects/arm_eabi_vfp/sys/dev/sfxge/sfxge_intr.c projects/arm_eabi_vfp/sys/dev/sge/if_sge.c projects/arm_eabi_vfp/sys/dev/siis/siis.c projects/arm_eabi_vfp/sys/dev/sis/if_sis.c projects/arm_eabi_vfp/sys/dev/sk/if_sk.c projects/arm_eabi_vfp/sys/dev/smc/if_smc.c projects/arm_eabi_vfp/sys/dev/sn/if_sn.c projects/arm_eabi_vfp/sys/dev/sn/if_sn_isa.c projects/arm_eabi_vfp/sys/dev/spibus/spibus.c projects/arm_eabi_vfp/sys/dev/spibus/spibusvar.h projects/arm_eabi_vfp/sys/dev/ste/if_ste.c projects/arm_eabi_vfp/sys/dev/stge/if_stge.c projects/arm_eabi_vfp/sys/dev/ti/if_ti.c projects/arm_eabi_vfp/sys/dev/tl/if_tl.c projects/arm_eabi_vfp/sys/dev/tsec/if_tsec.c projects/arm_eabi_vfp/sys/dev/tx/if_tx.c projects/arm_eabi_vfp/sys/dev/txp/if_txp.c projects/arm_eabi_vfp/sys/dev/uart/uart_cpu_fdt.c projects/arm_eabi_vfp/sys/dev/uart/uart_dev_imx.c projects/arm_eabi_vfp/sys/dev/uart/uart_dev_ns8250.c projects/arm_eabi_vfp/sys/dev/uart/uart_dev_pl011.c projects/arm_eabi_vfp/sys/dev/usb/net/if_aue.c projects/arm_eabi_vfp/sys/dev/usb/net/if_axe.c projects/arm_eabi_vfp/sys/dev/usb/net/if_cdce.c projects/arm_eabi_vfp/sys/dev/usb/net/if_cue.c projects/arm_eabi_vfp/sys/dev/usb/net/if_kue.c projects/arm_eabi_vfp/sys/dev/usb/net/if_mos.c projects/arm_eabi_vfp/sys/dev/usb/net/if_rue.c projects/arm_eabi_vfp/sys/dev/usb/net/if_udav.c projects/arm_eabi_vfp/sys/dev/usb/net/if_usie.c projects/arm_eabi_vfp/sys/dev/usb/net/ruephy.c projects/arm_eabi_vfp/sys/dev/usb/net/uhso.c projects/arm_eabi_vfp/sys/dev/usb/net/usb_ethernet.c projects/arm_eabi_vfp/sys/dev/usb/serial/u3g.c projects/arm_eabi_vfp/sys/dev/usb/serial/uslcom.c projects/arm_eabi_vfp/sys/dev/usb/usb_pf.c projects/arm_eabi_vfp/sys/dev/usb/usbdevs projects/arm_eabi_vfp/sys/dev/usb/wlan/if_rsu.c projects/arm_eabi_vfp/sys/dev/usb/wlan/if_rum.c projects/arm_eabi_vfp/sys/dev/usb/wlan/if_run.c projects/arm_eabi_vfp/sys/dev/usb/wlan/if_uath.c projects/arm_eabi_vfp/sys/dev/usb/wlan/if_upgt.c projects/arm_eabi_vfp/sys/dev/usb/wlan/if_ural.c projects/arm_eabi_vfp/sys/dev/usb/wlan/if_urtw.c projects/arm_eabi_vfp/sys/dev/usb/wlan/if_urtwn.c projects/arm_eabi_vfp/sys/dev/usb/wlan/if_zyd.c projects/arm_eabi_vfp/sys/dev/vge/if_vge.c projects/arm_eabi_vfp/sys/dev/virtio/network/if_vtnet.c projects/arm_eabi_vfp/sys/dev/vmware/vmxnet3/if_vmx.c projects/arm_eabi_vfp/sys/dev/vr/if_vr.c projects/arm_eabi_vfp/sys/dev/vte/if_vte.c projects/arm_eabi_vfp/sys/dev/vx/if_vx.c projects/arm_eabi_vfp/sys/dev/vx/if_vx_pci.c projects/arm_eabi_vfp/sys/dev/wb/if_wb.c projects/arm_eabi_vfp/sys/dev/wi/if_wi.c projects/arm_eabi_vfp/sys/dev/wi/if_wi_pccard.c projects/arm_eabi_vfp/sys/dev/wi/if_wi_pci.c projects/arm_eabi_vfp/sys/dev/wl/if_wl.c projects/arm_eabi_vfp/sys/dev/wpi/if_wpi.c projects/arm_eabi_vfp/sys/dev/xe/if_xe.c projects/arm_eabi_vfp/sys/dev/xe/if_xe_pccard.c projects/arm_eabi_vfp/sys/dev/xen/netback/netback.c projects/arm_eabi_vfp/sys/dev/xl/if_xl.c projects/arm_eabi_vfp/sys/dev/xl/xlphy.c projects/arm_eabi_vfp/sys/fs/ext2fs/ext2_vnops.c projects/arm_eabi_vfp/sys/fs/nfs/nfsport.h projects/arm_eabi_vfp/sys/geom/concat/g_concat.c projects/arm_eabi_vfp/sys/geom/concat/g_concat.h projects/arm_eabi_vfp/sys/geom/gate/g_gate.c projects/arm_eabi_vfp/sys/geom/geom.h projects/arm_eabi_vfp/sys/geom/geom_dev.c projects/arm_eabi_vfp/sys/geom/geom_disk.c projects/arm_eabi_vfp/sys/geom/geom_disk.h projects/arm_eabi_vfp/sys/geom/geom_int.h projects/arm_eabi_vfp/sys/geom/geom_io.c projects/arm_eabi_vfp/sys/geom/geom_kern.c projects/arm_eabi_vfp/sys/geom/geom_slice.c projects/arm_eabi_vfp/sys/geom/geom_subr.c projects/arm_eabi_vfp/sys/geom/geom_vfs.c projects/arm_eabi_vfp/sys/geom/mirror/g_mirror.c projects/arm_eabi_vfp/sys/geom/mirror/g_mirror.h projects/arm_eabi_vfp/sys/geom/multipath/g_multipath.c projects/arm_eabi_vfp/sys/geom/nop/g_nop.c projects/arm_eabi_vfp/sys/geom/nop/g_nop.h projects/arm_eabi_vfp/sys/geom/part/g_part.c projects/arm_eabi_vfp/sys/geom/raid/g_raid.c projects/arm_eabi_vfp/sys/geom/raid/md_ddf.c projects/arm_eabi_vfp/sys/geom/raid/md_intel.c projects/arm_eabi_vfp/sys/geom/raid/md_jmicron.c projects/arm_eabi_vfp/sys/geom/raid/md_nvidia.c projects/arm_eabi_vfp/sys/geom/raid/md_promise.c projects/arm_eabi_vfp/sys/geom/raid/md_sii.c projects/arm_eabi_vfp/sys/geom/stripe/g_stripe.c projects/arm_eabi_vfp/sys/geom/stripe/g_stripe.h projects/arm_eabi_vfp/sys/geom/zero/g_zero.c projects/arm_eabi_vfp/sys/kern/kern_conf.c projects/arm_eabi_vfp/sys/kern/kern_event.c projects/arm_eabi_vfp/sys/kern/kern_jail.c projects/arm_eabi_vfp/sys/kern/kern_poll.c projects/arm_eabi_vfp/sys/kern/kern_resource.c projects/arm_eabi_vfp/sys/kern/subr_devstat.c projects/arm_eabi_vfp/sys/kern/subr_taskqueue.c projects/arm_eabi_vfp/sys/kern/sys_socket.c projects/arm_eabi_vfp/sys/kern/uipc_syscalls.c projects/arm_eabi_vfp/sys/kern/vfs_bio.c projects/arm_eabi_vfp/sys/mips/beri/files.beri projects/arm_eabi_vfp/sys/mips/beri/std.beri projects/arm_eabi_vfp/sys/mips/conf/BERI_DE4.hints projects/arm_eabi_vfp/sys/mips/conf/BERI_DE4_MDROOT projects/arm_eabi_vfp/sys/mips/conf/BERI_DE4_SDROOT projects/arm_eabi_vfp/sys/mips/conf/BERI_SIM_MDROOT projects/arm_eabi_vfp/sys/mips/conf/BERI_TEMPLATE projects/arm_eabi_vfp/sys/mips/include/cpufunc.h projects/arm_eabi_vfp/sys/mips/include/pte.h projects/arm_eabi_vfp/sys/mips/mips/cache.c projects/arm_eabi_vfp/sys/mips/mips/cpu.c projects/arm_eabi_vfp/sys/mips/mips/trap.c projects/arm_eabi_vfp/sys/modules/dtrace/Makefile projects/arm_eabi_vfp/sys/modules/dtrace/dtraceall/dtraceall.c projects/arm_eabi_vfp/sys/net/bpf.c projects/arm_eabi_vfp/sys/net/bridgestp.c projects/arm_eabi_vfp/sys/net/ieee8023ad_lacp.c projects/arm_eabi_vfp/sys/net/if_arcsubr.c projects/arm_eabi_vfp/sys/net/if_atmsubr.c projects/arm_eabi_vfp/sys/net/if_clone.c projects/arm_eabi_vfp/sys/net/if_disc.c projects/arm_eabi_vfp/sys/net/if_edsc.c projects/arm_eabi_vfp/sys/net/if_ef.c projects/arm_eabi_vfp/sys/net/if_enc.c projects/arm_eabi_vfp/sys/net/if_epair.c projects/arm_eabi_vfp/sys/net/if_ethersubr.c projects/arm_eabi_vfp/sys/net/if_faith.c projects/arm_eabi_vfp/sys/net/if_fddisubr.c projects/arm_eabi_vfp/sys/net/if_fwsubr.c projects/arm_eabi_vfp/sys/net/if_gif.c projects/arm_eabi_vfp/sys/net/if_gre.c projects/arm_eabi_vfp/sys/net/if_iso88025subr.c projects/arm_eabi_vfp/sys/net/if_loop.c projects/arm_eabi_vfp/sys/net/if_media.h projects/arm_eabi_vfp/sys/net/if_mib.c projects/arm_eabi_vfp/sys/net/if_spppfr.c projects/arm_eabi_vfp/sys/net/if_spppsubr.c projects/arm_eabi_vfp/sys/net/if_stf.c projects/arm_eabi_vfp/sys/net/if_tap.c projects/arm_eabi_vfp/sys/net/if_tun.c projects/arm_eabi_vfp/sys/net/if_vlan.c projects/arm_eabi_vfp/sys/net/pfil.c projects/arm_eabi_vfp/sys/net/raw_cb.c projects/arm_eabi_vfp/sys/net/raw_usrreq.c projects/arm_eabi_vfp/sys/net/route.c projects/arm_eabi_vfp/sys/net/rtsock.c projects/arm_eabi_vfp/sys/net80211/ieee80211.c projects/arm_eabi_vfp/sys/net80211/ieee80211_action.c projects/arm_eabi_vfp/sys/net80211/ieee80211_adhoc.c projects/arm_eabi_vfp/sys/net80211/ieee80211_ageq.c projects/arm_eabi_vfp/sys/net80211/ieee80211_amrr.c projects/arm_eabi_vfp/sys/net80211/ieee80211_ddb.c projects/arm_eabi_vfp/sys/net80211/ieee80211_dfs.c projects/arm_eabi_vfp/sys/net80211/ieee80211_freebsd.c projects/arm_eabi_vfp/sys/net80211/ieee80211_hostap.c projects/arm_eabi_vfp/sys/net80211/ieee80211_ht.c projects/arm_eabi_vfp/sys/net80211/ieee80211_input.c projects/arm_eabi_vfp/sys/net80211/ieee80211_ioctl.c projects/arm_eabi_vfp/sys/net80211/ieee80211_mesh.c projects/arm_eabi_vfp/sys/net80211/ieee80211_monitor.c projects/arm_eabi_vfp/sys/net80211/ieee80211_node.c projects/arm_eabi_vfp/sys/net80211/ieee80211_output.c projects/arm_eabi_vfp/sys/net80211/ieee80211_phy.c projects/arm_eabi_vfp/sys/net80211/ieee80211_power.c projects/arm_eabi_vfp/sys/net80211/ieee80211_proto.c projects/arm_eabi_vfp/sys/net80211/ieee80211_proto.h projects/arm_eabi_vfp/sys/net80211/ieee80211_radiotap.c projects/arm_eabi_vfp/sys/net80211/ieee80211_ratectl.c projects/arm_eabi_vfp/sys/net80211/ieee80211_ratectl_none.c projects/arm_eabi_vfp/sys/net80211/ieee80211_regdomain.c projects/arm_eabi_vfp/sys/net80211/ieee80211_scan.c projects/arm_eabi_vfp/sys/net80211/ieee80211_scan_sta.c projects/arm_eabi_vfp/sys/net80211/ieee80211_wds.c projects/arm_eabi_vfp/sys/netatalk/aarp.c projects/arm_eabi_vfp/sys/netatalk/at_control.c projects/arm_eabi_vfp/sys/netatalk/ddp_input.c projects/arm_eabi_vfp/sys/netatalk/ddp_output.c projects/arm_eabi_vfp/sys/netatalk/ddp_pcb.c projects/arm_eabi_vfp/sys/netatalk/ddp_usrreq.c projects/arm_eabi_vfp/sys/netgraph/netflow/netflow.c projects/arm_eabi_vfp/sys/netgraph/ng_bridge.c projects/arm_eabi_vfp/sys/netgraph/ng_cisco.c projects/arm_eabi_vfp/sys/netgraph/ng_eiface.c projects/arm_eabi_vfp/sys/netgraph/ng_fec.c projects/arm_eabi_vfp/sys/netgraph/ng_iface.c projects/arm_eabi_vfp/sys/netgraph/ng_ipfw.c projects/arm_eabi_vfp/sys/netgraph/ng_one2many.c projects/arm_eabi_vfp/sys/netgraph/ng_sppp.c projects/arm_eabi_vfp/sys/netinet/if_atm.c projects/arm_eabi_vfp/sys/netinet/if_ether.c projects/arm_eabi_vfp/sys/netinet/igmp.c projects/arm_eabi_vfp/sys/netinet/in.h projects/arm_eabi_vfp/sys/netinet/in_gif.c projects/arm_eabi_vfp/sys/netinet/in_mcast.c projects/arm_eabi_vfp/sys/netinet/in_pcb.c projects/arm_eabi_vfp/sys/netinet/in_proto.c projects/arm_eabi_vfp/sys/netinet/in_rmx.c projects/arm_eabi_vfp/sys/netinet/ip_carp.c projects/arm_eabi_vfp/sys/netinet/ip_divert.c projects/arm_eabi_vfp/sys/netinet/ip_gre.c projects/arm_eabi_vfp/sys/netinet/ip_icmp.c projects/arm_eabi_vfp/sys/netinet/ip_ipsec.c projects/arm_eabi_vfp/sys/netinet/ip_mroute.c projects/arm_eabi_vfp/sys/netinet/ip_output.c projects/arm_eabi_vfp/sys/netinet/libalias/alias_db.c projects/arm_eabi_vfp/sys/netinet/raw_ip.c projects/arm_eabi_vfp/sys/netinet/tcp_hostcache.c projects/arm_eabi_vfp/sys/netinet/tcp_input.c projects/arm_eabi_vfp/sys/netinet/tcp_offload.c projects/arm_eabi_vfp/sys/netinet/tcp_reass.c projects/arm_eabi_vfp/sys/netinet/tcp_sack.c projects/arm_eabi_vfp/sys/netinet/tcp_subr.c projects/arm_eabi_vfp/sys/netinet/tcp_syncache.c projects/arm_eabi_vfp/sys/netinet/tcp_timewait.c projects/arm_eabi_vfp/sys/netinet/tcp_usrreq.c projects/arm_eabi_vfp/sys/netinet/udp_usrreq.c projects/arm_eabi_vfp/sys/netinet6/dest6.c projects/arm_eabi_vfp/sys/netinet6/frag6.c projects/arm_eabi_vfp/sys/netinet6/icmp6.c projects/arm_eabi_vfp/sys/netinet6/in6_gif.c projects/arm_eabi_vfp/sys/netinet6/in6_ifattach.c projects/arm_eabi_vfp/sys/netinet6/in6_mcast.c projects/arm_eabi_vfp/sys/netinet6/in6_pcb.c projects/arm_eabi_vfp/sys/netinet6/in6_proto.c projects/arm_eabi_vfp/sys/netinet6/in6_rmx.c projects/arm_eabi_vfp/sys/netinet6/in6_src.c projects/arm_eabi_vfp/sys/netinet6/ip6_forward.c projects/arm_eabi_vfp/sys/netinet6/ip6_id.c projects/arm_eabi_vfp/sys/netinet6/ip6_input.c projects/arm_eabi_vfp/sys/netinet6/ip6_ipsec.c projects/arm_eabi_vfp/sys/netinet6/ip6_mroute.c projects/arm_eabi_vfp/sys/netinet6/ip6_output.c projects/arm_eabi_vfp/sys/netinet6/mld6.c projects/arm_eabi_vfp/sys/netinet6/nd6.c projects/arm_eabi_vfp/sys/netinet6/nd6_rtr.c projects/arm_eabi_vfp/sys/netinet6/raw_ip6.c projects/arm_eabi_vfp/sys/netinet6/route6.c projects/arm_eabi_vfp/sys/netinet6/scope6.c projects/arm_eabi_vfp/sys/netinet6/udp6_usrreq.c projects/arm_eabi_vfp/sys/netipsec/ipsec.c projects/arm_eabi_vfp/sys/netipsec/ipsec_input.c projects/arm_eabi_vfp/sys/netipsec/ipsec_output.c projects/arm_eabi_vfp/sys/netipsec/key.c projects/arm_eabi_vfp/sys/netipsec/keysock.c projects/arm_eabi_vfp/sys/netipsec/xform_ah.c projects/arm_eabi_vfp/sys/netipsec/xform_esp.c projects/arm_eabi_vfp/sys/netipsec/xform_ipip.c projects/arm_eabi_vfp/sys/netipx/ipx.c projects/arm_eabi_vfp/sys/netipx/ipx_input.c projects/arm_eabi_vfp/sys/netipx/ipx_outputfl.c projects/arm_eabi_vfp/sys/netipx/ipx_pcb.c projects/arm_eabi_vfp/sys/netipx/ipx_usrreq.c projects/arm_eabi_vfp/sys/netnatm/natm.c projects/arm_eabi_vfp/sys/netnatm/natm_pcb.c projects/arm_eabi_vfp/sys/netnatm/natm_proto.c projects/arm_eabi_vfp/sys/netpfil/ipfw/ip_dn_io.c projects/arm_eabi_vfp/sys/netpfil/ipfw/ip_dummynet.c projects/arm_eabi_vfp/sys/netpfil/ipfw/ip_fw2.c projects/arm_eabi_vfp/sys/netpfil/ipfw/ip_fw_dynamic.c projects/arm_eabi_vfp/sys/netpfil/ipfw/ip_fw_log.c projects/arm_eabi_vfp/sys/netpfil/ipfw/ip_fw_nat.c projects/arm_eabi_vfp/sys/netpfil/pf/if_pflog.c projects/arm_eabi_vfp/sys/netpfil/pf/if_pfsync.c projects/arm_eabi_vfp/sys/netpfil/pf/pf.c projects/arm_eabi_vfp/sys/netpfil/pf/pf_if.c projects/arm_eabi_vfp/sys/netpfil/pf/pf_ioctl.c projects/arm_eabi_vfp/sys/netpfil/pf/pf_lb.c projects/arm_eabi_vfp/sys/netpfil/pf/pf_osfp.c projects/arm_eabi_vfp/sys/netpfil/pf/pf_ruleset.c projects/arm_eabi_vfp/sys/netpfil/pf/pf_table.c projects/arm_eabi_vfp/sys/nfs/bootp_subr.c projects/arm_eabi_vfp/sys/nfsclient/nfs_vfsops.c projects/arm_eabi_vfp/sys/nfsclient/nfs_vnops.c projects/arm_eabi_vfp/sys/nfsserver/nfs_srvkrpc.c projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/arm_eabi_vfp/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h projects/arm_eabi_vfp/sys/ofed/include/linux/list.h projects/arm_eabi_vfp/sys/pci/if_rl.c projects/arm_eabi_vfp/sys/pci/if_rlreg.h projects/arm_eabi_vfp/sys/powerpc/aim/machdep.c projects/arm_eabi_vfp/sys/powerpc/aim/mmu_oea.c projects/arm_eabi_vfp/sys/powerpc/aim/mmu_oea64.c projects/arm_eabi_vfp/sys/powerpc/aim/mp_cpudep.c projects/arm_eabi_vfp/sys/powerpc/booke/machdep.c projects/arm_eabi_vfp/sys/powerpc/booke/machdep_e500.c projects/arm_eabi_vfp/sys/powerpc/booke/platform_bare.c projects/arm_eabi_vfp/sys/powerpc/booke/pmap.c projects/arm_eabi_vfp/sys/powerpc/include/intr_machdep.h projects/arm_eabi_vfp/sys/powerpc/include/pmap.h projects/arm_eabi_vfp/sys/powerpc/include/psl.h projects/arm_eabi_vfp/sys/powerpc/include/tlb.h projects/arm_eabi_vfp/sys/powerpc/include/trap.h projects/arm_eabi_vfp/sys/powerpc/include/vmparam.h projects/arm_eabi_vfp/sys/powerpc/mpc85xx/atpic.c projects/arm_eabi_vfp/sys/powerpc/mpc85xx/fsl_sdhc.c projects/arm_eabi_vfp/sys/powerpc/mpc85xx/mpc85xx.c projects/arm_eabi_vfp/sys/powerpc/mpc85xx/mpc85xx.h projects/arm_eabi_vfp/sys/powerpc/ofw/ofw_pci.c projects/arm_eabi_vfp/sys/powerpc/ofw/ofw_pci.h projects/arm_eabi_vfp/sys/powerpc/ofw/ofw_pcib_pci.c projects/arm_eabi_vfp/sys/powerpc/ofw/ofw_pcibus.c projects/arm_eabi_vfp/sys/powerpc/powermac/powermac_thermal.c projects/arm_eabi_vfp/sys/powerpc/powerpc/bus_machdep.c projects/arm_eabi_vfp/sys/powerpc/powerpc/exec_machdep.c projects/arm_eabi_vfp/sys/powerpc/powerpc/genassym.c projects/arm_eabi_vfp/sys/powerpc/powerpc/intr_machdep.c projects/arm_eabi_vfp/sys/powerpc/powerpc/pic_if.m projects/arm_eabi_vfp/sys/powerpc/pseries/phyp_llan.c projects/arm_eabi_vfp/sys/powerpc/pseries/platform_chrp.c projects/arm_eabi_vfp/sys/powerpc/pseries/vdevice.c projects/arm_eabi_vfp/sys/security/mac_ifoff/mac_ifoff.c projects/arm_eabi_vfp/sys/sparc64/include/bus.h projects/arm_eabi_vfp/sys/sparc64/include/bus_private.h projects/arm_eabi_vfp/sys/sparc64/pci/fire.c projects/arm_eabi_vfp/sys/sparc64/pci/psycho.c projects/arm_eabi_vfp/sys/sparc64/pci/schizo.c projects/arm_eabi_vfp/sys/sparc64/sbus/sbus.c projects/arm_eabi_vfp/sys/sparc64/sparc64/bus_machdep.c projects/arm_eabi_vfp/sys/sys/ata.h projects/arm_eabi_vfp/sys/sys/eventvar.h projects/arm_eabi_vfp/sys/sys/proc.h projects/arm_eabi_vfp/sys/sys/resource.h projects/arm_eabi_vfp/sys/sys/resourcevar.h projects/arm_eabi_vfp/sys/sys/sdt.h projects/arm_eabi_vfp/sys/ufs/ffs/ffs_extern.h projects/arm_eabi_vfp/sys/ufs/ffs/ffs_softdep.c projects/arm_eabi_vfp/sys/ufs/ffs/ffs_vfsops.c projects/arm_eabi_vfp/sys/ufs/ffs/ffs_vnops.c projects/arm_eabi_vfp/sys/ufs/ffs/softdep.h projects/arm_eabi_vfp/sys/ufs/ufs/dinode.h projects/arm_eabi_vfp/sys/ufs/ufs/ufs_extern.h projects/arm_eabi_vfp/sys/ufs/ufs/ufsmount.h projects/arm_eabi_vfp/sys/x86/x86/io_apic.c projects/arm_eabi_vfp/usr.bin/limits/limits.c projects/arm_eabi_vfp/usr.bin/pathchk/pathchk.c projects/arm_eabi_vfp/usr.bin/procstat/procstat_rlimit.c projects/arm_eabi_vfp/usr.sbin/Makefile projects/arm_eabi_vfp/usr.sbin/bhyve/bhyverun.c projects/arm_eabi_vfp/usr.sbin/bhyve/ioapic.c projects/arm_eabi_vfp/usr.sbin/bhyve/pci_ahci.c projects/arm_eabi_vfp/usr.sbin/bhyve/pci_virtio_block.c projects/arm_eabi_vfp/usr.sbin/bhyveload/bhyveload.c projects/arm_eabi_vfp/usr.sbin/freebsd-update/freebsd-update.sh projects/arm_eabi_vfp/usr.sbin/pkg/Makefile projects/arm_eabi_vfp/usr.sbin/pkg/config.c projects/arm_eabi_vfp/usr.sbin/pkg/config.h projects/arm_eabi_vfp/usr.sbin/pkg/dns_utils.c projects/arm_eabi_vfp/usr.sbin/pkg/dns_utils.h projects/arm_eabi_vfp/usr.sbin/pkg/pkg.c projects/arm_eabi_vfp/usr.sbin/portsnap/portsnap/portsnap.8 projects/arm_eabi_vfp/usr.sbin/portsnap/portsnap/portsnap.sh Directory Properties: projects/arm_eabi_vfp/ (props changed) projects/arm_eabi_vfp/cddl/ (props changed) projects/arm_eabi_vfp/cddl/contrib/opensolaris/ (props changed) projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/arm_eabi_vfp/contrib/binutils/ (props changed) projects/arm_eabi_vfp/contrib/llvm/ (props changed) projects/arm_eabi_vfp/contrib/llvm/tools/clang/ (props changed) projects/arm_eabi_vfp/contrib/subversion/ (props changed) projects/arm_eabi_vfp/lib/libc/ (props changed) projects/arm_eabi_vfp/lib/libutil/ (props changed) projects/arm_eabi_vfp/sbin/ (props changed) projects/arm_eabi_vfp/share/man/man4/ (props changed) projects/arm_eabi_vfp/sys/ (props changed) projects/arm_eabi_vfp/sys/boot/ (props changed) projects/arm_eabi_vfp/sys/cddl/contrib/opensolaris/ (props changed) projects/arm_eabi_vfp/sys/conf/ (props changed) projects/arm_eabi_vfp/usr.bin/procstat/ (props changed) projects/arm_eabi_vfp/usr.sbin/bhyve/ (props changed) projects/arm_eabi_vfp/usr.sbin/bhyveload/ (props changed) Modified: projects/arm_eabi_vfp/Makefile.inc1 ============================================================================== --- projects/arm_eabi_vfp/Makefile.inc1 Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/Makefile.inc1 Sat Oct 26 18:47:10 2013 (r257185) @@ -58,6 +58,7 @@ # use that new version. And the new (dynamically-linked) /bin/sh # will expect to find appropriate libraries in /lib and /libexec. # +SRCDIR?= ${.CURDIR} .if defined(SUBDIR_OVERRIDE) SUBDIR= ${SUBDIR_OVERRIDE} .else @@ -84,6 +85,9 @@ SUBDIR+=secure SUBDIR+=share .endif SUBDIR+=sys usr.bin usr.sbin +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif .if ${MK_OFED} != "no" SUBDIR+=contrib/ofed .endif @@ -128,8 +132,11 @@ OSRELDATE= 0 .endif .if !defined(VERSION) -VERSION!= uname -srp -VERSION+= ${OSRELDATE} +REVISION!= make -C ${SRCDIR}/release -V REVISION +BRANCH!= make -C ${SRCDIR}/release -V BRANCH +SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ + ${SRCDIR}/sys/sys/param.h +VERSION= FreeBSD ${REVISION}-${BRANCH} ${TARGET_ARCH} ${SRCRELDATE} .endif KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 @@ -487,6 +494,10 @@ _worldtmp: mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${WORLDTMP}/usr/lib >/dev/null .endif +.if ${MK_TESTS} != "no" + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ + -p ${WORLDTMP}${TESTSBASE} >/dev/null +.endif .for _mtree in ${LOCAL_MTREE} mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null .endfor @@ -1379,12 +1390,10 @@ _binutils= gnu/usr.bin/binutils # If an full path to an external cross compiler is given, don't build # a cross compiler. .if ${XCC:M/*} == "" && ${MK_CROSS_COMPILER} != "no" -.if ${MK_CLANG} != "no" && (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") +.if (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && ${TARGET} != "pc98" _clang= usr.bin/clang _clang_libs= lib/clang -.endif - -.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98") +.else _cc= gnu/usr.bin/cc .endif .endif @@ -1724,6 +1733,13 @@ delete-old-libs: chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ rm ${RM_I} "${DESTDIR}/$${file}" <&3; \ fi; \ + for ext in debug symbols; do \ + if ! [ -e "${DESTDIR}/$${file}" ] && [ -f \ + "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \ + rm ${RM_I} "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" \ + <&3; \ + fi; \ + done; \ done @echo ">>> Old libraries removed" @@ -1735,6 +1751,11 @@ check-old-libs: if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ echo "${DESTDIR}/$${file}"; \ fi; \ + for ext in debug symbols; do \ + if [ -f "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \ + echo "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}"; \ + fi; \ + done; \ done delete-old-dirs: Modified: projects/arm_eabi_vfp/ObsoleteFiles.inc ============================================================================== --- projects/arm_eabi_vfp/ObsoleteFiles.inc Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/ObsoleteFiles.inc Sat Oct 26 18:47:10 2013 (r257185) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20131023: remove never used iscsi directory +OLD_DIRS+=usr/share/examples/iscsi # 20131014: libbsdyml becomes private OLD_FILES+=usr/lib/libbsdyml.a OLD_FILES+=usr/lib/libbsdyml.so @@ -271,6 +273,7 @@ OLD_FILES+=usr/share/man/man8/dnssec-key OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz +OLD_FILES+=usr/share/man/man8/dnssec-verify.8.gz OLD_FILES+=usr/share/man/man8/genrandom.8.gz OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz OLD_FILES+=usr/share/man/man8/lwresd.8.gz @@ -305,6 +308,8 @@ OLD_DIRS+=var/named/var/run OLD_DIRS+=var/named/var/run/named OLD_DIRS+=var/named/var/stats OLD_DIRS+=var/run/named +# 20130923: example moved +OLD_FILES+=usr/share/examples/bsdconfig/browse_packages.sh # 20130908: libssh becomes private OLD_FILES+=usr/lib/libssh.a OLD_FILES+=usr/lib/libssh.so @@ -2488,6 +2493,7 @@ OLD_FILES+=usr/sbin/zfs OLD_FILES+=usr/sbin/zpool # 20070423: rc.bluetooth (examples) removed OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth +OLD_DIRS+=usr/share/examples/netgraph/bluetooth # 20070421: worm.4 removed OLD_FILES+=usr/share/man/man4/worm.4.gz # 20070417: trunk(4) renamed to lagg(4) Modified: projects/arm_eabi_vfp/UPDATING ============================================================================== --- projects/arm_eabi_vfp/UPDATING Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/UPDATING Sat Oct 26 18:47:10 2013 (r257185) @@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20131025: + The default version of mtree is nmtree which is obtained from + NetBSD. The output is generally the same, but may vary + slightly. If you found you need identical output adding + "-F freebsd9" to the command line should do the trick. For the + time being, the old mtree is available as fmtree. + 20131014: libbsdyml has been renamed to libyaml and moved to /usr/lib/private. This will break ports-mgmt/pkg. Rebuild the port, or upgrade to pkg Modified: projects/arm_eabi_vfp/bin/ps/print.c ============================================================================== --- projects/arm_eabi_vfp/bin/ps/print.c Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/bin/ps/print.c Sat Oct 26 18:47:10 2013 (r257185) @@ -797,8 +797,6 @@ char * emulname(KINFO *k, VARENT *ve __unused) { - if (k->ki_p->ki_emul == NULL) - return (NULL); return (strdup(k->ki_p->ki_emul)); } @@ -827,7 +825,6 @@ out: char * loginclass(KINFO *k, VARENT *ve __unused) { - char *s; /* * Don't display login class for system processes; @@ -837,8 +834,5 @@ loginclass(KINFO *k, VARENT *ve __unused if (k->ki_p->ki_flag & P_SYSTEM) { return (strdup("-")); } - s = k->ki_p->ki_loginclass; - if (s == NULL) - return (NULL); - return (strdup(s)); + return (strdup(k->ki_p->ki_loginclass)); } Modified: projects/arm_eabi_vfp/bin/sh/miscbltin.c ============================================================================== --- projects/arm_eabi_vfp/bin/sh/miscbltin.c Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/bin/sh/miscbltin.c Sat Oct 26 18:47:10 2013 (r257185) @@ -405,6 +405,9 @@ static const struct limits limits[] = { #ifdef RLIMIT_NPTS { "pseudo-terminals", (char *)0, RLIMIT_NPTS, 1, 'p' }, #endif +#ifdef RLIMIT_KQUEUES + { "kqueues", (char *)0, RLIMIT_KQUEUES, 1, 'k' }, +#endif { (char *) 0, (char *)0, 0, 0, '\0' } }; @@ -421,7 +424,7 @@ ulimitcmd(int argc __unused, char **argv struct rlimit limit; what = 'f'; - while ((optc = nextopt("HSatfdsmcnuvlbpw")) != '\0') + while ((optc = nextopt("HSatfdsmcnuvlbpwk")) != '\0') switch (optc) { case 'H': how = HARD; Modified: projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sat Oct 26 18:47:10 2013 (r257185) @@ -25,10 +25,11 @@ .\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved. .\" Copyright (c) 2013 Nexenta Systems, Inc. All Rights Reserved. .\" Copyright (c) 2013, Joyent, Inc. All rights reserved. +.\" Copyright (c) 2013, Steven Hartland .\" .\" $FreeBSD$ .\" -.Dd September 20, 2013 +.Dd October 23, 2013 .Dt ZFS 8 .Os .Sh NAME @@ -61,7 +62,7 @@ .Op , Ns ... .Sm on .Nm -.Cm snapshot +.Cm snapshot Ns | Ns Cm snap .Op Fl r .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ... .Ar filesystem@snapname Ns | Ns Ar volume@snapname @@ -157,7 +158,7 @@ .Op Fl o Ar property Ns Oo , Ns Ar property Oc Ns ... .Fl a | Ar filesystem .Nm -.Cm unmount +.Cm unmount Ns | Ns Cm umount .Op Fl f .Fl a | Ar filesystem Ns | Ns Ar mountpoint .Nm @@ -172,11 +173,11 @@ .Op Fl i Ar snapshot | Fl I Ar snapshot .Ar snapshot .Nm -.Cm receive +.Cm receive Ns | Ns Cm recv .Op Fl vnFu .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Nm -.Cm receive +.Cm receive Ns | Ns Cm recv .Op Fl vnFu .Op Fl d | e .Ar filesystem @@ -1653,7 +1654,7 @@ options, as they can destroy large porti behavior for mounted file systems in use. .It Xo .Nm -.Cm snapshot +.Cm snapshot Ns | Ns Cm snap .Op Fl r .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ... .Ar filesystem@snapname Ns | Ns volume@snapname @@ -1865,7 +1866,7 @@ syntax. A comma-separated list of types to display, where .Ar type is one of -.Sy filesystem , snapshot , volume , No or Sy all . +.Sy filesystem , snapshot , snap, volume , No or Sy all . For example, specifying .Fl t Cm snapshot displays only snapshots. @@ -2194,7 +2195,7 @@ Mount the specified filesystem. .El .It Xo .Nm -.Cm unmount +.Cm unmount Ns | Ns Cm umount .Op Fl f .Fl a | Ar filesystem Ns | Ns Ar mountpoint .Xc @@ -2377,13 +2378,13 @@ on future versions of .Tn ZFS . .It Xo .Nm -.Cm receive +.Cm receive Ns | Ns Cm recv .Op Fl vnFu .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Xc .It Xo .Nm -.Cm receive +.Cm receive Ns | Ns Cm recv .Op Fl vnFu .Op Fl d | e .Ar filesystem Modified: projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sat Oct 26 18:47:10 2013 (r257185) @@ -259,9 +259,9 @@ get_usage(zfs_help_t idx) case HELP_PROMOTE: return (gettext("\tpromote \n")); case HELP_RECEIVE: - return (gettext("\treceive [-vnFu] \n" - "\treceive [-vnFu] [-d | -e] \n")); + "\treceive|recv [-vnFu] [-d | -e] \n")); case HELP_RENAME: return (gettext("\trename [-f] " "\n" @@ -280,10 +280,10 @@ get_usage(zfs_help_t idx) case HELP_SHARE: return (gettext("\tshare <-a | filesystem>\n")); case HELP_SNAPSHOT: - return (gettext("\tsnapshot [-r] [-o property=value] ... " + return (gettext("\tsnapshot|snap [-r] [-o property=value] ... " " ...\n")); case HELP_UNMOUNT: - return (gettext("\tunmount [-f] " + return (gettext("\tunmount|umount [-f] " "<-a | filesystem|mountpoint>\n")); case HELP_UNSHARE: return (gettext("\tunshare " @@ -3027,7 +3027,7 @@ zfs_do_list(int argc, char **argv) flags &= ~ZFS_ITER_PROP_LISTSNAPS; while (*optarg != '\0') { static char *type_subopts[] = { "filesystem", - "volume", "snapshot", "all", NULL }; + "volume", "snapshot", "snap", "all", NULL }; switch (getsubopt(&optarg, type_subopts, &value)) { @@ -3038,9 +3038,10 @@ zfs_do_list(int argc, char **argv) types |= ZFS_TYPE_VOLUME; break; case 2: + case 3: types |= ZFS_TYPE_SNAPSHOT; break; - case 3: + case 4: types = ZFS_TYPE_DATASET; break; @@ -6726,6 +6727,12 @@ main(int argc, char **argv) cmdname = "receive"; /* + * The 'snap' command is an alias for 'snapshot' + */ + if (strcmp(cmdname, "snap") == 0) + cmdname = "snapshot"; + + /* * Special case '-?' */ if (strcmp(cmdname, "-?") == 0) Modified: projects/arm_eabi_vfp/contrib/binutils/gas/config/tc-mips.c ============================================================================== --- projects/arm_eabi_vfp/contrib/binutils/gas/config/tc-mips.c Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/binutils/gas/config/tc-mips.c Sat Oct 26 18:47:10 2013 (r257185) @@ -15420,21 +15420,6 @@ MIPS options:\n\ -mno-octeon-useun generate MIPS unaligned load/store instructions\n")); } -enum dwarf2_format -mips_dwarf2_format (void) -{ - if (HAVE_64BIT_SYMBOLS) - { -#ifdef TE_IRIX - return dwarf2_format_64bit_irix; -#else - return dwarf2_format_64bit; -#endif - } - else - return dwarf2_format_32bit; -} - int mips_dwarf2_addr_size (void) { Modified: projects/arm_eabi_vfp/contrib/binutils/gas/config/tc-mips.h ============================================================================== --- projects/arm_eabi_vfp/contrib/binutils/gas/config/tc-mips.h Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/binutils/gas/config/tc-mips.h Sat Oct 26 18:47:10 2013 (r257185) @@ -155,10 +155,6 @@ extern void mips_emit_delays (void); extern void mips_enable_auto_align (void); #define md_elf_section_change_hook() mips_enable_auto_align() -enum dwarf2_format; -extern enum dwarf2_format mips_dwarf2_format (void); -#define DWARF2_FORMAT() mips_dwarf2_format () - extern int mips_dwarf2_addr_size (void); #define DWARF2_ADDR_SIZE(bfd) mips_dwarf2_addr_size () Modified: projects/arm_eabi_vfp/contrib/gcclibs/libssp/ssp.c ============================================================================== --- projects/arm_eabi_vfp/contrib/gcclibs/libssp/ssp.c Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/gcclibs/libssp/ssp.c Sat Oct 26 18:47:10 2013 (r257185) @@ -128,7 +128,7 @@ fail (const char *msg1, size_t msg1len, #ifdef HAVE_SYSLOG_H /* Only send the error to syslog if there was no tty available. */ else - syslog (LOG_CRIT, msg3); + syslog (LOG_CRIT, "%s", msg3); #endif /* HAVE_SYSLOG_H */ /* Try very hard to exit. Note that signals may be blocked preventing Modified: projects/arm_eabi_vfp/contrib/gperf/src/options.cc ============================================================================== --- projects/arm_eabi_vfp/contrib/gperf/src/options.cc Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/gperf/src/options.cc Sat Oct 26 18:47:10 2013 (r257185) @@ -281,7 +281,7 @@ Options::print_options () const { putchar (*arg); arg++; - if (*arg >= 'A' && *arg <= 'Z' || *arg >= 'a' && *arg <= 'z') + if ( (*arg >= 'A' && *arg <= 'Z') || (*arg >= 'a' && *arg <= 'z') ) { putchar (*arg); arg++; @@ -293,7 +293,9 @@ Options::print_options () const putchar (*arg); arg++; } - while (*arg >= 'A' && *arg <= 'Z' || *arg >= 'a' && *arg <= 'z' || *arg == '-'); + while ( (*arg >= 'A' && *arg <= 'Z') || + (*arg >= 'a' && *arg <= 'z') || + *arg == '-'); if (*arg == '=') { putchar (*arg); Modified: projects/arm_eabi_vfp/contrib/gperf/src/search.cc ============================================================================== --- projects/arm_eabi_vfp/contrib/gperf/src/search.cc Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/gperf/src/search.cc Sat Oct 26 18:47:10 2013 (r257185) @@ -36,7 +36,10 @@ /* ============================== Portability ============================== */ /* Assume ISO C++ 'for' scoping rule. */ -#define for if (0) ; else for +/* This code is used to work around scoping issues with visual studio 6 from + * 1998. Comment it out here to queisce numerous -Wdangling-else warnings + * from clang. +#define for if (0) ; else for */ /* Dynamically allocated array with dynamic extent: Modified: projects/arm_eabi_vfp/contrib/jemalloc/ChangeLog ============================================================================== --- projects/arm_eabi_vfp/contrib/jemalloc/ChangeLog Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/jemalloc/ChangeLog Sat Oct 26 18:47:10 2013 (r257185) @@ -6,6 +6,21 @@ found in the git revision history: http://www.canonware.com/cgi-bin/gitweb.cgi?p=jemalloc.git git://canonware.com/jemalloc.git +* 3.4.1 (October 20, 2013) + + Bug fixes: + - Fix a race in the "arenas.extend" mallctl that could cause memory corruption + of internal data structures and subsequent crashes. + - Fix Valgrind integration flaws that caused Valgrind warnings about reads of + uninitialized memory in: + + arena chunk headers + + internal zero-initialized data structures (relevant to tcache and prof + code) + - Preserve errno during the first allocation. A readlink(2) call during + initialization fails unless /etc/malloc.conf exists, so errno was typically + set during the first allocation prior to this fix. + - Fix compilation warnings reported by gcc 4.8.1. + * 3.4.0 (June 2, 2013) This version is essentially a small bugfix release, but the addition of @@ -60,7 +75,7 @@ found in the git revision history: Bug fixes: - Fix "arenas.extend" mallctl to output the number of arenas. - - Fix chunk_recycyle() to unconditionally inform Valgrind that returned memory + - Fix chunk_recycle() to unconditionally inform Valgrind that returned memory is undefined. - Fix build break on FreeBSD related to alloca.h. Modified: projects/arm_eabi_vfp/contrib/jemalloc/FREEBSD-diffs ============================================================================== --- projects/arm_eabi_vfp/contrib/jemalloc/FREEBSD-diffs Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/jemalloc/FREEBSD-diffs Sat Oct 26 18:47:10 2013 (r257185) @@ -45,7 +45,7 @@ index abd5e6f..1d7491a 100644 + diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in -index e46ac54..527449d 100644 +index 53c135c..c547339 100644 --- a/include/jemalloc/internal/jemalloc_internal.h.in +++ b/include/jemalloc/internal/jemalloc_internal.h.in @@ -1,5 +1,8 @@ @@ -97,10 +97,10 @@ index de44e14..564d604 100644 bool malloc_mutex_init(malloc_mutex_t *mutex); diff --git a/include/jemalloc/internal/private_namespace.h b/include/jemalloc/internal/private_namespace.h -index 65de316..366676b 100644 +index cdb0b0e..2a98d1f 100644 --- a/include/jemalloc/internal/private_namespace.h +++ b/include/jemalloc/internal/private_namespace.h -@@ -216,7 +216,6 @@ +@@ -218,7 +218,6 @@ #define iralloc JEMALLOC_N(iralloc) #define irallocx JEMALLOC_N(irallocx) #define isalloc JEMALLOC_N(isalloc) @@ -244,7 +244,7 @@ index 0000000..e6c8407 +#endif + diff --git a/src/jemalloc.c b/src/jemalloc.c -index bc350ed..352c98e 100644 +index ae56db6..1412a5e 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -8,6 +8,10 @@ malloc_tsd_data(, arenas, arena_t *, NULL) Modified: projects/arm_eabi_vfp/contrib/jemalloc/FREEBSD-upgrade ============================================================================== --- projects/arm_eabi_vfp/contrib/jemalloc/FREEBSD-upgrade Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/jemalloc/FREEBSD-upgrade Sat Oct 26 18:47:10 2013 (r257185) @@ -60,7 +60,7 @@ do_extract() { local rev=$1 # Clone. rm -rf ${work} - git clone git://canonware.com/jemalloc.git ${work} + git clone https://github.com/jemalloc/jemalloc.git ${work} ( cd ${work} if [ "x${rev}" != "x" ] ; then Modified: projects/arm_eabi_vfp/contrib/jemalloc/VERSION ============================================================================== --- projects/arm_eabi_vfp/contrib/jemalloc/VERSION Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/jemalloc/VERSION Sat Oct 26 18:47:10 2013 (r257185) @@ -1 +1 @@ -3.4.0-0-g0ed518e5dab789ad2171bb38977a8927e2a26775 +3.4.1-0-g0135fb806e4137dc9cdf152541926a2bc95e33f0 Modified: projects/arm_eabi_vfp/contrib/jemalloc/doc/jemalloc.3 ============================================================================== --- projects/arm_eabi_vfp/contrib/jemalloc/doc/jemalloc.3 Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/jemalloc/doc/jemalloc.3 Sat Oct 26 18:47:10 2013 (r257185) @@ -2,12 +2,12 @@ .\" Title: JEMALLOC .\" Author: Jason Evans .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 06/02/2013 +.\" Date: 10/20/2013 .\" Manual: User Manual -.\" Source: jemalloc 3.4.0-0-g0ed518e5dab789ad2171bb38977a8927e2a26775 +.\" Source: jemalloc 3.4.1-0-g0135fb806e4137dc9cdf152541926a2bc95e33f0 .\" Language: English .\" -.TH "JEMALLOC" "3" "06/02/2013" "jemalloc 3.4.0-0-g0ed518e5dab7" "User Manual" +.TH "JEMALLOC" "3" "10/20/2013" "jemalloc 3.4.1-0-g0135fb806e41" "User Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ jemalloc \- general purpose memory allocation functions .SH "LIBRARY" .PP -This manual describes jemalloc 3\&.4\&.0\-0\-g0ed518e5dab789ad2171bb38977a8927e2a26775\&. More information can be found at the +This manual describes jemalloc 3\&.4\&.1\-0\-g0135fb806e4137dc9cdf152541926a2bc95e33f0\&. More information can be found at the \m[blue]\fBjemalloc website\fR\m[]\&\s-2\u[1]\d\s+2\&. .PP The following configuration options are enabled in libc\*(Aqs built\-in jemalloc: Modified: projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/arena.h ============================================================================== --- projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/arena.h Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/arena.h Sat Oct 26 18:47:10 2013 (r257185) @@ -441,6 +441,7 @@ void arena_postfork_child(arena_t *arena #ifndef JEMALLOC_ENABLE_INLINE arena_chunk_map_t *arena_mapp_get(arena_chunk_t *chunk, size_t pageind); size_t *arena_mapbitsp_get(arena_chunk_t *chunk, size_t pageind); +size_t arena_mapbitsp_read(size_t *mapbitsp); size_t arena_mapbits_get(arena_chunk_t *chunk, size_t pageind); size_t arena_mapbits_unallocated_size_get(arena_chunk_t *chunk, size_t pageind); @@ -451,6 +452,7 @@ size_t arena_mapbits_dirty_get(arena_chu size_t arena_mapbits_unzeroed_get(arena_chunk_t *chunk, size_t pageind); size_t arena_mapbits_large_get(arena_chunk_t *chunk, size_t pageind); size_t arena_mapbits_allocated_get(arena_chunk_t *chunk, size_t pageind); +void arena_mapbitsp_write(size_t *mapbitsp, size_t mapbits); void arena_mapbits_unallocated_set(arena_chunk_t *chunk, size_t pageind, size_t size, size_t flags); void arena_mapbits_unallocated_size_set(arena_chunk_t *chunk, size_t pageind, @@ -498,10 +500,17 @@ arena_mapbitsp_get(arena_chunk_t *chunk, } JEMALLOC_ALWAYS_INLINE size_t +arena_mapbitsp_read(size_t *mapbitsp) +{ + + return (*mapbitsp); +} + +JEMALLOC_ALWAYS_INLINE size_t arena_mapbits_get(arena_chunk_t *chunk, size_t pageind) { - return (*arena_mapbitsp_get(chunk, pageind)); + return (arena_mapbitsp_read(arena_mapbitsp_get(chunk, pageind))); } JEMALLOC_ALWAYS_INLINE size_t @@ -585,82 +594,89 @@ arena_mapbits_allocated_get(arena_chunk_ } JEMALLOC_ALWAYS_INLINE void +arena_mapbitsp_write(size_t *mapbitsp, size_t mapbits) +{ + + *mapbitsp = mapbits; +} + +JEMALLOC_ALWAYS_INLINE void arena_mapbits_unallocated_set(arena_chunk_t *chunk, size_t pageind, size_t size, size_t flags) { - size_t *mapbitsp; + size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind); - mapbitsp = arena_mapbitsp_get(chunk, pageind); assert((size & PAGE_MASK) == 0); assert((flags & ~CHUNK_MAP_FLAGS_MASK) == 0); assert((flags & (CHUNK_MAP_DIRTY|CHUNK_MAP_UNZEROED)) == flags); - *mapbitsp = size | CHUNK_MAP_BININD_INVALID | flags; + arena_mapbitsp_write(mapbitsp, size | CHUNK_MAP_BININD_INVALID | flags); } JEMALLOC_ALWAYS_INLINE void arena_mapbits_unallocated_size_set(arena_chunk_t *chunk, size_t pageind, size_t size) { - size_t *mapbitsp; + size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind); + size_t mapbits = arena_mapbitsp_read(mapbitsp); - mapbitsp = arena_mapbitsp_get(chunk, pageind); assert((size & PAGE_MASK) == 0); - assert((*mapbitsp & (CHUNK_MAP_LARGE|CHUNK_MAP_ALLOCATED)) == 0); - *mapbitsp = size | (*mapbitsp & PAGE_MASK); + assert((mapbits & (CHUNK_MAP_LARGE|CHUNK_MAP_ALLOCATED)) == 0); + arena_mapbitsp_write(mapbitsp, size | (mapbits & PAGE_MASK)); } JEMALLOC_ALWAYS_INLINE void arena_mapbits_large_set(arena_chunk_t *chunk, size_t pageind, size_t size, size_t flags) { - size_t *mapbitsp; + size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind); + size_t mapbits = arena_mapbitsp_read(mapbitsp); size_t unzeroed; - mapbitsp = arena_mapbitsp_get(chunk, pageind); assert((size & PAGE_MASK) == 0); assert((flags & CHUNK_MAP_DIRTY) == flags); - unzeroed = *mapbitsp & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */ - *mapbitsp = size | CHUNK_MAP_BININD_INVALID | flags | unzeroed | - CHUNK_MAP_LARGE | CHUNK_MAP_ALLOCATED; + unzeroed = mapbits & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */ + arena_mapbitsp_write(mapbitsp, size | CHUNK_MAP_BININD_INVALID | flags + | unzeroed | CHUNK_MAP_LARGE | CHUNK_MAP_ALLOCATED); } JEMALLOC_ALWAYS_INLINE void arena_mapbits_large_binind_set(arena_chunk_t *chunk, size_t pageind, size_t binind) { - size_t *mapbitsp; + size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind); + size_t mapbits = arena_mapbitsp_read(mapbitsp); assert(binind <= BININD_INVALID); - mapbitsp = arena_mapbitsp_get(chunk, pageind); assert(arena_mapbits_large_size_get(chunk, pageind) == PAGE); - *mapbitsp = (*mapbitsp & ~CHUNK_MAP_BININD_MASK) | (binind << - CHUNK_MAP_BININD_SHIFT); + arena_mapbitsp_write(mapbitsp, (mapbits & ~CHUNK_MAP_BININD_MASK) | + (binind << CHUNK_MAP_BININD_SHIFT)); } JEMALLOC_ALWAYS_INLINE void arena_mapbits_small_set(arena_chunk_t *chunk, size_t pageind, size_t runind, size_t binind, size_t flags) { - size_t *mapbitsp; + size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind); + size_t mapbits = arena_mapbitsp_read(mapbitsp); size_t unzeroed; assert(binind < BININD_INVALID); - mapbitsp = arena_mapbitsp_get(chunk, pageind); assert(pageind - runind >= map_bias); assert((flags & CHUNK_MAP_DIRTY) == flags); - unzeroed = *mapbitsp & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */ - *mapbitsp = (runind << LG_PAGE) | (binind << CHUNK_MAP_BININD_SHIFT) | - flags | unzeroed | CHUNK_MAP_ALLOCATED; + unzeroed = mapbits & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */ + arena_mapbitsp_write(mapbitsp, (runind << LG_PAGE) | (binind << + CHUNK_MAP_BININD_SHIFT) | flags | unzeroed | CHUNK_MAP_ALLOCATED); } JEMALLOC_ALWAYS_INLINE void arena_mapbits_unzeroed_set(arena_chunk_t *chunk, size_t pageind, size_t unzeroed) { - size_t *mapbitsp; + size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind); + size_t mapbits = arena_mapbitsp_read(mapbitsp); - mapbitsp = arena_mapbitsp_get(chunk, pageind); - *mapbitsp = (*mapbitsp & ~CHUNK_MAP_UNZEROED) | unzeroed; + arena_mapbitsp_write(mapbitsp, (mapbits & ~CHUNK_MAP_UNZEROED) | + unzeroed); } JEMALLOC_INLINE bool Modified: projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h ============================================================================== --- projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h Sat Oct 26 18:47:10 2013 (r257185) @@ -232,9 +232,18 @@ static const bool config_ivsalloc = # define __DECONST(type, var) ((type)(uintptr_t)(const void *)(var)) #endif +/* + * JEMALLOC_ALWAYS_INLINE is used within header files for functions that are + * static inline functions if inlining is enabled, and single-definition + * library-private functions if inlining is disabled. + * + * JEMALLOC_ALWAYS_INLINE_C is for use in .c files, in which case the denoted + * functions are always static, regardless of whether inlining is enabled. + */ #ifdef JEMALLOC_DEBUG /* Disable inlining to make debugging easier. */ # define JEMALLOC_ALWAYS_INLINE +# define JEMALLOC_ALWAYS_INLINE_C static # define JEMALLOC_INLINE # define inline #else @@ -242,8 +251,11 @@ static const bool config_ivsalloc = # ifdef JEMALLOC_HAVE_ATTR # define JEMALLOC_ALWAYS_INLINE \ static inline JEMALLOC_ATTR(unused) JEMALLOC_ATTR(always_inline) +# define JEMALLOC_ALWAYS_INLINE_C \ + static inline JEMALLOC_ATTR(always_inline) # else # define JEMALLOC_ALWAYS_INLINE static inline +# define JEMALLOC_ALWAYS_INLINE_C static inline # endif # define JEMALLOC_INLINE static inline # ifdef _MSC_VER Modified: projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/private_namespace.h ============================================================================== --- projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/private_namespace.h Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/private_namespace.h Sat Oct 26 18:47:10 2013 (r257185) @@ -33,6 +33,8 @@ #define arena_mapbits_unzeroed_get JEMALLOC_N(arena_mapbits_unzeroed_get) #define arena_mapbits_unzeroed_set JEMALLOC_N(arena_mapbits_unzeroed_set) #define arena_mapbitsp_get JEMALLOC_N(arena_mapbitsp_get) +#define arena_mapbitsp_read JEMALLOC_N(arena_mapbitsp_read) +#define arena_mapbitsp_write JEMALLOC_N(arena_mapbitsp_write) #define arena_mapp_get JEMALLOC_N(arena_mapp_get) #define arena_maxclass JEMALLOC_N(arena_maxclass) #define arena_new JEMALLOC_N(arena_new) Modified: projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/tcache.h ============================================================================== --- projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/tcache.h Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/internal/tcache.h Sat Oct 26 18:47:10 2013 (r257185) @@ -313,6 +313,7 @@ tcache_alloc_small(tcache_t *tcache, siz } else if (opt_zero) memset(ret, 0, size); } + VALGRIND_MAKE_MEM_UNDEFINED(ret, size); } else { if (config_fill && opt_junk) { arena_alloc_junk_small(ret, &arena_bin_info[binind], @@ -321,7 +322,6 @@ tcache_alloc_small(tcache_t *tcache, siz VALGRIND_MAKE_MEM_UNDEFINED(ret, size); memset(ret, 0, size); } - VALGRIND_MAKE_MEM_UNDEFINED(ret, size); if (config_stats) tbin->tstats.nrequests++; @@ -368,11 +368,11 @@ tcache_alloc_large(tcache_t *tcache, siz else if (opt_zero) memset(ret, 0, size); } + VALGRIND_MAKE_MEM_UNDEFINED(ret, size); } else { VALGRIND_MAKE_MEM_UNDEFINED(ret, size); memset(ret, 0, size); } - VALGRIND_MAKE_MEM_UNDEFINED(ret, size); if (config_stats) tbin->tstats.nrequests++; Modified: projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/jemalloc.h ============================================================================== --- projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/jemalloc.h Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/jemalloc/include/jemalloc/jemalloc.h Sat Oct 26 18:47:10 2013 (r257185) @@ -7,12 +7,12 @@ extern "C" { #include #include -#define JEMALLOC_VERSION "3.4.0-0-g0ed518e5dab789ad2171bb38977a8927e2a26775" +#define JEMALLOC_VERSION "3.4.1-0-g0135fb806e4137dc9cdf152541926a2bc95e33f0" #define JEMALLOC_VERSION_MAJOR 3 #define JEMALLOC_VERSION_MINOR 4 -#define JEMALLOC_VERSION_BUGFIX 0 +#define JEMALLOC_VERSION_BUGFIX 1 #define JEMALLOC_VERSION_NREV 0 -#define JEMALLOC_VERSION_GID "0ed518e5dab789ad2171bb38977a8927e2a26775" +#define JEMALLOC_VERSION_GID "0135fb806e4137dc9cdf152541926a2bc95e33f0" #include "jemalloc_defs.h" #include "jemalloc_FreeBSD.h" Modified: projects/arm_eabi_vfp/contrib/jemalloc/src/arena.c ============================================================================== --- projects/arm_eabi_vfp/contrib/jemalloc/src/arena.c Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/jemalloc/src/arena.c Sat Oct 26 18:47:10 2013 (r257185) @@ -369,13 +369,20 @@ arena_run_zero(arena_chunk_t *chunk, siz } static inline void +arena_run_page_mark_zeroed(arena_chunk_t *chunk, size_t run_ind) +{ + + VALGRIND_MAKE_MEM_DEFINED((void *)((uintptr_t)chunk + (run_ind << + LG_PAGE)), PAGE); +} + +static inline void arena_run_page_validate_zeroed(arena_chunk_t *chunk, size_t run_ind) { size_t i; UNUSED size_t *p = (size_t *)((uintptr_t)chunk + (run_ind << LG_PAGE)); - VALGRIND_MAKE_MEM_DEFINED((void *)((uintptr_t)chunk + (run_ind << - LG_PAGE)), PAGE); + arena_run_page_mark_zeroed(chunk, run_ind); for (i = 0; i < PAGE / sizeof(size_t); i++) assert(p[i] == 0); } @@ -458,6 +465,9 @@ arena_run_split(arena_t *arena, arena_ru } else if (config_debug) { arena_run_page_validate_zeroed( chunk, run_ind+i); + } else { + arena_run_page_mark_zeroed( + chunk, run_ind+i); } } } else { @@ -467,6 +477,9 @@ arena_run_split(arena_t *arena, arena_ru */ arena_run_zero(chunk, run_ind, need_pages); } + } else { + VALGRIND_MAKE_MEM_UNDEFINED((void *)((uintptr_t)chunk + + (run_ind << LG_PAGE)), (need_pages << LG_PAGE)); } /* @@ -508,9 +521,9 @@ arena_run_split(arena_t *arena, arena_ru arena_run_page_validate_zeroed(chunk, run_ind+need_pages-1); } + VALGRIND_MAKE_MEM_UNDEFINED((void *)((uintptr_t)chunk + + (run_ind << LG_PAGE)), (need_pages << LG_PAGE)); } - VALGRIND_MAKE_MEM_UNDEFINED((void *)((uintptr_t)chunk + (run_ind << - LG_PAGE)), (need_pages << LG_PAGE)); } static arena_chunk_t * @@ -569,17 +582,24 @@ arena_chunk_alloc(arena_t *arena) * unless the chunk is not zeroed. */ if (zero == false) { + VALGRIND_MAKE_MEM_UNDEFINED( + (void *)arena_mapp_get(chunk, map_bias+1), + (size_t)((uintptr_t) arena_mapp_get(chunk, + chunk_npages-1) - (uintptr_t)arena_mapp_get(chunk, + map_bias+1))); for (i = map_bias+1; i < chunk_npages-1; i++) arena_mapbits_unzeroed_set(chunk, i, unzeroed); - } else if (config_debug) { + } else { VALGRIND_MAKE_MEM_DEFINED( (void *)arena_mapp_get(chunk, map_bias+1), - (void *)((uintptr_t) - arena_mapp_get(chunk, chunk_npages-1) - - (uintptr_t)arena_mapp_get(chunk, map_bias+1))); - for (i = map_bias+1; i < chunk_npages-1; i++) { - assert(arena_mapbits_unzeroed_get(chunk, i) == - unzeroed); + (size_t)((uintptr_t) arena_mapp_get(chunk, + chunk_npages-1) - (uintptr_t)arena_mapp_get(chunk, + map_bias+1))); + if (config_debug) { + for (i = map_bias+1; i < chunk_npages-1; i++) { + assert(arena_mapbits_unzeroed_get(chunk, + i) == unzeroed); + } } } arena_mapbits_unallocated_set(chunk, chunk_npages-1, @@ -1458,6 +1478,7 @@ arena_malloc_small(arena_t *arena, size_ } else if (opt_zero) memset(ret, 0, size); } + VALGRIND_MAKE_MEM_UNDEFINED(ret, size); } else { if (config_fill && opt_junk) { arena_alloc_junk_small(ret, &arena_bin_info[binind], @@ -1466,7 +1487,6 @@ arena_malloc_small(arena_t *arena, size_ VALGRIND_MAKE_MEM_UNDEFINED(ret, size); memset(ret, 0, size); } - VALGRIND_MAKE_MEM_UNDEFINED(ret, size); return (ret); } Modified: projects/arm_eabi_vfp/contrib/jemalloc/src/chunk.c ============================================================================== --- projects/arm_eabi_vfp/contrib/jemalloc/src/chunk.c Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/jemalloc/src/chunk.c Sat Oct 26 18:47:10 2013 (r257185) @@ -294,7 +294,7 @@ label_return: if (xnode != NULL) base_node_dealloc(xnode); if (xprev != NULL) - base_node_dealloc(prev); + base_node_dealloc(xprev); } void Modified: projects/arm_eabi_vfp/contrib/jemalloc/src/ctl.c ============================================================================== --- projects/arm_eabi_vfp/contrib/jemalloc/src/ctl.c Sat Oct 26 18:40:17 2013 (r257184) +++ projects/arm_eabi_vfp/contrib/jemalloc/src/ctl.c Sat Oct 26 18:47:10 2013 (r257185) @@ -546,43 +546,30 @@ ctl_arena_refresh(arena_t *arena, unsign static bool ctl_grow(void) { - size_t astats_size; ctl_arena_stats_t *astats; arena_t **tarenas; - /* Extend arena stats and arenas arrays. */ - astats_size = (ctl_stats.narenas + 2) * sizeof(ctl_arena_stats_t); - if (ctl_stats.narenas == narenas_auto) { - /* ctl_stats.arenas and arenas came from base_alloc(). */ - astats = (ctl_arena_stats_t *)imalloc(astats_size); - if (astats == NULL) - return (true); - memcpy(astats, ctl_stats.arenas, (ctl_stats.narenas + 1) * - sizeof(ctl_arena_stats_t)); - - tarenas = (arena_t **)imalloc((ctl_stats.narenas + 1) * - sizeof(arena_t *)); - if (tarenas == NULL) { - idalloc(astats); - return (true); - } - memcpy(tarenas, arenas, ctl_stats.narenas * sizeof(arena_t *)); - } else { - astats = (ctl_arena_stats_t *)iralloc(ctl_stats.arenas, - astats_size, 0, 0, false, false); - if (astats == NULL) - return (true); - - tarenas = (arena_t **)iralloc(arenas, (ctl_stats.narenas + 1) * - sizeof(arena_t *), 0, 0, false, false); - if (tarenas == NULL) - return (true); + /* Allocate extended arena stats and arenas arrays. */ + astats = (ctl_arena_stats_t *)imalloc((ctl_stats.narenas + 2) * + sizeof(ctl_arena_stats_t)); + if (astats == NULL) + return (true); + tarenas = (arena_t **)imalloc((ctl_stats.narenas + 1) * + sizeof(arena_t *)); + if (tarenas == NULL) { + idalloc(astats); + return (true); } - /* Initialize the new astats and arenas elements. */ + + /* Initialize the new astats element. */ + memcpy(astats, ctl_stats.arenas, (ctl_stats.narenas + 1) * + sizeof(ctl_arena_stats_t)); memset(&astats[ctl_stats.narenas + 1], 0, sizeof(ctl_arena_stats_t)); - if (ctl_arena_init(&astats[ctl_stats.narenas + 1])) + if (ctl_arena_init(&astats[ctl_stats.narenas + 1])) { + idalloc(tarenas); + idalloc(astats); return (true); - tarenas[ctl_stats.narenas] = NULL; + } /* Swap merged stats to their new location. */ { ctl_arena_stats_t tstats; @@ -593,13 +580,34 @@ ctl_grow(void) memcpy(&astats[ctl_stats.narenas + 1], &tstats, sizeof(ctl_arena_stats_t)); } + /* Initialize the new arenas element. */ + tarenas[ctl_stats.narenas] = NULL; + { + arena_t **arenas_old = arenas; + /* + * Swap extended arenas array into place. Although ctl_mtx + * protects this function from other threads extending the + * array, it does not protect from other threads mutating it + * (i.e. initializing arenas and setting array elements to + * point to them). Therefore, array copying must happen under + * the protection of arenas_lock. + */ + malloc_mutex_lock(&arenas_lock); + arenas = tarenas; + memcpy(arenas, arenas_old, ctl_stats.narenas * + sizeof(arena_t *)); + narenas_total++; + arenas_extend(narenas_total - 1); + malloc_mutex_unlock(&arenas_lock); + /* + * Deallocate arenas_old only if it came from imalloc() (not + * base_alloc()). + */ + if (ctl_stats.narenas != narenas_auto) + idalloc(arenas_old); + } ctl_stats.arenas = astats; ctl_stats.narenas++; - malloc_mutex_lock(&arenas_lock); - arenas = tarenas; - narenas_total++; - arenas_extend(narenas_total - 1); - malloc_mutex_unlock(&arenas_lock); return (false); } @@ -1109,7 +1117,7 @@ epoch_ctl(const size_t *mib, size_t mibl void *newp, size_t newlen) { int ret; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sat Oct 26 19:04:53 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E21B24E5; Sat, 26 Oct 2013 19:04:53 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CAE172DBC; Sat, 26 Oct 2013 19:04:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9QJ4rTL093552; Sat, 26 Oct 2013 19:04:53 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9QJ4iKg093491; Sat, 26 Oct 2013 19:04:44 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201310261904.r9QJ4iKg093491@svn.freebsd.org> From: Gleb Smirnoff Date: Sat, 26 Oct 2013 19:04:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257188 - in projects/ifnet: contrib/libpcap sbin/mdconfig sys/contrib/altq/altq sys/dev/mii sys/dev/uart sys/dev/usb/net sys/dev/xl sys/net X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Oct 2013 19:04:54 -0000 Author: glebius Date: Sat Oct 26 19:04:43 2013 New Revision: 257188 URL: http://svnweb.freebsd.org/changeset/base/257188 Log: Merge head r256150 through r257186. Added: projects/ifnet/sys/net/pf.h - copied unchanged from r257186, head/sys/net/pf.h projects/ifnet/sys/net/pf_altq.h - copied unchanged from r257186, head/sys/net/pf_altq.h Modified: projects/ifnet/contrib/libpcap/grammar.y projects/ifnet/sbin/mdconfig/mdconfig.8 projects/ifnet/sys/contrib/altq/altq/altq_cbq.c projects/ifnet/sys/contrib/altq/altq/altq_cdnr.c projects/ifnet/sys/contrib/altq/altq/altq_hfsc.c projects/ifnet/sys/contrib/altq/altq/altq_priq.c projects/ifnet/sys/contrib/altq/altq/altq_red.c projects/ifnet/sys/contrib/altq/altq/altq_rio.c projects/ifnet/sys/contrib/altq/altq/altq_rmclass.c projects/ifnet/sys/contrib/altq/altq/altq_subr.c projects/ifnet/sys/dev/mii/acphy.c projects/ifnet/sys/dev/mii/amphy.c projects/ifnet/sys/dev/mii/atphy.c projects/ifnet/sys/dev/mii/axphy.c projects/ifnet/sys/dev/mii/bmtphy.c projects/ifnet/sys/dev/mii/brgphy.c projects/ifnet/sys/dev/mii/ciphy.c projects/ifnet/sys/dev/mii/e1000phy.c projects/ifnet/sys/dev/mii/gentbi.c projects/ifnet/sys/dev/mii/icsphy.c projects/ifnet/sys/dev/mii/ip1000phy.c projects/ifnet/sys/dev/mii/jmphy.c projects/ifnet/sys/dev/mii/lxtphy.c projects/ifnet/sys/dev/mii/mii_physubr.c projects/ifnet/sys/dev/mii/mlphy.c projects/ifnet/sys/dev/mii/nsgphy.c projects/ifnet/sys/dev/mii/nsphy.c projects/ifnet/sys/dev/mii/nsphyter.c projects/ifnet/sys/dev/mii/pnaphy.c projects/ifnet/sys/dev/mii/qsphy.c projects/ifnet/sys/dev/mii/rdcphy.c projects/ifnet/sys/dev/mii/rgephy.c projects/ifnet/sys/dev/mii/rlphy.c projects/ifnet/sys/dev/mii/rlswitch.c projects/ifnet/sys/dev/mii/smcphy.c projects/ifnet/sys/dev/mii/smscphy.c projects/ifnet/sys/dev/mii/tdkphy.c projects/ifnet/sys/dev/mii/tlphy.c projects/ifnet/sys/dev/mii/truephy.c projects/ifnet/sys/dev/mii/ukphy.c projects/ifnet/sys/dev/mii/xmphy.c projects/ifnet/sys/dev/uart/uart_cpu_fdt.c projects/ifnet/sys/dev/usb/net/ruephy.c projects/ifnet/sys/dev/xl/xlphy.c projects/ifnet/sys/net/pfvar.h Directory Properties: projects/ifnet/ (props changed) projects/ifnet/contrib/libpcap/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/sys/ (props changed) Modified: projects/ifnet/contrib/libpcap/grammar.y ============================================================================== --- projects/ifnet/contrib/libpcap/grammar.y Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/contrib/libpcap/grammar.y Sat Oct 26 19:04:43 2013 (r257188) @@ -56,7 +56,7 @@ struct rtentry; #include "gencode.h" #ifdef HAVE_NET_PFVAR_H #include -#include +#include #include #endif #include "ieee80211.h" Modified: projects/ifnet/sbin/mdconfig/mdconfig.8 ============================================================================== --- projects/ifnet/sbin/mdconfig/mdconfig.8 Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sbin/mdconfig/mdconfig.8 Sat Oct 26 19:04:43 2013 (r257188) @@ -41,7 +41,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 20, 2013 +.Dd October 26, 2013 .Dt MDCONFIG 8 .Os .Sh NAME Modified: projects/ifnet/sys/contrib/altq/altq/altq_cbq.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_cbq.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_cbq.c Sat Oct 26 19:04:43 2013 (r257188) @@ -54,9 +54,12 @@ #endif #include +#include #include -#include +#include +#include +#include #include #include #ifdef ALTQ3_COMPAT Modified: projects/ifnet/sys/contrib/altq/altq/altq_cdnr.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_cdnr.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_cdnr.c Sat Oct 26 19:04:43 2013 (r257188) @@ -55,6 +55,7 @@ #include #endif +#include #include #ifdef ALTQ3_COMPAT #include Modified: projects/ifnet/sys/contrib/altq/altq/altq_hfsc.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_hfsc.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_hfsc.c Sat Oct 26 19:04:43 2013 (r257188) @@ -66,9 +66,12 @@ #endif /* ALTQ3_COMPAT */ #include +#include #include -#include +#include +#include +#include #include #include #ifdef ALTQ3_COMPAT Modified: projects/ifnet/sys/contrib/altq/altq/altq_priq.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_priq.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_priq.c Sat Oct 26 19:04:43 2013 (r257188) @@ -51,9 +51,12 @@ #include #include +#include #include -#include +#include +#include +#include #include #ifdef ALTQ3_COMPAT #include Modified: projects/ifnet/sys/contrib/altq/altq/altq_red.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_red.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_red.c Sat Oct 26 19:04:43 2013 (r257188) @@ -86,6 +86,7 @@ #endif /* ALTQ3_COMPAT */ #include +#include #include #include @@ -94,7 +95,9 @@ #include #endif -#include +#include +#include +#include #include #include #ifdef ALTQ3_COMPAT Modified: projects/ifnet/sys/contrib/altq/altq/altq_rio.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_rio.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_rio.c Sat Oct 26 19:04:43 2013 (r257188) @@ -81,6 +81,7 @@ #endif #include +#include #include #include @@ -89,7 +90,8 @@ #include #endif -#include +#include +#include #include #include #include Modified: projects/ifnet/sys/contrib/altq/altq/altq_rmclass.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_rmclass.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_rmclass.c Sat Oct 26 19:04:43 2013 (r257188) @@ -59,12 +59,14 @@ #endif #include +#include #ifdef ALTQ3_COMPAT #include #include #include #endif +#include #include #include #include Modified: projects/ifnet/sys/contrib/altq/altq/altq_subr.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_subr.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_subr.c Sat Oct 26 19:04:43 2013 (r257188) @@ -49,6 +49,7 @@ #include #include +#include #include #include #ifdef __FreeBSD__ @@ -64,7 +65,8 @@ #include #include -#include +#include +#include #include #ifdef ALTQ3_COMPAT #include Modified: projects/ifnet/sys/dev/mii/acphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/acphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/acphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -168,12 +168,6 @@ acphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - /* Wake & deisolate up if necessary */ reg = PHY_READ(sc, MII_BMCR); if (reg & (BMCR_ISO | BMCR_PDOWN)) @@ -184,12 +178,6 @@ acphy_service(struct mii_softc *sc, stru case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * This PHY's autonegotiation doesn't need to be kicked. */ break; Modified: projects/ifnet/sys/dev/mii/amphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/amphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/amphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -119,12 +119,6 @@ amphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/atphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/atphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/atphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -116,12 +116,6 @@ atphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - if (IFM_SUBTYPE(ife->ifm_media) == IFM_AUTO || IFM_SUBTYPE(ife->ifm_media) == IFM_1000_T) { atphy_setmedia(sc, ife->ifm_media); @@ -175,12 +169,6 @@ done: case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { Modified: projects/ifnet/sys/dev/mii/axphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/axphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/axphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -113,12 +113,6 @@ axphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/bmtphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/bmtphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/bmtphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -159,12 +159,6 @@ bmtphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/brgphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/brgphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/brgphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -314,10 +315,6 @@ brgphy_service(struct mii_softc *sc, str case MII_POLLSTAT: break; case MII_MEDIACHG: - /* If the interface is not up, don't do anything. */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - /* Todo: Why is this here? Is it really needed? */ PHY_RESET(sc); /* XXX hardware bug work-around */ @@ -337,11 +334,6 @@ brgphy_service(struct mii_softc *sc, str } break; case MII_TICK: - /* Bail if the interface isn't up. */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* Bail if autoneg isn't in process. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { sc->mii_ticks = 0; Modified: projects/ifnet/sys/dev/mii/ciphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/ciphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/ciphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -131,12 +131,6 @@ ciphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - ciphy_fixup(sc); /* XXX hardware bug work-around */ switch (IFM_SUBTYPE(ife->ifm_media)) { @@ -187,12 +181,6 @@ setit: case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) Modified: projects/ifnet/sys/dev/mii/e1000phy.c ============================================================================== --- projects/ifnet/sys/dev/mii/e1000phy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/e1000phy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -50,8 +50,8 @@ __FBSDID("$FreeBSD$"); #include #include - #include +#include #include #include @@ -311,12 +311,6 @@ e1000phy_service(struct mii_softc *sc, s break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - if (IFM_SUBTYPE(ife->ifm_media) == IFM_AUTO) { e1000phy_mii_phy_auto(sc, ife->ifm_media); break; @@ -375,12 +369,6 @@ done: break; case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { Modified: projects/ifnet/sys/dev/mii/gentbi.c ============================================================================== --- projects/ifnet/sys/dev/mii/gentbi.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/gentbi.c Sat Oct 26 19:04:43 2013 (r257188) @@ -191,12 +191,6 @@ gentbi_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/icsphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/icsphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/icsphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -145,12 +145,6 @@ icsphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/ip1000phy.c ============================================================================== --- projects/ifnet/sys/dev/mii/ip1000phy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/ip1000phy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -126,13 +127,6 @@ ip1000phy_service(struct mii_softc *sc, break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) { - break; - } - PHY_RESET(sc); switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: @@ -180,12 +174,6 @@ done: case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { Modified: projects/ifnet/sys/dev/mii/jmphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/jmphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/jmphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -121,24 +122,12 @@ jmphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - if (jmphy_setmedia(sc, ife) != EJUSTRETURN) return (EINVAL); break; case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { Modified: projects/ifnet/sys/dev/mii/lxtphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/lxtphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/lxtphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -168,12 +168,6 @@ lxtphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - if (IFM_SUBTYPE(ife->ifm_media) == IFM_100_FX) lxtphy_set_fx(sc); else Modified: projects/ifnet/sys/dev/mii/mii_physubr.c ============================================================================== --- projects/ifnet/sys/dev/mii/mii_physubr.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/mii_physubr.c Sat Oct 26 19:04:43 2013 (r257188) @@ -209,13 +209,8 @@ int mii_phy_tick(struct mii_softc *sc) { struct ifmedia_entry *ife = sc->mii_pdata->mii_media.ifm_cur; - struct ifnet *ifp = sc->mii_pdata->mii_ifp; int reg; - /* Just bail now if the interface is down. */ - if ((ifp->if_flags & IFF_UP) == 0) - return (EJUSTRETURN); - /* * If we're not doing autonegotiation, we don't need to do * any extra work here. However, we need to check the link Modified: projects/ifnet/sys/dev/mii/mlphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/mlphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/mlphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -205,12 +205,6 @@ mlphy_service(xsc, mii, cmd) break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: /* @@ -266,12 +260,6 @@ mlphy_service(xsc, mii, cmd) case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) Modified: projects/ifnet/sys/dev/mii/nsgphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/nsgphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/nsgphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -159,12 +159,6 @@ nsgphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/nsphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/nsphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/nsphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -71,6 +71,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -152,12 +153,6 @@ nsphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - reg = PHY_READ(sc, MII_NSPHY_PCR); /* Modified: projects/ifnet/sys/dev/mii/nsphyter.c ============================================================================== --- projects/ifnet/sys/dev/mii/nsphyter.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/nsphyter.c Sat Oct 26 19:04:43 2013 (r257188) @@ -149,12 +149,6 @@ nsphyter_service(struct mii_softc *sc, s break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/pnaphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/pnaphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/pnaphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -121,12 +121,6 @@ pnaphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_HPNA_1: mii_phy_setmedia(sc); Modified: projects/ifnet/sys/dev/mii/qsphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/qsphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/qsphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -143,23 +143,11 @@ qsphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * This PHY's autonegotiation doesn't need to be kicked. */ break; Modified: projects/ifnet/sys/dev/mii/rdcphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/rdcphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/rdcphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -121,12 +121,6 @@ rdcphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_100_TX: Modified: projects/ifnet/sys/dev/mii/rgephy.c ============================================================================== --- projects/ifnet/sys/dev/mii/rgephy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/rgephy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -153,12 +154,6 @@ rgephy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - PHY_RESET(sc); /* XXX hardware bug work-around */ anar = PHY_READ(sc, RGEPHY_MII_ANAR); @@ -231,12 +226,6 @@ setit: case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { Modified: projects/ifnet/sys/dev/mii/rlphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/rlphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/rlphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include /* XXXGL: if_rlreg.h contamination */ #include #include @@ -141,23 +142,11 @@ rlphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * The RealTek PHY's autonegotiation doesn't need to be * kicked; it continues in the background. */ Modified: projects/ifnet/sys/dev/mii/rlswitch.c ============================================================================== --- projects/ifnet/sys/dev/mii/rlswitch.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/rlswitch.c Sat Oct 26 19:04:43 2013 (r257188) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include /* XXXGL: if_rlreg.h contamination */ #include #include @@ -353,11 +354,6 @@ rlswitch_service(struct mii_softc *sc, s break; case MII_TICK: - /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); break; } Modified: projects/ifnet/sys/dev/mii/smcphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/smcphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/smcphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -134,12 +134,6 @@ smcphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: smcphy_auto(sc, ife->ifm_media); @@ -153,10 +147,6 @@ smcphy_service(struct mii_softc *sc, str break; case MII_TICK: - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) { - return (0); - } - if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { break; } Modified: projects/ifnet/sys/dev/mii/smscphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/smscphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/smscphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -120,12 +120,6 @@ smscphy_service(struct mii_softc *sc, st break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: smscphy_auto(sc, ife->ifm_media); @@ -139,10 +133,6 @@ smscphy_service(struct mii_softc *sc, st break; case MII_TICK: - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) { - return (0); - } - if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { break; } Modified: projects/ifnet/sys/dev/mii/tdkphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/tdkphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/tdkphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -122,12 +122,6 @@ tdkphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/tlphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/tlphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/tlphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -217,12 +217,6 @@ tlphy_service(struct mii_softc *self, st break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: /* @@ -247,12 +241,6 @@ tlphy_service(struct mii_softc *self, st case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) Modified: projects/ifnet/sys/dev/mii/truephy.c ============================================================================== --- projects/ifnet/sys/dev/mii/truephy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/truephy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -180,12 +181,6 @@ truephy_service(struct mii_softc *sc, st break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { bmcr = PHY_READ(sc, MII_BMCR) & ~BMCR_AUTOEN; PHY_WRITE(sc, MII_BMCR, bmcr); Modified: projects/ifnet/sys/dev/mii/ukphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/ukphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/ukphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -140,12 +140,6 @@ ukphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/xmphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/xmphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/xmphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -148,12 +148,6 @@ xmphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: #ifdef foo @@ -182,12 +176,6 @@ xmphy_service(struct mii_softc *sc, stru case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) Modified: projects/ifnet/sys/dev/uart/uart_cpu_fdt.c ============================================================================== --- projects/ifnet/sys/dev/uart/uart_cpu_fdt.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/uart/uart_cpu_fdt.c Sat Oct 26 19:04:43 2013 (r257188) @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -98,10 +99,25 @@ uart_cpu_eqres(struct uart_bas *b1, stru return ((pmap_kextract(b1->bsh) == pmap_kextract(b2->bsh)) ? 1 : 0); } +static int +phandle_chosen_propdev(phandle_t chosen, const char *name, phandle_t *node) +{ + char buf[64]; + + if (OF_getprop(chosen, name, buf, sizeof(buf)) <= 0) + return (ENXIO); + if ((*node = OF_finddevice(buf)) == -1) + return (ENXIO); + + return (0); +} + int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - char buf[64]; + const char *propnames[] = {"stdout-path", "linux,stdout-path", "stdout", + "stdin-path", "stdin", NULL}; + const char **name; struct uart_class *class; phandle_t node, chosen; pcell_t shift, br, rclk; @@ -111,7 +127,7 @@ uart_cpu_getdev(int devtype, struct uart uart_bus_space_mem = fdtbus_bs_tag; uart_bus_space_io = NULL; - /* Allow overriding the FDT uning the environment. */ + /* Allow overriding the FDT using the environment. */ class = &uart_ns8250_class; err = uart_getenv(devtype, di, class); if (!err) @@ -125,14 +141,11 @@ uart_cpu_getdev(int devtype, struct uart */ if ((chosen = OF_finddevice("/chosen")) == -1) return (ENXIO); - if (OF_getprop(chosen, "stdin", buf, sizeof(buf)) <= 0) - return (ENXIO); - if ((node = OF_finddevice(buf)) == -1) - return (ENXIO); - if (OF_getprop(chosen, "stdout", buf, sizeof(buf)) <= 0) - return (ENXIO); - if (OF_finddevice(buf) != node) - /* Only stdin == stdout is supported. */ + for (name = propnames; *name != NULL; name++) { + if (phandle_chosen_propdev(chosen, *name, &node) == 0) + break; + } + if (*name == NULL) return (ENXIO); /* * Retrieve serial attributes. Modified: projects/ifnet/sys/dev/usb/net/ruephy.c ============================================================================== --- projects/ifnet/sys/dev/usb/net/ruephy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/usb/net/ruephy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -123,23 +123,11 @@ ruephy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) Modified: projects/ifnet/sys/dev/xl/xlphy.c ============================================================================== --- projects/ifnet/sys/dev/xl/xlphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/xl/xlphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -152,23 +152,11 @@ xlphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * The 3Com PHY's autonegotiation doesn't need to be * kicked; it continues in the background. */ Copied: projects/ifnet/sys/net/pf.h (from r257186, head/sys/net/pf.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***