Date: Thu, 28 Sep 2017 05:20:37 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324076 - in projects/runtime-coverage: . cddl/contrib/opensolaris/cmd/ztest cddl/usr.sbin/zfsd contrib/gcc/config/arm etc etc/mtree lib/libcapsicum share/man/man4 share/man/man5 share/... Message-ID: <201709280520.v8S5Kbf5056904@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Sep 28 05:20:37 2017 New Revision: 324076 URL: https://svnweb.freebsd.org/changeset/base/324076 Log: MFhead@r324075 Added: projects/runtime-coverage/sys/crypto/aesni/intel_sha1.c - copied unchanged from r324075, head/sys/crypto/aesni/intel_sha1.c projects/runtime-coverage/sys/crypto/aesni/intel_sha256.c - copied unchanged from r324075, head/sys/crypto/aesni/intel_sha256.c projects/runtime-coverage/sys/crypto/aesni/sha_sse.h - copied unchanged from r324075, head/sys/crypto/aesni/sha_sse.h projects/runtime-coverage/sys/dev/bhnd/bhnd_eromvar.h - copied unchanged from r324075, head/sys/dev/bhnd/bhnd_eromvar.h projects/runtime-coverage/sys/dev/bhnd/bhnd_private.h - copied unchanged from r324075, head/sys/dev/bhnd/bhnd_private.h Deleted: projects/runtime-coverage/etc/man.alias projects/runtime-coverage/usr.sbin/procctl/ Modified: projects/runtime-coverage/Makefile.inc1 projects/runtime-coverage/ObsoleteFiles.inc projects/runtime-coverage/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/runtime-coverage/cddl/usr.sbin/zfsd/zfsd_event.cc projects/runtime-coverage/contrib/gcc/config/arm/unwind-arm.c projects/runtime-coverage/etc/Makefile projects/runtime-coverage/etc/mtree/BSD.usr.dist projects/runtime-coverage/lib/libcapsicum/capsicum_helpers.h projects/runtime-coverage/share/man/man4/aesni.4 projects/runtime-coverage/share/man/man5/procfs.5 projects/runtime-coverage/share/man/man9/Makefile projects/runtime-coverage/share/man/man9/ucred.9 projects/runtime-coverage/sys/arm/allwinner/a10_ehci.c projects/runtime-coverage/sys/arm/allwinner/a10_gpio.c projects/runtime-coverage/sys/arm/allwinner/aw_usbphy.c projects/runtime-coverage/sys/boot/efi/libefi/efipart.c projects/runtime-coverage/sys/cddl/compat/opensolaris/sys/kcondvar.h projects/runtime-coverage/sys/cddl/compat/opensolaris/sys/time.h projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h projects/runtime-coverage/sys/cddl/dev/dtmalloc/dtmalloc.c projects/runtime-coverage/sys/cddl/dev/fbt/fbt.c projects/runtime-coverage/sys/cddl/dev/profile/profile.c projects/runtime-coverage/sys/cddl/dev/prototype.c projects/runtime-coverage/sys/cddl/dev/sdt/sdt.c projects/runtime-coverage/sys/cddl/dev/systrace/systrace.c projects/runtime-coverage/sys/compat/linux/linux_stats.c projects/runtime-coverage/sys/conf/files.amd64 projects/runtime-coverage/sys/conf/files.i386 projects/runtime-coverage/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c projects/runtime-coverage/sys/crypto/aesni/aesni.c projects/runtime-coverage/sys/crypto/aesni/aesni.h projects/runtime-coverage/sys/crypto/via/padlock_hash.c projects/runtime-coverage/sys/dev/bhnd/bcma/bcma.c projects/runtime-coverage/sys/dev/bhnd/bcma/bcma_erom.c projects/runtime-coverage/sys/dev/bhnd/bhnd.c projects/runtime-coverage/sys/dev/bhnd/bhnd.h projects/runtime-coverage/sys/dev/bhnd/bhnd_bus_if.m projects/runtime-coverage/sys/dev/bhnd/bhnd_erom.c projects/runtime-coverage/sys/dev/bhnd/bhnd_erom.h projects/runtime-coverage/sys/dev/bhnd/bhnd_erom_if.m projects/runtime-coverage/sys/dev/bhnd/bhnd_subr.c projects/runtime-coverage/sys/dev/bhnd/bhnd_types.h projects/runtime-coverage/sys/dev/bhnd/bhndb/bhnd_bhndb.c projects/runtime-coverage/sys/dev/bhnd/bhndb/bhndb.c projects/runtime-coverage/sys/dev/bhnd/bhndb/bhndb_pci.c projects/runtime-coverage/sys/dev/bhnd/bhndb/bhndb_pcivar.h projects/runtime-coverage/sys/dev/bhnd/bhndb/bhndb_private.h projects/runtime-coverage/sys/dev/bhnd/bhndb/bhndb_subr.c projects/runtime-coverage/sys/dev/bhnd/bhndb/bhndbvar.h projects/runtime-coverage/sys/dev/bhnd/bhndreg.h projects/runtime-coverage/sys/dev/bhnd/bhndvar.h projects/runtime-coverage/sys/dev/bhnd/cores/chipc/chipc.c projects/runtime-coverage/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl.c projects/runtime-coverage/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c projects/runtime-coverage/sys/dev/bhnd/cores/pmu/bhnd_pmu.c projects/runtime-coverage/sys/dev/bhnd/nvram/bhnd_sprom.c projects/runtime-coverage/sys/dev/bhnd/siba/siba.c projects/runtime-coverage/sys/dev/bhnd/siba/siba_bhndb.c projects/runtime-coverage/sys/dev/bhnd/siba/siba_erom.c projects/runtime-coverage/sys/dev/bnxt/if_bnxt.c projects/runtime-coverage/sys/dev/drm/drmP.h projects/runtime-coverage/sys/dev/drm2/i915/i915_drv.c projects/runtime-coverage/sys/dev/drm2/radeon/radeon_drv.c projects/runtime-coverage/sys/dev/e1000/if_em.c projects/runtime-coverage/sys/dev/hyperv/netvsc/if_hn.c projects/runtime-coverage/sys/dev/hyperv/netvsc/ndis.h projects/runtime-coverage/sys/dev/ixl/ixl_txrx.c projects/runtime-coverage/sys/dev/neta/if_mvneta.c projects/runtime-coverage/sys/dev/nvme/nvme_sim.c projects/runtime-coverage/sys/dev/pccard/pccardvar.h projects/runtime-coverage/sys/dev/qlxgbe/ql_glbl.h projects/runtime-coverage/sys/dev/qlxgbe/ql_hw.c projects/runtime-coverage/sys/dev/qlxgbe/ql_os.c projects/runtime-coverage/sys/fs/ext2fs/ext2_alloc.c projects/runtime-coverage/sys/fs/ext2fs/ext2_extern.h projects/runtime-coverage/sys/fs/ext2fs/ext2_inode.c projects/runtime-coverage/sys/fs/ext2fs/ext2_inode_cnv.c projects/runtime-coverage/sys/fs/nfs/nfs_var.h projects/runtime-coverage/sys/fs/nfs/nfscl.h projects/runtime-coverage/sys/fs/nfsclient/nfs_clcomsubs.c projects/runtime-coverage/sys/fs/nfsclient/nfs_clkdtrace.c projects/runtime-coverage/sys/fs/nfsclient/nfs_clrpcops.c projects/runtime-coverage/sys/fs/nfsclient/nfs_clstate.c projects/runtime-coverage/sys/fs/nfsserver/nfs_nfsdserv.c projects/runtime-coverage/sys/fs/tmpfs/tmpfs_fifoops.c projects/runtime-coverage/sys/fs/tmpfs/tmpfs_vnops.c projects/runtime-coverage/sys/fs/tmpfs/tmpfs_vnops.h projects/runtime-coverage/sys/geom/geom_subr.c projects/runtime-coverage/sys/kern/kern_mutex.c projects/runtime-coverage/sys/kern/kern_sysctl.c projects/runtime-coverage/sys/kern/sys_process.c projects/runtime-coverage/sys/kern/vfs_cache.c projects/runtime-coverage/sys/kern/vfs_export.c projects/runtime-coverage/sys/mips/broadcom/bcm_machdep.c projects/runtime-coverage/sys/mips/broadcom/bcm_machdep.h projects/runtime-coverage/sys/mips/broadcom/bcm_nvram_cfe.c projects/runtime-coverage/sys/mips/broadcom/bhnd_nexus.c projects/runtime-coverage/sys/modules/aesni/Makefile projects/runtime-coverage/sys/modules/bhnd/bhndb_pci/Makefile projects/runtime-coverage/sys/net/iflib.h projects/runtime-coverage/sys/netinet/sctp_asconf.c projects/runtime-coverage/sys/netinet/sctp_asconf.h projects/runtime-coverage/sys/netinet/tcp_syncache.c projects/runtime-coverage/sys/netipsec/xform_ah.c projects/runtime-coverage/sys/opencrypto/crypto.c projects/runtime-coverage/sys/opencrypto/cryptodev.c projects/runtime-coverage/sys/opencrypto/cryptodev.h projects/runtime-coverage/sys/opencrypto/xform_md5.c projects/runtime-coverage/sys/opencrypto/xform_null.c projects/runtime-coverage/sys/opencrypto/xform_rmd160.c projects/runtime-coverage/sys/opencrypto/xform_sha1.c projects/runtime-coverage/sys/opencrypto/xform_sha2.c projects/runtime-coverage/sys/sys/mbuf.h projects/runtime-coverage/sys/sys/module.h projects/runtime-coverage/sys/sys/mutex.h projects/runtime-coverage/sys/sys/param.h projects/runtime-coverage/sys/ufs/ffs/ffs_softdep.c projects/runtime-coverage/sys/vm/uma.h projects/runtime-coverage/sys/vm/vm_page.c projects/runtime-coverage/targets/pseudo/userland/Makefile.depend projects/runtime-coverage/tests/sys/opencrypto/cryptotest.py projects/runtime-coverage/tools/tools/nanobsd/legacy.sh projects/runtime-coverage/usr.bin/calendar/events.c projects/runtime-coverage/usr.sbin/Makefile projects/runtime-coverage/usr.sbin/mountd/mountd.c Directory Properties: projects/runtime-coverage/ (props changed) projects/runtime-coverage/cddl/ (props changed) projects/runtime-coverage/cddl/contrib/opensolaris/ (props changed) projects/runtime-coverage/contrib/gcc/ (props changed) projects/runtime-coverage/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/Makefile.inc1 Thu Sep 28 05:20:37 2017 (r324076) @@ -2567,7 +2567,7 @@ delete-old-files: .PHONY done # Remove catpages without corresponding manpages. @exec 3<&0; \ - find ${DESTDIR}/usr/share/man/cat* ! -type d | \ + find ${DESTDIR}/usr/share/man/cat* ! -type d 2>/dev/null | \ sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ while read catpage; do \ read manpage; \ Modified: projects/runtime-coverage/ObsoleteFiles.inc ============================================================================== --- projects/runtime-coverage/ObsoleteFiles.inc Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/ObsoleteFiles.inc Thu Sep 28 05:20:37 2017 (r324076) @@ -38,16 +38,137 @@ # xargs -n1 | sort | uniq -d; # done +# 20170927: crshared +OLD_FILES+=usr/share/man/man9/crshared.9.gz +# 20170927: procctl +OLD_FILES+=usr/share/man/man8/procctl.8.gz +OLD_FILES+=usr/sbin/procctl +# 20170926: remove unneeded man aliases and locales directory +OLD_FILES+=usr/share/man/en.ISO8859-1/man1 +OLD_FILES+=usr/share/man/en.ISO8859-1/man2 +OLD_FILES+=usr/share/man/en.ISO8859-1/man3 +OLD_FILES+=usr/share/man/en.ISO8859-1/man4 +OLD_FILES+=usr/share/man/en.ISO8859-1/man5 +OLD_FILES+=usr/share/man/en.ISO8859-1/man6 +OLD_FILES+=usr/share/man/en.ISO8859-1/man7 +OLD_FILES+=usr/share/man/en.ISO8859-1/man8 +OLD_FILES+=usr/share/man/en.ISO8859-1/man9 +OLD_DIRS+=usr/share/man/en.ISO8859-1 +OLD_FILES+=usr/share/man/en.ISO8859-1/mandoc.db +OLD_FILES+=usr/share/man/en.UTF-8/man1 +OLD_FILES+=usr/share/man/en.UTF-8/man2 +OLD_FILES+=usr/share/man/en.UTF-8/man3 +OLD_FILES+=usr/share/man/en.UTF-8/man4 +OLD_FILES+=usr/share/man/en.UTF-8/man5 +OLD_FILES+=usr/share/man/en.UTF-8/man6 +OLD_FILES+=usr/share/man/en.UTF-8/man7 +OLD_FILES+=usr/share/man/en.UTF-8/man8 +OLD_FILES+=usr/share/man/en.UTF-8/man9 +OLD_FILES+=usr/share/man/en.UTF-8/mandoc.db +OLD_DIRS+=usr/share/man/en.UTF-8 +OLD_FILES+=usr/share/man/en.ISO8859-15 +OLD_FILES+=usr/share/openssl/man/en.ISO8859-1/man1 +OLD_FILES+=usr/share/openssl/man/en.ISO8859-1/man3 +OLD_FILES+=usr/share/openssl/man/en.ISO8859-1/mandoc.db +OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1 +OLD_FILES+=usr/share/openssl/man/en.ISO8859-15 +OLD_DIRS+=usr/share/man/ja/man1 +OLD_DIRS+=usr/share/man/ja/man2 +OLD_DIRS+=usr/share/man/ja/man3 +OLD_DIRS+=usr/share/man/ja/man4 +OLD_DIRS+=usr/share/man/ja/man5 +OLD_DIRS+=usr/share/man/ja/man6 +OLD_DIRS+=usr/share/man/ja/man7 +OLD_DIRS+=usr/share/man/ja/man8 +OLD_DIRS+=usr/share/man/ja/man9 +OLD_DIRS+=usr/share/man/ja # 20170913: remove unneeded catman utility OLD_FILES+=etc/periodic/weekly/330.catman OLD_FILES+=usr/bin/catman OLD_FILES+=usr/libexec/catman.local OLD_FILES+=usr/share/man/man1/catman.1.gz OLD_FILES+=usr/share/man/man8/catman.local.8.gz - +OLD_DIRS+=usr/share/man/cat1 +OLD_DIRS+=usr/share/man/cat2 +OLD_DIRS+=usr/share/man/cat3 +OLD_DIRS+=usr/share/man/cat4/amd64 +OLD_DIRS+=usr/share/man/cat4/arm +OLD_DIRS+=usr/share/man/cat4/i386 +OLD_DIRS+=usr/share/man/cat4/powerpc +OLD_DIRS+=usr/share/man/cat4/sparc64 +OLD_DIRS+=usr/share/man/cat4 +OLD_DIRS+=usr/share/man/cat5 +OLD_DIRS+=usr/share/man/cat6 +OLD_DIRS+=usr/share/man/cat7 +OLD_DIRS+=usr/share/man/cat8/amd64 +OLD_DIRS+=usr/share/man/cat8/arm +OLD_DIRS+=usr/share/man/cat8/i386 +OLD_DIRS+=usr/share/man/cat8/powerpc +OLD_DIRS+=usr/share/man/cat8/sparc64 +OLD_DIRS+=usr/share/man/cat8 +OLD_DIRS+=usr/share/man/cat9 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat1 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat2 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat3 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/amd64 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/arm +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/i386 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/powerpc +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/sparc64 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat5 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat6 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat7 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/amd64 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/arm +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/i386 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/powerpc +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/sparc64 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat9 +OLD_DIRS+=usr/share/man/en.UTF-8/cat1 +OLD_DIRS+=usr/share/man/en.UTF-8/cat2 +OLD_DIRS+=usr/share/man/en.UTF-8/cat3 +OLD_DIRS+=usr/share/man/en.UTF-8/cat4/amd64 +OLD_DIRS+=usr/share/man/en.UTF-8/cat4/arm +OLD_DIRS+=usr/share/man/en.UTF-8/cat4/i386 +OLD_DIRS+=usr/share/man/en.UTF-8/cat4/powerpc +OLD_DIRS+=usr/share/man/en.UTF-8/cat4/sparc64 +OLD_DIRS+=usr/share/man/en.UTF-8/cat4 +OLD_DIRS+=usr/share/man/en.UTF-8/cat5 +OLD_DIRS+=usr/share/man/en.UTF-8/cat6 +OLD_DIRS+=usr/share/man/en.UTF-8/cat7 +OLD_DIRS+=usr/share/man/en.UTF-8/cat8/amd64 +OLD_DIRS+=usr/share/man/en.UTF-8/cat8/arm +OLD_DIRS+=usr/share/man/en.UTF-8/cat8/i386 +OLD_DIRS+=usr/share/man/en.UTF-8/cat8/powerpc +OLD_DIRS+=usr/share/man/en.UTF-8/cat8/sparc64 +OLD_DIRS+=usr/share/man/en.UTF-8/cat8 +OLD_DIRS+=usr/share/man/en.UTF-8/cat9 +OLD_DIRS+=usr/share/man/ja/cat1 +OLD_DIRS+=usr/share/man/ja/cat2 +OLD_DIRS+=usr/share/man/ja/cat3 +OLD_DIRS+=usr/share/man/ja/cat4/amd64 +OLD_DIRS+=usr/share/man/ja/cat4/arm +OLD_DIRS+=usr/share/man/ja/cat4/i386 +OLD_DIRS+=usr/share/man/ja/cat4/powerpc +OLD_DIRS+=usr/share/man/ja/cat4/sparc64 +OLD_DIRS+=usr/share/man/ja/cat4 +OLD_DIRS+=usr/share/man/ja/cat5 +OLD_DIRS+=usr/share/man/ja/cat6 +OLD_DIRS+=usr/share/man/ja/cat7 +OLD_DIRS+=usr/share/man/ja/cat8/amd64 +OLD_DIRS+=usr/share/man/ja/cat8/arm +OLD_DIRS+=usr/share/man/ja/cat8/powerpc +OLD_DIRS+=usr/share/man/ja/cat8/sparc64 +OLD_DIRS+=usr/share/man/ja/cat8 +OLD_DIRS+=usr/share/man/ja/cat9 +OLD_DIRS+=usr/share/openssl/man/cat1 +OLD_DIRS+=usr/share/openssl/man/cat3 +OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat1 +OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat3 # 20170802: ksyms(4) ioctl interface was removed OLD_FILES+=usr/include/sys/ksyms.h - # 20170722: new clang import which bumps version from 4.0.0 to 5.0.0. OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/asan_interface.h Modified: projects/runtime-coverage/cddl/contrib/opensolaris/cmd/ztest/ztest.c ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/cmd/ztest/ztest.c Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/cddl/contrib/opensolaris/cmd/ztest/ztest.c Thu Sep 28 05:20:37 2017 (r324076) @@ -1825,13 +1825,14 @@ ztest_get_done(zgd_t *zgd, int error) ztest_object_unlock(zd, object); if (error == 0 && zgd->zgd_bp) - zil_add_block(zgd->zgd_zilog, zgd->zgd_bp); + zil_lwb_add_block(zgd->zgd_lwb, zgd->zgd_bp); umem_free(zgd, sizeof (*zgd)); } static int -ztest_get_data(void *arg, lr_write_t *lr, char *buf, zio_t *zio) +ztest_get_data(void *arg, lr_write_t *lr, char *buf, struct lwb *lwb, + zio_t *zio) { ztest_ds_t *zd = arg; objset_t *os = zd->zd_os; @@ -1845,6 +1846,10 @@ ztest_get_data(void *arg, lr_write_t *lr, char *buf, z zgd_t *zgd; int error; + ASSERT3P(lwb, !=, NULL); + ASSERT3P(zio, !=, NULL); + ASSERT3U(size, !=, 0); + ztest_object_lock(zd, object, RL_READER); error = dmu_bonus_hold(os, object, FTAG, &db); if (error) { @@ -1865,7 +1870,7 @@ ztest_get_data(void *arg, lr_write_t *lr, char *buf, z db = NULL; zgd = umem_zalloc(sizeof (*zgd), UMEM_NOFAIL); - zgd->zgd_zilog = zd->zd_zilog; + zgd->zgd_lwb = lwb; zgd->zgd_private = zd; if (buf != NULL) { /* immediate write */ Modified: projects/runtime-coverage/cddl/usr.sbin/zfsd/zfsd_event.cc ============================================================================== --- projects/runtime-coverage/cddl/usr.sbin/zfsd/zfsd_event.cc Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/cddl/usr.sbin/zfsd/zfsd_event.cc Thu Sep 28 05:20:37 2017 (r324076) @@ -101,7 +101,7 @@ DevfsEvent::ReadLabel(int devFd, bool &inUse, bool &de poolName = NULL; if (zpool_in_use(g_zfsHandle, devFd, &poolState, &poolName, &b_inuse) == 0) { - nvlist_t *devLabel; + nvlist_t *devLabel = NULL; inUse = b_inuse == B_TRUE; if (poolName != NULL) @@ -116,8 +116,10 @@ DevfsEvent::ReadLabel(int devFd, bool &inUse, bool &de * might be damaged. In that case, zfsd should do nothing and * wait for the sysadmin to decide. */ - if (nlabels != VDEV_LABELS || devLabel == NULL) + if (nlabels != VDEV_LABELS || devLabel == NULL) { + nvlist_free(devLabel); return (NULL); + } try { Vdev vdev(devLabel); @@ -131,6 +133,7 @@ DevfsEvent::ReadLabel(int devFd, bool &inUse, bool &de exp.GetString().insert(0, context); exp.Log(); + nvlist_free(devLabel); } } return (NULL); Modified: projects/runtime-coverage/contrib/gcc/config/arm/unwind-arm.c ============================================================================== --- projects/runtime-coverage/contrib/gcc/config/arm/unwind-arm.c Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/contrib/gcc/config/arm/unwind-arm.c Thu Sep 28 05:20:37 2017 (r324076) @@ -625,8 +625,8 @@ __gnu_Unwind_RaiseException (_Unwind_Control_Block * u do { /* Find the entry for this routine. */ - if (get_eit_entry (ucbp, saved_vrs.core.r[R_PC]) != _URC_OK) - return _URC_FAILURE; + if ((pr_result = get_eit_entry (ucbp, saved_vrs.core.r[R_PC])) != _URC_OK) + return pr_result; /* Call the pr to decide what to do. */ pr_result = ((personality_routine) UCB_PR_ADDR (ucbp)) @@ -773,11 +773,8 @@ __gnu_Unwind_Backtrace(_Unwind_Trace_Fn trace, void * do { /* Find the entry for this routine. */ - if (get_eit_entry (ucbp, saved_vrs.core.r[R_PC]) != _URC_OK) - { - code = _URC_FAILURE; + if ((code = get_eit_entry (ucbp, saved_vrs.core.r[R_PC])) != _URC_OK) break; - } /* The dwarf unwinder assumes the context structure holds things like the function and LSDA pointers. The ARM implementation Modified: projects/runtime-coverage/etc/Makefile ============================================================================== --- projects/runtime-coverage/etc/Makefile Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/etc/Makefile Thu Sep 28 05:20:37 2017 (r324076) @@ -399,31 +399,6 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY done; true .endif ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys -.if ${MK_MAN} != "no" - cd ${DESTDIR}${SHAREDIR}/man; \ - for mandir in man*; do \ - ${INSTALL_SYMLINK} ../$$mandir \ - ${DESTDIR}${SHAREDIR}/man/en.ISO8859-1/; \ - ${INSTALL_SYMLINK} ../$$mandir \ - ${DESTDIR}${SHAREDIR}/man/en.UTF-8/; \ - done -.if ${MK_OPENSSL} != "no" - cd ${DESTDIR}${SHAREDIR}/openssl/man; \ - for mandir in man*; do \ - ${INSTALL_SYMLINK} ../$$mandir \ - ${DESTDIR}${SHAREDIR}/openssl/man/en.ISO8859-1/; \ - done -.endif - set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \ - while [ $$# -gt 0 ] ; do \ - ${INSTALL_SYMLINK} "$$2" "${DESTDIR}${SHAREDIR}/man/$$1"; \ - if [ "${MK_OPENSSL}" != "no" ]; then \ - ${INSTALL_SYMLINK} "$$2" \ - "${DESTDIR}${SHAREDIR}/openssl/man/$$1"; \ - fi; \ - shift; shift; \ - done -.endif .if ${MK_NLS} != "no" set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \ while [ $$# -gt 0 ] ; do \ Modified: projects/runtime-coverage/etc/mtree/BSD.usr.dist ============================================================================== --- projects/runtime-coverage/etc/mtree/BSD.usr.dist Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/etc/mtree/BSD.usr.dist Thu Sep 28 05:20:37 2017 (r324076) @@ -807,158 +807,6 @@ .. .. man -/set uname=man - cat1 - .. - cat2 - .. - cat3 - .. - cat4 - amd64 - .. - arm - .. - i386 - .. - powerpc - .. - sparc64 - .. - .. - cat5 - .. - cat6 - .. - cat7 - .. - cat8 - amd64 - .. - i386 - .. - powerpc - .. - sparc64 - .. - .. - cat9 - .. - en.ISO8859-1 uname=root - cat1 - .. - cat2 - .. - cat3 - .. - cat4 - amd64 - .. - arm - .. - i386 - .. - powerpc - .. - sparc64 - .. - .. - cat5 - .. - cat6 - .. - cat7 - .. - cat8 - amd64 - .. - i386 - .. - powerpc - .. - sparc64 - .. - .. - cat9 - .. - .. - en.UTF-8 uname=root - cat1 - .. - cat2 - .. - cat3 - .. - cat4 - amd64 - .. - arm - .. - i386 - .. - powerpc - .. - sparc64 - .. - .. - cat5 - .. - cat6 - .. - cat7 - .. - cat8 - amd64 - .. - i386 - .. - powerpc - .. - sparc64 - .. - .. - cat9 - .. - .. - ja uname=root - cat1 - .. - cat2 - .. - cat3 - .. - cat4 - .. - cat5 - .. - cat6 - .. - cat7 - .. - cat8 - .. - cat9 - .. -/set uname=root - man1 - .. - man2 - .. - man3 - .. - man4 - .. - man5 - .. - man6 - .. - man7 - .. - man8 - .. - man9 - .. - .. man1 .. man2 @@ -1298,18 +1146,6 @@ .. openssl man -/set uname=man - cat1 - .. - cat3 - .. - en.ISO8859-1 uname=root - cat1 - .. - cat3 - .. - .. -/set uname=root man1 .. man3 Modified: projects/runtime-coverage/lib/libcapsicum/capsicum_helpers.h ============================================================================== --- projects/runtime-coverage/lib/libcapsicum/capsicum_helpers.h Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/lib/libcapsicum/capsicum_helpers.h Thu Sep 28 05:20:37 2017 (r324076) @@ -50,7 +50,7 @@ caph_limit_stream(int fd, int flags) cap_rights_t rights; unsigned long cmds[] = { TIOCGETA, TIOCGWINSZ, FIODTYPE }; - cap_rights_init(&rights, CAP_FCNTL, CAP_FSTAT, CAP_IOCTL); + cap_rights_init(&rights, CAP_FCNTL, CAP_FSTAT, CAP_IOCTL, CAP_SEEK); if ((flags & CAPH_READ) != 0) cap_rights_set(&rights, CAP_READ); Modified: projects/runtime-coverage/share/man/man4/aesni.4 ============================================================================== --- projects/runtime-coverage/share/man/man4/aesni.4 Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/share/man/man4/aesni.4 Thu Sep 28 05:20:37 2017 (r324076) @@ -24,12 +24,12 @@ .\" .\" $FreeBSD$ .\" -.Dd December 14, 2015 +.Dd September 26, 2017 .Dt AESNI 4 .Os .Sh NAME .Nm aesni -.Nd "driver for the AES accelerator on Intel CPUs" +.Nd "driver for the AES and SHA accelerator on x86 CPUs" .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -47,8 +47,8 @@ module at boot time, place the following line in aesni_load="YES" .Ed .Sh DESCRIPTION -Starting with some models of Core i5/i7, Intel processors implement -a new set of instructions called AESNI. +Starting with Intel Westmere and AMD Bulldozer, some x86 processors implement a +new set of instructions called AESNI. The set of six instructions accelerates the calculation of the key schedule for key lengths of 128, 192, and 256 of the Advanced Encryption Standard (AES) symmetric cipher, and provides a hardware @@ -56,13 +56,24 @@ implementation of the regular and the last encryption rounds. .Pp The processor capability is reported as AESNI in the Features2 line at boot. +.Pp +Starting with the Intel Goldmont and AMD Ryzen microarchitectures, some x86 +processors implement a new set of SHA instructions. +The set of seven instructions accelerates the calculation of SHA1 and SHA256 +hashes. +.Pp +The processor capability is reported as SHA in the Structured Extended Features +line at boot. +.Pp The .Nm -driver does not attach on systems that lack the required CPU capability. +driver does not attach on systems that lack both CPU capabilities. +On systems that support only one of AESNI or SHA extensions, the driver will +attach and support that one function. .Pp The .Nm -driver registers itself to accelerate AES operations for +driver registers itself to accelerate AES and SHA operations for .Xr crypto 4 . Besides speed, the advantage of using the .Nm @@ -83,13 +94,18 @@ The .Nm driver first appeared in .Fx 9.0 . +SHA support was added in +.Fx 12.0 . .Sh AUTHORS .An -nosplit The .Nm driver was written by -.An Konstantin Belousov Aq Mt kib@FreeBSD.org . +.An Konstantin Belousov Aq Mt kib@FreeBSD.org +and +.An Conrad Meyer Aq Mt cem@FreeBSD.org . The key schedule calculation code was adopted from the sample provided by Intel and used in the analogous .Ox driver. +The hash step intrinsics implementations were supplied by Intel. Modified: projects/runtime-coverage/share/man/man5/procfs.5 ============================================================================== --- projects/runtime-coverage/share/man/man5/procfs.5 Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/share/man/man5/procfs.5 Thu Sep 28 05:20:37 2017 (r324076) @@ -196,7 +196,6 @@ file system on .Xr mount 2 , .Xr sigaction 2 , .Xr unmount 2 , -.Xr procctl 8 , .Xr pseudofs 9 .Sh AUTHORS .An -nosplit Modified: projects/runtime-coverage/share/man/man9/Makefile ============================================================================== --- projects/runtime-coverage/share/man/man9/Makefile Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/share/man/man9/Makefile Thu Sep 28 05:20:37 2017 (r324076) @@ -1929,7 +1929,6 @@ MLINKS+=ucred.9 cred_update_thread.9 \ ucred.9 crget.9 \ ucred.9 crhold.9 \ ucred.9 crsetgroups.9 \ - ucred.9 crshared.9 \ ucred.9 cru2x.9 MLINKS+=uidinfo.9 uifind.9 \ uidinfo.9 uifree.9 \ Modified: projects/runtime-coverage/share/man/man9/ucred.9 ============================================================================== --- projects/runtime-coverage/share/man/man9/ucred.9 Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/share/man/man9/ucred.9 Thu Sep 28 05:20:37 2017 (r324076) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 19, 2009 +.Dd September 27, 2017 .Dt UCRED 9 .Os .Sh NAME @@ -34,7 +34,6 @@ .Nm crget , .Nm crhold , .Nm crfree , -.Nm crshared , .Nm crcopy , .Nm crdup , .Nm cru2x , @@ -49,8 +48,6 @@ .Fn crhold "struct ucred *cr" .Ft void .Fn crfree "struct ucred *cr" -.Ft int -.Fn crshared "struct ucred *cr" .Ft void .Fn crcopy "struct ucred *dest" "struct ucred *src" .Ft "struct ucred *" @@ -86,12 +83,6 @@ function decreases the reference count on the credenti If the count drops to 0, the storage for the structure is freed. .Pp The -.Fn crshared -function returns true if the credential is shared. -A credential is considered to be shared if its reference -count is greater than one. -.Pp -The .Fn crcopy function copies the contents of the source (template) credential into the destination template. @@ -170,10 +161,6 @@ and all return a pointer to a .Vt ucred structure. -.Pp -.Fn crshared -returns 0 if the credential has a reference count greater than 1; -otherwise, 1 is returned. .Sh USAGE NOTES As of .Fx 5.0 , Modified: projects/runtime-coverage/sys/arm/allwinner/a10_ehci.c ============================================================================== --- projects/runtime-coverage/sys/arm/allwinner/a10_ehci.c Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/sys/arm/allwinner/a10_ehci.c Thu Sep 28 05:20:37 2017 (r324076) @@ -88,11 +88,21 @@ __FBSDID("$FreeBSD$"); static device_attach_t a10_ehci_attach; static device_detach_t a10_ehci_detach; +struct clk_list { + TAILQ_ENTRY(clk_list) next; + clk_t clk; +}; + +struct hwrst_list { + TAILQ_ENTRY(hwrst_list) next; + hwreset_t rst; +}; + struct aw_ehci_softc { ehci_softc_t sc; - clk_t clk; - hwreset_t rst; - phy_t phy; + TAILQ_HEAD(, clk_list) clk_list; + TAILQ_HEAD(, hwrst_list) rst_list; + phy_t phy; }; struct aw_ehci_conf { @@ -114,6 +124,7 @@ static struct ofw_compat_data compat_data[] = { { "allwinner,sun7i-a20-ehci", (uintptr_t)&a10_ehci_conf }, { "allwinner,sun8i-a83t-ehci", (uintptr_t)&a31_ehci_conf }, { "allwinner,sun8i-h3-ehci", (uintptr_t)&a31_ehci_conf }, + /* { "allwinner,sun50i-a64-ehci", (uintptr_t)&a31_ehci_conf }, */ { NULL, (uintptr_t)NULL } }; @@ -139,8 +150,11 @@ a10_ehci_attach(device_t self) ehci_softc_t *sc = &aw_sc->sc; const struct aw_ehci_conf *conf; bus_space_handle_t bsh; - int err; - int rid; + int err, rid, off; + struct clk_list *clkp; + clk_t clk; + struct hwrst_list *rstp; + hwreset_t rst; uint32_t reg_value = 0; conf = USB_CONF(self); @@ -204,27 +218,33 @@ a10_ehci_attach(device_t self) sc->sc_flags |= EHCI_SCFLG_DONTRESET; + /* Enable clock for USB */ + TAILQ_INIT(&aw_sc->clk_list); + for (off = 0; clk_get_by_ofw_index(self, 0, off, &clk) == 0; off++) { + err = clk_enable(clk); + if (err != 0) { + device_printf(self, "Could not enable clock %s\n", + clk_get_name(clk)); + goto error; + } + clkp = malloc(sizeof(*clkp), M_DEVBUF, M_WAITOK | M_ZERO); + clkp->clk = clk; + TAILQ_INSERT_TAIL(&aw_sc->clk_list, clkp, next); + } + /* De-assert reset */ - if (hwreset_get_by_ofw_idx(self, 0, 0, &aw_sc->rst) == 0) { - err = hwreset_deassert(aw_sc->rst); + TAILQ_INIT(&aw_sc->rst_list); + for (off = 0; hwreset_get_by_ofw_idx(self, 0, off, &rst) == 0; off++) { + err = hwreset_deassert(rst); if (err != 0) { device_printf(self, "Could not de-assert reset\n"); goto error; } + rstp = malloc(sizeof(*rstp), M_DEVBUF, M_WAITOK | M_ZERO); + rstp->rst = rst; + TAILQ_INSERT_TAIL(&aw_sc->rst_list, rstp, next); } - /* Enable clock for USB */ - err = clk_get_by_ofw_index(self, 0, 0, &aw_sc->clk); - if (err != 0) { - device_printf(self, "Could not get clock\n"); - goto error; - } - err = clk_enable(aw_sc->clk); - if (err != 0) { - device_printf(self, "Could not enable clock\n"); - goto error; - } - /* Enable USB PHY */ if (phy_get_by_ofw_name(self, 0, "usb", &aw_sc->phy) == 0) { err = phy_enable(self, aw_sc->phy); @@ -272,6 +292,8 @@ a10_ehci_detach(device_t self) const struct aw_ehci_conf *conf; int err; uint32_t reg_value = 0; + struct clk_list *clk, *clk_tmp; + struct hwrst_list *rst, *rst_tmp; conf = USB_CONF(self); @@ -319,16 +341,26 @@ a10_ehci_detach(device_t self) reg_value &= ~SW_ULPI_BYPASS; /* ULPI bypass disable */ A10_WRITE_4(sc, SW_USB_PMU_IRQ_ENABLE, reg_value); - /* Disable clock for USB */ - if (aw_sc->clk != NULL) { - clk_disable(aw_sc->clk); - clk_release(aw_sc->clk); + /* Disable clock */ + TAILQ_FOREACH_SAFE(clk, &aw_sc->clk_list, next, clk_tmp) { + err = clk_disable(clk->clk); + if (err != 0) + device_printf(self, "Could not disable clock %s\n", + clk_get_name(clk->clk)); + err = clk_release(clk->clk); + if (err != 0) + device_printf(self, "Could not release clock %s\n", + clk_get_name(clk->clk)); + TAILQ_REMOVE(&aw_sc->clk_list, clk, next); + free(clk, M_DEVBUF); } /* Assert reset */ - if (aw_sc->rst != NULL) { - hwreset_assert(aw_sc->rst); - hwreset_release(aw_sc->rst); + TAILQ_FOREACH_SAFE(rst, &aw_sc->rst_list, next, rst_tmp) { + hwreset_assert(rst->rst); + hwreset_release(rst->rst); + TAILQ_REMOVE(&aw_sc->rst_list, rst, next); + free(rst, M_DEVBUF); } return (0); Modified: projects/runtime-coverage/sys/arm/allwinner/a10_gpio.c ============================================================================== --- projects/runtime-coverage/sys/arm/allwinner/a10_gpio.c Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/sys/arm/allwinner/a10_gpio.c Thu Sep 28 05:20:37 2017 (r324076) @@ -165,6 +165,11 @@ static struct ofw_compat_data compat_data[] = { {NULL, 0} }; +struct clk_list { + TAILQ_ENTRY(clk_list) next; + clk_t clk; +}; + struct a10_gpio_softc { device_t sc_dev; device_t sc_busdev; @@ -175,6 +180,7 @@ struct a10_gpio_softc { bus_space_handle_t sc_bsh; void * sc_intrhand; const struct allwinner_padconf * padconf; + TAILQ_HEAD(, clk_list) clk_list; }; #define A10_GPIO_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx) @@ -766,8 +772,10 @@ a10_gpio_attach(device_t dev) int rid, error; phandle_t gpio; struct a10_gpio_softc *sc; + struct clk_list *clkp, *clkp_tmp; clk_t clk; - hwreset_t rst; + hwreset_t rst = NULL; + int off, err; sc = device_get_softc(dev); sc->sc_dev = dev; @@ -811,12 +819,17 @@ a10_gpio_attach(device_t dev) } } - if (clk_get_by_ofw_index(dev, 0, 0, &clk) == 0) { - error = clk_enable(clk); - if (error != 0) { - device_printf(dev, "could not enable clock\n"); - return (error); + TAILQ_INIT(&sc->clk_list); + for (off = 0; clk_get_by_ofw_index(dev, 0, off, &clk) == 0; off++) { + err = clk_enable(clk); + if (err != 0) { + device_printf(dev, "Could not enable clock %s\n", + clk_get_name(clk)); + goto fail; } + clkp = malloc(sizeof(*clkp), M_DEVBUF, M_WAITOK | M_ZERO); + clkp->clk = clk; + TAILQ_INSERT_TAIL(&sc->clk_list, clkp, next); } sc->sc_busdev = gpiobus_attach_bus(dev); @@ -839,6 +852,26 @@ fail: if (sc->sc_mem_res) bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res); mtx_destroy(&sc->sc_mtx); + + /* Disable clock */ + TAILQ_FOREACH_SAFE(clkp, &sc->clk_list, next, clkp_tmp) { + err = clk_disable(clkp->clk); + if (err != 0) + device_printf(dev, "Could not disable clock %s\n", + clk_get_name(clkp->clk)); + err = clk_release(clkp->clk); + if (err != 0) + device_printf(dev, "Could not release clock %s\n", + clk_get_name(clkp->clk)); + TAILQ_REMOVE(&sc->clk_list, clkp, next); + free(clkp, M_DEVBUF); + } + + /* Assert resets */ + if (rst) { + hwreset_assert(rst); + hwreset_release(rst); + } return (ENXIO); } Modified: projects/runtime-coverage/sys/arm/allwinner/aw_usbphy.c ============================================================================== --- projects/runtime-coverage/sys/arm/allwinner/aw_usbphy.c Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/sys/arm/allwinner/aw_usbphy.c Thu Sep 28 05:20:37 2017 (r324076) @@ -158,15 +158,8 @@ awusbphy_configure(device_t dev, int phyno) return; if (sc->phy_conf->pmu_unk1 == true) - CLR4(sc->phy_ctrl, PMU_UNK_H3, PMU_UNK_H3_CLR); + CLR4(sc->pmu[phyno], PMU_UNK_H3, PMU_UNK_H3_CLR); - if (sc->phy_conf->phy0_route == true) { - if (phyno == 0) - SET4(sc->phy_ctrl, OTG_PHY_CFG, OTG_PHY_ROUTE_OTG); - else - CLR4(sc->phy_ctrl, OTG_PHY_CFG, OTG_PHY_ROUTE_OTG); - } - SET4(sc->pmu[phyno], PMU_IRQ_ENABLE, PMU_ULPI_BYPASS | PMU_AHB_INCR8 | PMU_AHB_INCR4 | PMU_AHB_INCRX_ALIGN); } @@ -266,8 +259,11 @@ awusbphy_vbus_detect(device_t dev, int *val) if (sc->vbus_det_valid) { error = gpio_pin_is_active(sc->vbus_det_pin, &active); - if (error != 0) + if (error != 0) { + device_printf(dev, "Cannot get status of id pin %d\n", + error); return (error); + } *val = active; return (0); } @@ -300,7 +296,21 @@ awusbphy_phy_enable(device_t dev, intptr_t phy, bool e /* If an external vbus is detected, do not enable phy 0 */ if (phy == 0) { error = awusbphy_vbus_detect(dev, &vbus_det); - if (error == 0 && vbus_det == 1) + if (error) + goto out; + + /* Depending on the PHY we need to route OTG to OHCI/EHCI */ + if (sc->phy_conf->phy0_route == true) { + if (vbus_det == 0) + /* Host mode */ + CLR4(sc->phy_ctrl, OTG_PHY_CFG, + OTG_PHY_ROUTE_OTG); + else + /* Peripheral mode */ + SET4(sc->phy_ctrl, OTG_PHY_CFG, + OTG_PHY_ROUTE_OTG); + } + if (vbus_det == 1) return (0); } else error = 0; @@ -308,6 +318,8 @@ awusbphy_phy_enable(device_t dev, intptr_t phy, bool e error = regulator_enable(reg); } else error = regulator_disable(reg); + +out: if (error != 0) { device_printf(dev, "couldn't %s regulator for phy %jd\n", Modified: projects/runtime-coverage/sys/boot/efi/libefi/efipart.c ============================================================================== --- projects/runtime-coverage/sys/boot/efi/libefi/efipart.c Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/sys/boot/efi/libefi/efipart.c Thu Sep 28 05:20:37 2017 (r324076) @@ -181,7 +181,7 @@ efipart_inithandles(void) static ACPI_HID_DEVICE_PATH * efipart_floppy(EFI_DEVICE_PATH *node) { - ACPI_HID_DEVICE_PATH *acpi = NULL; + ACPI_HID_DEVICE_PATH *acpi; if (DevicePathType(node) == ACPI_DEVICE_PATH && DevicePathSubType(node) == ACPI_DP) { @@ -192,7 +192,7 @@ efipart_floppy(EFI_DEVICE_PATH *node) return (acpi); } } - return (acpi); + return (NULL); } /* Modified: projects/runtime-coverage/sys/cddl/compat/opensolaris/sys/kcondvar.h ============================================================================== --- projects/runtime-coverage/sys/cddl/compat/opensolaris/sys/kcondvar.h Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/sys/cddl/compat/opensolaris/sys/kcondvar.h Thu Sep 28 05:20:37 2017 (r324076) @@ -63,13 +63,8 @@ static clock_t cv_timedwait_hires(kcondvar_t *cvp, kmutex_t *mp, hrtime_t tim, hrtime_t res, int flag) { - sbintime_t sbt; - sbintime_t pr; - sbt = tim * SBT_1NS; - pr = res * SBT_1NS; - - return (cv_timedwait_sbt(cvp, mp, sbt, pr, 0)); + return (cv_timedwait_sbt(cvp, mp, nstosbt(tim), nstosbt(res), 0)); } #endif /* _KERNEL */ Modified: projects/runtime-coverage/sys/cddl/compat/opensolaris/sys/time.h ============================================================================== --- projects/runtime-coverage/sys/cddl/compat/opensolaris/sys/time.h Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/sys/cddl/compat/opensolaris/sys/time.h Thu Sep 28 05:20:37 2017 (r324076) @@ -40,6 +40,9 @@ #define MSEC2NSEC(m) ((hrtime_t)(m) * (NANOSEC / MILLISEC)) #define NSEC2MSEC(n) ((n) / (NANOSEC / MILLISEC)) +#define USEC2NSEC(m) ((hrtime_t)(m) * (NANOSEC / MICROSEC)) +#define NSEC2USEC(n) ((n) / (NANOSEC / MICROSEC)) + #define NSEC2SEC(n) ((n) / (NANOSEC / SEC)) #define SEC2NSEC(m) ((hrtime_t)(m) * (NANOSEC / SEC)) Modified: projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c ============================================================================== --- projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Thu Sep 28 05:20:37 2017 (r324076) @@ -339,17 +339,17 @@ static void dtrace_nullop(void) {} -static dtrace_pops_t dtrace_provider_ops = { - (void (*)(void *, dtrace_probedesc_t *))dtrace_nullop, - (void (*)(void *, modctl_t *))dtrace_nullop, - (void (*)(void *, dtrace_id_t, void *))dtrace_nullop, - (void (*)(void *, dtrace_id_t, void *))dtrace_nullop, - (void (*)(void *, dtrace_id_t, void *))dtrace_nullop, - (void (*)(void *, dtrace_id_t, void *))dtrace_nullop, - NULL, - NULL, - NULL, - (void (*)(void *, dtrace_id_t, void *))dtrace_nullop +static dtrace_pops_t dtrace_provider_ops = { + .dtps_provide = (void (*)(void *, dtrace_probedesc_t *))dtrace_nullop, + .dtps_provide_module = (void (*)(void *, modctl_t *))dtrace_nullop, + .dtps_enable = (void (*)(void *, dtrace_id_t, void *))dtrace_nullop, + .dtps_disable = (void (*)(void *, dtrace_id_t, void *))dtrace_nullop, + .dtps_suspend = (void (*)(void *, dtrace_id_t, void *))dtrace_nullop, + .dtps_resume = (void (*)(void *, dtrace_id_t, void *))dtrace_nullop, + .dtps_getargdesc = NULL, + .dtps_getargval = NULL, + .dtps_usermode = NULL, + .dtps_destroy = (void (*)(void *, dtrace_id_t, void *))dtrace_nullop, }; static dtrace_id_t dtrace_probeid_begin; /* special BEGIN probe */ Modified: projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c ============================================================================== --- projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Thu Sep 28 01:27:00 2017 (r324075) +++ projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Thu Sep 28 05:20:37 2017 (r324076) @@ -1455,29 +1455,29 @@ static const dtrace_pattr_t pid_attr = { }; static dtrace_pops_t pid_pops = { - fasttrap_pid_provide, - NULL, - fasttrap_pid_enable, - fasttrap_pid_disable, - NULL, *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709280520.v8S5Kbf5056904>