Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src merge a new version of the CDDL dtrace and ZFS code.
details: https://anonhg.NetBSD.org/src/rev/0d826dd9da8d
branches: trunk
changeset: 832796:0d826dd9da8d
user: chs <chs%NetBSD.org@localhost>
date: Mon May 28 21:04:59 2018 +0000
description:
merge a new version of the CDDL dtrace and ZFS code.
this changes the upstream vendor from OpenSolaris to FreeBSD,
and this version is based on FreeBSD svn r315983.
in addition to the 10 years of improvements from upstream,
this version also has these NetBSD-specific enhancements:
- dtrace FBT probes can now be placed in kernel modules.
- ZFS now supports mmap().
diffstat:
distrib/sets/lists/base/shl.mi | 5 +-
distrib/sets/lists/comp/mi | 4 +-
distrib/sets/lists/comp/shl.mi | 5 +-
distrib/sets/lists/debug/mi | 3 +-
distrib/sets/lists/debug/shl.mi | 3 +-
distrib/sets/lists/man/mi | 5 +-
external/cddl/osnet/Makefile.inc | 4 +-
external/cddl/osnet/Makefile.zfs | 18 +-
external/cddl/osnet/dev/cyclic/arm/cyclic_machdep.c | 4 +-
external/cddl/osnet/dev/cyclic/cyclic.c | 5 +-
external/cddl/osnet/dev/cyclic/cyclic_test.c | 4 +-
external/cddl/osnet/dev/cyclic/i386/cyclic_machdep.c | 4 +-
external/cddl/osnet/dev/dtmalloc/dtmalloc.c | 14 +-
external/cddl/osnet/dev/dtrace/amd64/dis_tables.c | 3195 ----
external/cddl/osnet/dev/dtrace/amd64/dis_tables.h | 114 -
external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S | 4 +-
external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c | 95 +-
external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c | 194 +-
external/cddl/osnet/dev/dtrace/amd64/instr_size.c | 134 -
external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S | 176 +-
external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c | 13 +-
external/cddl/osnet/dev/dtrace/arm/dtrace_subr.c | 396 +-
external/cddl/osnet/dev/dtrace/arm/regset.h | 19 +-
external/cddl/osnet/dev/dtrace/dtrace_anon.c | 4 +-
external/cddl/osnet/dev/dtrace/dtrace_cddl.h | 62 +-
external/cddl/osnet/dev/dtrace/dtrace_clone.c | 63 -
external/cddl/osnet/dev/dtrace/dtrace_debug.c | 139 +-
external/cddl/osnet/dev/dtrace/dtrace_hacks.c | 9 +-
external/cddl/osnet/dev/dtrace/dtrace_ioctl.c | 127 +-
external/cddl/osnet/dev/dtrace/dtrace_load.c | 95 +-
external/cddl/osnet/dev/dtrace/dtrace_modevent.c | 4 +-
external/cddl/osnet/dev/dtrace/dtrace_sysctl.c | 33 +-
external/cddl/osnet/dev/dtrace/dtrace_test.c | 41 +-
external/cddl/osnet/dev/dtrace/dtrace_unload.c | 39 +-
external/cddl/osnet/dev/dtrace/dtrace_vtime.c | 4 +-
external/cddl/osnet/dev/dtrace/i386/dis_tables.c | 3195 ----
external/cddl/osnet/dev/dtrace/i386/dis_tables.h | 114 -
external/cddl/osnet/dev/dtrace/i386/dtrace_asm.S | 26 +-
external/cddl/osnet/dev/dtrace/i386/dtrace_isa.c | 212 +-
external/cddl/osnet/dev/dtrace/i386/dtrace_subr.c | 219 +-
external/cddl/osnet/dev/dtrace/i386/instr_size.c | 134 -
external/cddl/osnet/dev/fbt/fbt.c | 1326 +-
external/cddl/osnet/dev/fbt/fbt.h | 82 +
external/cddl/osnet/dev/lockstat/lockstat.c | 9 +-
external/cddl/osnet/dev/profile/profile.c | 265 +-
external/cddl/osnet/dev/sdt/sdt.c | 85 +-
external/cddl/osnet/dev/systrace/systrace.c | 273 +-
external/cddl/osnet/dist/cmd/dtrace/dtrace.1 | 1295 +-
external/cddl/osnet/dist/cmd/dtrace/dtrace.c | 238 +-
external/cddl/osnet/dist/cmd/zdb/zdb.c | 1695 +-
external/cddl/osnet/dist/cmd/zdb/zdb_il.c | 15 +-
external/cddl/osnet/dist/cmd/zfs/zfs_main.c | 4979 +++++-
external/cddl/osnet/dist/cmd/zpool/zpool_main.c | 2307 ++-
external/cddl/osnet/dist/cmd/zpool/zpool_vdev.c | 302 +-
external/cddl/osnet/dist/cmd/ztest/ztest.c | 2166 ++-
external/cddl/osnet/dist/common/acl/acl_common.c | 393 +-
external/cddl/osnet/dist/common/ctf/ctf_types.c | 31 +-
external/cddl/osnet/dist/common/nvpair/fnvpair.c | 2 +-
external/cddl/osnet/dist/common/nvpair/nvpair.c | 25 +-
external/cddl/osnet/dist/common/util/sscanf.h | 47 -
external/cddl/osnet/dist/common/zfs/zfeature_common.c | 2 +
external/cddl/osnet/dist/common/zfs/zfeature_common.h | 2 +
external/cddl/osnet/dist/common/zfs/zfs_ioctl_compat.h | 5 +-
external/cddl/osnet/dist/common/zfs/zfs_prop.c | 4 +
external/cddl/osnet/dist/common/zfs/zprop_common.c | 4 +
external/cddl/osnet/dist/head/ucred.h | 108 -
external/cddl/osnet/dist/lib/libctf/common/ctf_lib.c | 1 +
external/cddl/osnet/dist/lib/libdtrace/arm/dt_isadep.c | 13 +-
external/cddl/osnet/dist/lib/libdtrace/common/drti.c | 24 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_aggregate.c | 4 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_as.c | 3 -
external/cddl/osnet/dist/lib/libdtrace/common/dt_cc.c | 73 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_cg.c | 46 -
external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c | 346 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_dis.c | 6 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_dof.c | 14 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_errtags.h | 2 -
external/cddl/osnet/dist/lib/libdtrace/common/dt_grammar.y | 34 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_handle.c | 6 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_ident.c | 10 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h | 16 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c | 195 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c | 111 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c | 24 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_options.c | 2 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.c | 309 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.h | 16 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_pid.c | 59 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_print.c | 4 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c | 11 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c | 12 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.h | 4 +
external/cddl/osnet/dist/lib/libdtrace/common/dt_provider.c | 8 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_regset.c | 7 +-
external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c | 29 +-
external/cddl/osnet/dist/lib/libdtrace/common/dtrace.h | 9 +-
external/cddl/osnet/dist/lib/libdtrace/i386/dt_isadep.c | 3 +-
external/cddl/osnet/dist/lib/libefi/common/crc32_efi.c | 47 -
external/cddl/osnet/dist/lib/libgen/common/gmatch.c | 37 +-
external/cddl/osnet/dist/lib/libnvpair/libnvpair.c | 667 +-
external/cddl/osnet/dist/lib/libuutil/common/uu_misc.c | 42 +-
external/cddl/osnet/dist/lib/libzfs/common/libzfs.h | 240 +-
external/cddl/osnet/dist/lib/libzfs/common/libzfs_compat.c | 8 +-
external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c | 2318 ++-
external/cddl/osnet/dist/lib/libzfs/common/libzfs_graph.c | 653 -
external/cddl/osnet/dist/lib/libzfs/common/libzfs_impl.h | 5 -
external/cddl/osnet/dist/lib/libzfs/common/libzfs_import.c | 550 +-
external/cddl/osnet/dist/lib/libzfs/common/libzfs_mount.c | 360 +-
external/cddl/osnet/dist/lib/libzfs/common/libzfs_pool.c | 1346 +-
external/cddl/osnet/dist/lib/libzfs/common/libzfs_sendrecv.c | 2088 ++-
external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c | 243 +-
external/cddl/osnet/dist/lib/libzpool/common/kernel.c | 2 +-
external/cddl/osnet/dist/lib/libzpool/common/taskq.c | 141 +-
external/cddl/osnet/dist/lib/libzpool/common/util.c | 35 +-
external/cddl/osnet/dist/tools/ctf/cvt/barrier.c | 21 +-
external/cddl/osnet/dist/tools/ctf/cvt/barrier.h | 2 +-
external/cddl/osnet/dist/tools/ctf/cvt/ctf.c | 13 +-
external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c | 6 +-
external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c | 17 +-
external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h | 4 +-
external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c | 56 +-
external/cddl/osnet/dist/tools/ctf/cvt/merge.c | 19 +-
external/cddl/osnet/dist/tools/ctf/cvt/output.c | 8 +-
external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c | 4 +-
external/cddl/osnet/dist/tools/ctf/cvt/stabs.c | 4 +-
external/cddl/osnet/dist/tools/ctf/cvt/strtab.c | 2 +-
external/cddl/osnet/dist/tools/ctf/cvt/tdata.c | 2 +-
external/cddl/osnet/dist/tools/ctf/cvt/util.c | 2 +-
external/cddl/osnet/dist/uts/common/Makefile.files | 1912 +--
external/cddl/osnet/dist/uts/common/dtrace/dtrace.c | 4250 ++++-
external/cddl/osnet/dist/uts/common/dtrace/fasttrap.c | 1035 +-
external/cddl/osnet/dist/uts/common/fs/gfs.c | 1191 -
external/cddl/osnet/dist/uts/common/fs/vnode.c | 2 +
external/cddl/osnet/dist/uts/common/fs/zfs/arc.c | 6981 +++++++--
external/cddl/osnet/dist/uts/common/fs/zfs/dbuf.c | 2339 ++-
external/cddl/osnet/dist/uts/common/fs/zfs/ddt.c | 216 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dmu.c | 1383 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dmu_diff.c | 29 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dmu_send.c | 38 +
external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c | 6 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c | 1181 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c | 436 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c | 5293 +++---
external/cddl/osnet/dist/uts/common/fs/zfs/dsl_deleg.c | 230 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dir.c | 8 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dsl_pool.c | 1051 +-
external/cddl/osnet/dist/uts/common/fs/zfs/dsl_scrub.c | 1200 -
external/cddl/osnet/dist/uts/common/fs/zfs/lz4.c | 14 +
external/cddl/osnet/dist/uts/common/fs/zfs/rrwlock.c | 163 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sa.c | 13 +
external/cddl/osnet/dist/uts/common/fs/zfs/sha256.c | 6 +
external/cddl/osnet/dist/uts/common/fs/zfs/spa.c | 3152 +++-
external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c | 246 +-
external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c | 280 +-
external/cddl/osnet/dist/uts/common/fs/zfs/spa_misc.c | 810 +-
external/cddl/osnet/dist/uts/common/fs/zfs/space_map.c | 816 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dbuf.h | 125 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/ddt.h | 41 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dmu.h | 500 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_dataset.h | 232 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/refcount.h | 2 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h | 427 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa_impl.h | 15 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev_disk.h | 27 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev_impl.h | 2 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_dir.h | 20 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_ioctl.h | 2 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_rlock.h | 18 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_znode.h | 186 +-
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zio.h | 2 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zio_checksum.h | 2 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zio_compress.h | 5 +
external/cddl/osnet/dist/uts/common/fs/zfs/sys/zvol.h | 27 +-
external/cddl/osnet/dist/uts/common/fs/zfs/trim_map.c | 21 +
external/cddl/osnet/dist/uts/common/fs/zfs/txg.c | 269 +-
external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c | 1185 +-
external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c | 395 +-
external/cddl/osnet/dist/uts/common/fs/zfs/vdev_file.c | 101 +-
external/cddl/osnet/dist/uts/common/fs/zfs/vdev_mirror.c | 2 +
external/cddl/osnet/dist/uts/common/fs/zfs/vdev_raidz.c | 4 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zap_micro.c | 539 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c | 1533 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c | 1959 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_dir.c | 767 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c | 86 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c | 5296 +++++--
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_onexit.c | 13 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c | 202 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_rlock.c | 114 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c | 1854 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c | 5237 +++---
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c | 1637 +-
external/cddl/osnet/dist/uts/common/fs/zfs/zio.c | 1690 ++-
external/cddl/osnet/dist/uts/common/fs/zfs/zio_checksum.c | 4 +
external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c | 2597 +++-
external/cddl/osnet/dist/uts/common/rpc/xdr.h | 11 +-
external/cddl/osnet/dist/uts/common/sys/acl.h | 10 -
external/cddl/osnet/dist/uts/common/sys/attr.h | 148 -
external/cddl/osnet/dist/uts/common/sys/byteorder.h | 248 -
external/cddl/osnet/dist/uts/common/sys/ccompile.h | 2 -
external/cddl/osnet/dist/uts/common/sys/cmn_err.h | 5 +
external/cddl/osnet/dist/uts/common/sys/crc32.h | 232 -
external/cddl/osnet/dist/uts/common/sys/ctf.h | 2 +-
external/cddl/osnet/dist/uts/common/sys/debug.h | 43 +-
external/cddl/osnet/dist/uts/common/sys/dklabel.h | 277 -
external/cddl/osnet/dist/uts/common/sys/dtrace.h | 107 +-
external/cddl/osnet/dist/uts/common/sys/dtrace_impl.h | 59 +-
external/cddl/osnet/dist/uts/common/sys/efi_partition.h | 241 -
external/cddl/osnet/dist/uts/common/sys/errorq.h | 6 +-
external/cddl/osnet/dist/uts/common/sys/fm/util.h | 12 +-
external/cddl/osnet/dist/uts/common/sys/fs/zfs.h | 321 +-
external/cddl/osnet/dist/uts/common/sys/gfs.h | 173 -
external/cddl/osnet/dist/uts/common/sys/mntent.h | 141 -
external/cddl/osnet/dist/uts/common/sys/priv.h | 251 -
external/cddl/osnet/dist/uts/common/sys/processor.h | 21 +-
external/cddl/osnet/dist/uts/common/sys/stropts.h | 518 -
external/cddl/osnet/dist/uts/common/sys/sysevent.h | 23 +-
external/cddl/osnet/dist/uts/common/sys/taskq.h | 15 +-
external/cddl/osnet/dist/uts/common/sys/tsol/label.h | 168 -
external/cddl/osnet/dist/uts/common/sys/vnode.h | 426 +
external/cddl/osnet/dist/uts/common/sys/vtoc.h | 350 -
external/cddl/osnet/dist/uts/common/zmod/deflate.c | 2 +-
external/cddl/osnet/dist/uts/common/zmod/zlib.h | 2 +-
external/cddl/osnet/dist/uts/common/zmod/zlib_lint.c | 89 -
external/cddl/osnet/dist/uts/common/zmod/zutil.c | 2 +-
external/cddl/osnet/dist/uts/common/zmod/zutil.h | 6 +-
external/cddl/osnet/dist/uts/sparc/sys/fasttrap_isa.h | 94 -
external/cddl/osnet/include/alloca.h | 4 +-
external/cddl/osnet/include/dtrace.h | 4 +-
external/cddl/osnet/include/fcntl.h | 7 +-
external/cddl/osnet/include/fm/libtopo.h | 8 -
external/cddl/osnet/include/fsshare.h | 4 +-
external/cddl/osnet/include/idmap.h | 93 -
external/cddl/osnet/include/libdevinfo.h | 30 -
external/cddl/osnet/include/libproc.h | 18 +-
external/cddl/osnet/include/mnttab.h | 19 +-
external/cddl/osnet/include/solaris.h | 10 +-
external/cddl/osnet/include/stdio.h | 4 +-
external/cddl/osnet/include/stdlib.h | 8 +-
external/cddl/osnet/include/strings.h | 4 +-
external/cddl/osnet/include/thread.h | 4 +-
external/cddl/osnet/include/thread_pool.h | 78 +
external/cddl/osnet/include/unistd.h | 4 +-
external/cddl/osnet/lib/Makefile | 4 +-
external/cddl/osnet/lib/libctf/Makefile | 7 +-
external/cddl/osnet/lib/libdtrace/Makefile | 34 +-
external/cddl/osnet/lib/libdtrace/errno.d | 4 +-
external/cddl/osnet/lib/libdtrace/libproc_compat.h | 5 +-
external/cddl/osnet/lib/libdtrace/net.d | 4 +-
external/cddl/osnet/lib/libdtrace/nfs.d | 22 +-
external/cddl/osnet/lib/libdtrace/psinfo.d | 4 +-
external/cddl/osnet/lib/libdtrace/sched.d | 6 +-
external/cddl/osnet/lib/libdtrace/signal.d | 4 +-
external/cddl/osnet/lib/libdtrace/unistd.d | 4 +-
external/cddl/osnet/lib/libnvpair/Makefile | 16 +-
external/cddl/osnet/lib/libumem/misc.h | 141 -
external/cddl/osnet/lib/libumem/stub_stand.c | 89 -
external/cddl/osnet/lib/libzfs/Makefile | 43 +-
external/cddl/osnet/lib/libzfs/deviceid.c | 20 +-
external/cddl/osnet/lib/libzfs/efi.c | 61 -
external/cddl/osnet/lib/libzfs/fsshare.c | 22 +-
external/cddl/osnet/lib/libzfs/mnttab.c | 194 +-
external/cddl/osnet/lib/libzfs/stubs.c | 17 -
external/cddl/osnet/lib/libzfs/thread_pool.c | 426 +
external/cddl/osnet/lib/libzfs/thread_pool_impl.h | 99 +
external/cddl/osnet/lib/libzfs/ucred.c | 59 -
external/cddl/osnet/lib/libzfs/zone.c | 4 +-
external/cddl/osnet/lib/libzpool/Makefile | 10 +-
external/cddl/osnet/lib/libzpool/kernel.c | 749 -
external/cddl/osnet/lib/libzpool/kernel2.c | 289 -
external/cddl/osnet/sbin/zfs/Makefile | 5 +-
external/cddl/osnet/sbin/zfs/zfs.8 | 5535 +++++--
external/cddl/osnet/sbin/zpool/Makefile | 7 +-
external/cddl/osnet/sbin/zpool/zpool-features.7 | 566 +
external/cddl/osnet/sbin/zpool/zpool.8 | 3142 ++-
external/cddl/osnet/sys/kern/ddi.c | 42 +-
external/cddl/osnet/sys/kern/fm.c | 3 +-
external/cddl/osnet/sys/kern/kmem.c | 67 +
external/cddl/osnet/sys/kern/kobj.c | 12 +-
external/cddl/osnet/sys/kern/kstat.c | 18 +-
external/cddl/osnet/sys/kern/misc.c | 37 +-
external/cddl/osnet/sys/kern/mod.c | 6 +-
external/cddl/osnet/sys/kern/opensolaris.c | 4 +-
external/cddl/osnet/sys/kern/policy.c | 319 +-
external/cddl/osnet/sys/kern/printf.c | 6 +-
external/cddl/osnet/sys/kern/sysevent.c | 344 +
external/cddl/osnet/sys/kern/taskq.c | 782 +-
external/cddl/osnet/sys/kern/vfs.c | 191 +-
external/cddl/osnet/sys/kern/zfs_stub.c | 129 +-
external/cddl/osnet/sys/kern/zone.c | 6 +-
external/cddl/osnet/sys/machine/endian.h | 2 +-
external/cddl/osnet/sys/sharefs/share.h | 30 -
external/cddl/osnet/sys/sys/acl.h | 412 +-
external/cddl/osnet/sys/sys/acl/acl_common.h | 66 -
external/cddl/osnet/sys/sys/attr.h | 30 -
external/cddl/osnet/sys/sys/byteorder.h | 23 +-
external/cddl/osnet/sys/sys/callb.h | 14 +-
external/cddl/osnet/sys/sys/cdefs.h | 10 +
external/cddl/osnet/sys/sys/cmn_err.h | 75 +-
external/cddl/osnet/sys/sys/cpuvar.h | 3 +-
external/cddl/osnet/sys/sys/cred.h | 20 +-
external/cddl/osnet/sys/sys/cred_impl.h | 5 -
external/cddl/osnet/sys/sys/cyclic.h | 15 +-
external/cddl/osnet/sys/sys/cyclic_impl.h | 4 +-
external/cddl/osnet/sys/sys/ddi.h | 63 -
external/cddl/osnet/sys/sys/debug.h | 41 +-
external/cddl/osnet/sys/sys/dirent.h | 15 +-
external/cddl/osnet/sys/sys/dnlc.h | 4 +-
external/cddl/osnet/sys/sys/elf.h | 4 +-
external/cddl/osnet/sys/sys/feature_tests.h | 4 +-
external/cddl/osnet/sys/sys/fs/fs_subr.h | 5 -
external/cddl/osnet/sys/sys/fs/swapnode.h | 30 -
external/cddl/osnet/sys/sys/idmap.h | 93 -
external/cddl/osnet/sys/sys/kcondvar.h | 29 +-
external/cddl/osnet/sys/sys/kidmap.h | 4 +-
external/cddl/osnet/sys/sys/kmem.h | 53 +-
external/cddl/osnet/sys/sys/kobj.h | 5 +-
external/cddl/osnet/sys/sys/kobj_impl.h | 30 -
external/cddl/osnet/sys/sys/kstat.h | 15 +-
external/cddl/osnet/sys/sys/lock.h | 48 -
external/cddl/osnet/sys/sys/misc.h | 13 +-
external/cddl/osnet/sys/sys/mkdev.h | 64 +-
external/cddl/osnet/sys/sys/mman.h | 4 +-
external/cddl/osnet/sys/sys/mntent.h | 4 +-
external/cddl/osnet/sys/sys/mnttab.h | 10 +-
external/cddl/osnet/sys/sys/modctl.h | 6 +-
external/cddl/osnet/sys/sys/mode.h | 30 -
external/cddl/osnet/sys/sys/mount.h | 9 +-
external/cddl/osnet/sys/sys/mutex.h | 8 +-
external/cddl/osnet/sys/sys/opentypes.h | 5 +-
external/cddl/osnet/sys/sys/param.h | 7 +-
external/cddl/osnet/sys/sys/pathname.h | 12 +-
external/cddl/osnet/sys/sys/pcpu.h | 4 +-
external/cddl/osnet/sys/sys/policy.h | 66 +-
external/cddl/osnet/sys/sys/priv_impl.h | 6 -
external/cddl/osnet/sys/sys/proc.h | 6 +-
external/cddl/osnet/sys/sys/procset.h | 155 +-
external/cddl/osnet/sys/sys/racct.h | 1 +
external/cddl/osnet/sys/sys/random.h | 9 +-
external/cddl/osnet/sys/sys/refstr.h | 4 +-
external/cddl/osnet/sys/sys/rwlock.h | 4 +-
external/cddl/osnet/sys/sys/sdt.h | 15 +-
external/cddl/osnet/sys/sys/sema.h | 4 +-
external/cddl/osnet/sys/sys/sid.h | 68 +-
external/cddl/osnet/sys/sys/sig.h | 4 +-
external/cddl/osnet/sys/sys/stat.h | 4 +-
external/cddl/osnet/sys/sys/stream.h | 32 -
external/cddl/osnet/sys/sys/string.h | 4 +-
external/cddl/osnet/sys/sys/sunddi.h | 44 +-
external/cddl/osnet/sys/sys/sysevent.h | 276 -
external/cddl/osnet/sys/sys/sysmacros.h | 44 +-
external/cddl/osnet/sys/sys/systm.h | 13 +-
external/cddl/osnet/sys/sys/thread.h | 3 +-
external/cddl/osnet/sys/sys/time.h | 61 +-
external/cddl/osnet/sys/sys/types.h | 10 +-
external/cddl/osnet/sys/sys/uio.h | 11 +-
external/cddl/osnet/sys/sys/unistd.h | 17 -
external/cddl/osnet/sys/sys/varargs.h | 4 +-
external/cddl/osnet/sys/sys/vfs.h | 56 +-
external/cddl/osnet/sys/sys/vfs_opreg.h | 5 -
external/cddl/osnet/sys/sys/vm.h | 1 +
external/cddl/osnet/sys/sys/vm/as.h | 5 -
external/cddl/osnet/sys/sys/vm/kpm.h | 5 -
external/cddl/osnet/sys/sys/vm/pvn.h | 5 -
external/cddl/osnet/sys/sys/vm/seg_kpm.h | 5 -
external/cddl/osnet/sys/sys/vm/seg_vn.h | 5 -
external/cddl/osnet/sys/sys/vmsystm.h | 30 -
external/cddl/osnet/sys/sys/vnode.h | 472 +-
external/cddl/osnet/sys/sys/zfs_context.h | 386 +-
external/cddl/osnet/sys/sys/zone.h | 8 +-
external/cddl/osnet/sys/vm/anon.h | 30 -
external/cddl/osnet/usr.bin/ctfconvert/Makefile | 4 +-
external/cddl/osnet/usr.bin/ctfconvert/ctfconvert.1 | 85 +-
external/cddl/osnet/usr.bin/ctfdump/Makefile | 4 +-
external/cddl/osnet/usr.bin/ctfdump/ctfdump.1 | 65 +-
external/cddl/osnet/usr.bin/ctfmerge/Makefile | 4 +-
external/cddl/osnet/usr.bin/ctfmerge/ctfmerge.1 | 118 +-
external/cddl/osnet/usr.sbin/dtrace/Makefile | 10 +-
external/cddl/osnet/usr.sbin/zdb/Makefile | 5 +-
external/cddl/osnet/usr.sbin/zdb/zdb.8 | 430 +-
lib/Makefile | 8 +-
sys/arch/arm/arm/undefined.c | 20 +-
sys/arch/arm/arm32/db_interface.c | 85 +-
sys/arch/arm/arm32/vm_machdep.c | 92 +-
sys/kern/kern_ctf.c | 51 +-
sys/modules/dtrace/dtrace/Makefile | 22 +-
sys/modules/dtrace/fbt/Makefile | 16 +-
sys/modules/dtrace/linux32_syscall/Makefile | 6 +-
sys/modules/dtrace/linux_syscall/Makefile | 6 +-
sys/modules/dtrace/netbsd32_syscall/Makefile | 6 +-
sys/modules/dtrace/profile/Makefile | 4 +-
sys/modules/dtrace/syscall/Makefile | 6 +-
sys/modules/solaris/Makefile.solmod | 24 +-
sys/modules/zfs/Makefile.zfsmod | 54 +-
sys/rump/kern/lib/libsolaris/Makefile | 4 +-
sys/sys/kern_ctf.h | 8 +-
sys/sys/pset.h | 5 +-
usr.bin/kdump/Makefile.ioctl-c | 3 +-
usr.bin/kdump/mkioctls | 3 +-
usr.sbin/fstyp/Makefile | 18 +-
400 files changed, 68354 insertions(+), 50240 deletions(-)
diffs (truncated from 164447 to 300 lines):
diff -r 879459739cfc -r 0d826dd9da8d distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi Mon May 28 21:04:41 2018 +0000
+++ b/distrib/sets/lists/base/shl.mi Mon May 28 21:04:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.838 2018/05/03 22:51:17 sevan Exp $
+# $NetBSD: shl.mi,v 1.839 2018/05/28 21:04:59 chs Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -871,6 +871,9 @@
./usr/lib/libzfs.so base-zfs-shlib compatfile,zfs
./usr/lib/libzfs.so.0 base-zfs-shlib compatfile,zfs
./usr/lib/libzfs.so.0.0 base-zfs-shlib compatfile,zfs
+./usr/lib/libzfs_core.so base-zfs-shlib compatfile,zfs
+./usr/lib/libzfs_core.so.0 base-zfs-shlib compatfile,zfs
+./usr/lib/libzfs_core.so.0.0 base-zfs-shlib compatfile,zfs
./usr/lib/libzpool.so base-zfs-shlib compatfile,zfs
./usr/lib/libzpool.so.0 base-zfs-shlib compatfile,zfs
./usr/lib/libzpool.so.0.0 base-zfs-shlib compatfile,zfs
diff -r 879459739cfc -r 0d826dd9da8d distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Mon May 28 21:04:41 2018 +0000
+++ b/distrib/sets/lists/comp/mi Mon May 28 21:04:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2198 2018/05/28 00:18:05 nat Exp $
+# $NetBSD: mi,v 1.2199 2018/05/28 21:04:59 chs Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -3772,6 +3772,8 @@
./usr/lib/libz_p.a comp-c-proflib compatfile,profile
./usr/lib/libzfs.a comp-zfs-lib compatfile,zfs
./usr/lib/libzfs_p.a comp-zfs-proflib compatfile,zfs,profile
+./usr/lib/libzfs_core.a comp-zfs-lib compatfile,zfs
+./usr/lib/libzfs_core_p.a comp-zfs-proflib compatfile,zfs,profile
./usr/lib/libzpool.a comp-zfs-lib compatfile,zfs
./usr/lib/libzpool_p.a comp-zfs-proflib compatfile,zfs,profile
./usr/lib/pkgconfig comp-c-lib
diff -r 879459739cfc -r 0d826dd9da8d distrib/sets/lists/comp/shl.mi
--- a/distrib/sets/lists/comp/shl.mi Mon May 28 21:04:41 2018 +0000
+++ b/distrib/sets/lists/comp/shl.mi Mon May 28 21:04:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.315 2018/05/05 01:09:08 sevan Exp $
+# $NetBSD: shl.mi,v 1.316 2018/05/28 21:04:59 chs Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -277,7 +277,8 @@
./usr/lib/libwrap_pic.a comp-c-piclib compatfile,picinstall
./usr/lib/libz_pic.a comp-c-piclib compatfile,picinstall
./usr/lib/libzfs_pic.a comp-zfs-piclib compatfile,picinstall,zfs
-./usr/lib/libzpool_pic.a comp-zfs-piclib compatfile,zfs,picinstall
+./usr/lib/libzfs_core_pic.a comp-zfs-piclib compatfile,picinstall,zfs
+./usr/lib/libzpool_pic.a comp-zfs-piclib compatfile,picinstall,zfs
./usr/libexec/liblto_plugin.so comp-c-bin gcc
./usr/libexec/liblto_plugin.so.0 comp-c-bin gcc
./usr/libexec/liblto_plugin.so.0.1 comp-c-bin gcc
diff -r 879459739cfc -r 0d826dd9da8d distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi Mon May 28 21:04:41 2018 +0000
+++ b/distrib/sets/lists/debug/mi Mon May 28 21:04:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.249 2018/05/25 15:42:48 martin Exp $
+# $NetBSD: mi,v 1.250 2018/05/28 21:05:00 chs Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -265,6 +265,7 @@
./usr/lib/liby_g.a comp-c-debuglib debuglib,compatfile
./usr/lib/libz_g.a comp-c-debuglib debuglib,compatfile
./usr/lib/libzfs_g.a comp-c-debuglib debuglib,compatfile,zfs
+./usr/lib/libzfs_core_g.a comp-c-debuglib debuglib,compatfile,zfs
./usr/lib/libzpool_g.a comp-c-debuglib debuglib,compatfile,zfs
./usr/libdata/debug/bin/cat.debug comp-util-debug debug
./usr/libdata/debug/bin/chio.debug comp-util-debug debug
diff -r 879459739cfc -r 0d826dd9da8d distrib/sets/lists/debug/shl.mi
--- a/distrib/sets/lists/debug/shl.mi Mon May 28 21:04:41 2018 +0000
+++ b/distrib/sets/lists/debug/shl.mi Mon May 28 21:04:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.197 2018/05/04 12:44:40 sevan Exp $
+# $NetBSD: shl.mi,v 1.198 2018/05/28 21:05:00 chs Exp $
./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils
./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir
./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot
@@ -294,6 +294,7 @@
./usr/libdata/debug/usr/lib/libwrap.so.1.0.debug comp-net-debug debug,compatfile
./usr/libdata/debug/usr/lib/libz.so.1.0.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/libzfs.so.0.0.debug comp-zfs-debug debug,compatfile,zfs
+./usr/libdata/debug/usr/lib/libzfs_core.so.0.0.debug comp-zfs-debug debug,compatfile,zfs
./usr/libdata/debug/usr/lib/libzpool.so.0.0.debug comp-zfs-debug debug,compatfile,zfs
./usr/libdata/debug/usr/lib/npf/ext_log.so.0.0.debug comp-obsolete debug,compatfile,npf,obsolete
./usr/libdata/debug/usr/lib/npf/ext_normalise.so.0.0.debug comp-obsolete debug,compatfile,npf,obsolete
diff -r 879459739cfc -r 0d826dd9da8d distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Mon May 28 21:04:41 2018 +0000
+++ b/distrib/sets/lists/man/mi Mon May 28 21:04:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1591 2018/05/28 00:18:05 nat Exp $
+# $NetBSD: mi,v 1.1592 2018/05/28 21:05:00 chs Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2317,6 +2317,7 @@
./usr/share/man/cat7/symlink.0 man-reference-catman .cat
./usr/share/man/cat7/sysctl.0 man-reference-catman .cat
./usr/share/man/cat7/tests.0 man-reference-catman .cat
+./usr/share/man/cat7/zpool-features.8 man-zfs-catman zfs,.cat
./usr/share/man/cat8/MAKEDEV.0 man-sysutil-catman .cat
./usr/share/man/cat8/MAKEDEV.local.0 man-sysutil-catman .cat
./usr/share/man/cat8/ac.0 man-sysutil-catman .cat
@@ -5358,6 +5359,7 @@
./usr/share/man/html7/symlink.html man-reference-htmlman html
./usr/share/man/html7/sysctl.html man-reference-htmlman html
./usr/share/man/html7/tests.html man-reference-htmlman html
+./usr/share/man/html7/zpool-features.html man-zfs-htmlman zfs,html
./usr/share/man/html8/MAKEDEV.html man-sysutil-htmlman html
./usr/share/man/html8/MAKEDEV.local.html man-sysutil-htmlman html
./usr/share/man/html8/ac.html man-sysutil-htmlman html
@@ -8376,6 +8378,7 @@
./usr/share/man/man7/symlink.7 man-reference-man .man
./usr/share/man/man7/sysctl.7 man-reference-man .man
./usr/share/man/man7/tests.7 man-reference-man .man
+./usr/share/man/man7/zpool-features.7 man-zfs-man zfs,.man
./usr/share/man/man8/MAKEDEV.8 man-sysutil-man .man
./usr/share/man/man8/MAKEDEV.local.8 man-sysutil-man .man
./usr/share/man/man8/ac.8 man-sysutil-man .man
diff -r 879459739cfc -r 0d826dd9da8d external/cddl/osnet/Makefile.inc
--- a/external/cddl/osnet/Makefile.inc Mon May 28 21:04:41 2018 +0000
+++ b/external/cddl/osnet/Makefile.inc Mon May 28 21:04:59 2018 +0000
@@ -1,8 +1,10 @@
-# $FreeBSD: src/cddl/Makefile.inc,v 1.6.2.1 2009/08/03 08:13:06 kensmith Exp $
+# $FreeBSD: head/cddl/Makefile.inc 270358 2014-08-22 20:04:51Z delphij $
WARNS?=5
+
OSNETDIR= ${NETBSDSRCDIR}/external/cddl/osnet
OPENSOLARIS_USR_DISTDIR=${OSNETDIR}/dist
OPENSOLARIS_SYS_DISTDIR=${OSNETDIR}/dist
+
CPPFLAGS+=-Wno-unknown-pragmas -Wno-sign-compare -D_KERNTYPES
diff -r 879459739cfc -r 0d826dd9da8d external/cddl/osnet/Makefile.zfs
--- a/external/cddl/osnet/Makefile.zfs Mon May 28 21:04:41 2018 +0000
+++ b/external/cddl/osnet/Makefile.zfs Mon May 28 21:04:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zfs,v 1.4 2012/09/05 23:08:42 riz Exp $
+# $NetBSD: Makefile.zfs,v 1.5 2018/05/28 21:05:02 chs Exp $
.include <bsd.own.mk>
@@ -6,15 +6,13 @@
NOGCCERROR= yes
# Basic compilation stuff.
-CPPFLAGS+= "-D__va_list=va_list"
-CPPFLAGS+= "-Doffsetof(s, m)=((size_t)(&(((s *)0)->m)))"
CPPFLAGS+= -std=c99
# Pick a VTOC format - ick.
CPPFLAGS+= -D_SUNOS_VTOC_16
CPPFLAGS+= -D_PROPLIB_ZFS_CONFLICT
-CFLAGS+= -O0 -fno-inline
+#CFLAGS+= -O0 -fno-inline
#DBG= -g
@@ -36,14 +34,24 @@
CPPFLAGS+= -I${ZFSDIR}/dist/lib/libumem
CPPFLAGS+= -I${ZFSDIR}/dist/lib/libuutil/common
CPPFLAGS+= -I${ZFSDIR}/dist/lib/libzfs/common
+CPPFLAGS+= -I${ZFSDIR}/dist/lib/libzfs_core/common
CPPFLAGS+= -I${ZFSDIR}/dist/lib/libzpool/common
CPPFLAGS+= -I${ZFSDIR}/dist/common
+CWARNFLAGS+= -Wno-missing-field-initializers
+CWARNFLAGS+= -Wno-strict-prototypes
+CWARNFLAGS+= -Wno-cast-qual
+CWARNFLAGS+= -Wno-discarded-qualifiers
+CWARNFLAGS+= -Wno-switch
+CWARNFLAGS+= -Wno-missing-prototypes
+CWARNFLAGS+= -Wno-unused-variable
+CWARNFLAGS+= -Wno-shadow
+
LIBAVL_SRCDIR= ${ZFSDIR}/lib/libavl
LIBNVPAIR_SRCDIR= ${ZFSDIR}/lib/libnvpair
LIBUMEM_SRCDIR= ${ZFSDIR}/lib/libumem
LIBUUTIL_SRCDIR= ${ZFSDIR}/lib/libuutil
LIBZFS_SRCDIR= ${ZFSDIR}/lib/libzfs
+LIBZFS_CORE_SRCDIR= ${ZFSDIR}/lib/libzfs_core
LIBZPOOL_SRCDIR= ${ZFSDIR}/lib/libzpool
-
diff -r 879459739cfc -r 0d826dd9da8d external/cddl/osnet/dev/cyclic/arm/cyclic_machdep.c
--- a/external/cddl/osnet/dev/cyclic/arm/cyclic_machdep.c Mon May 28 21:04:41 2018 +0000
+++ b/external/cddl/osnet/dev/cyclic/arm/cyclic_machdep.c Mon May 28 21:04:59 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cyclic_machdep.c,v 1.1 2014/03/05 06:35:44 ozaki-r Exp $ */
+/* $NetBSD: cyclic_machdep.c,v 1.2 2018/05/28 21:05:02 chs Exp $ */
/*
* Copyright 2006-2008 John Birrell <jb%FreeBSD.org@localhost>
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: head/sys/cddl/dev/cyclic/i386/cyclic_machdep.c 222813 2011-06-07 08:46:13Z attilio $
*
*/
diff -r 879459739cfc -r 0d826dd9da8d external/cddl/osnet/dev/cyclic/cyclic.c
--- a/external/cddl/osnet/dev/cyclic/cyclic.c Mon May 28 21:04:41 2018 +0000
+++ b/external/cddl/osnet/dev/cyclic/cyclic.c Mon May 28 21:04:59 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cyclic.c,v 1.7 2017/02/01 21:59:09 chs Exp $ */
+/* $NetBSD: cyclic.c,v 1.8 2018/05/28 21:05:02 chs Exp $ */
/*
* CDDL HEADER START
@@ -23,7 +23,7 @@
*
* Portions Copyright 2008 John Birrell <jb%freebsd.org@localhost>
*
- * $FreeBSD$
+ * $FreeBSD: head/sys/cddl/dev/cyclic/cyclic.c 227293 2011-11-07 06:44:47Z ed $
*
* This is a simplified version of the cyclic timer subsystem from
* OpenSolaris. In the FreeBSD version, we don't use interrupt levels.
@@ -352,7 +352,6 @@
#define mtx_unlock_spin(x) mutex_spin_exit(x)
#define mtx_destroy(x) mutex_destroy(x)
-#define ASSERT(x) KASSERT(x)
#define SYSINIT(a1, a2, a3, a4, a5)
#define SYSUNINIT(a1, a2, a3, a4, a5)
#define CPU_FOREACH(var) \
diff -r 879459739cfc -r 0d826dd9da8d external/cddl/osnet/dev/cyclic/cyclic_test.c
--- a/external/cddl/osnet/dev/cyclic/cyclic_test.c Mon May 28 21:04:41 2018 +0000
+++ b/external/cddl/osnet/dev/cyclic/cyclic_test.c Mon May 28 21:04:59 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cyclic_test.c,v 1.2 2010/02/21 01:46:33 darran Exp $ */
+/* $NetBSD: cyclic_test.c,v 1.3 2018/05/28 21:05:02 chs Exp $ */
/*-
* Copyright 2007 John Birrell <jb%FreeBSD.org@localhost>
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/cddl/dev/cyclic/cyclic_test.c,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+ * $FreeBSD: head/sys/cddl/dev/cyclic/cyclic_test.c 179260 2008-05-23 22:21:58Z jb $
*
*/
diff -r 879459739cfc -r 0d826dd9da8d external/cddl/osnet/dev/cyclic/i386/cyclic_machdep.c
--- a/external/cddl/osnet/dev/cyclic/i386/cyclic_machdep.c Mon May 28 21:04:41 2018 +0000
+++ b/external/cddl/osnet/dev/cyclic/i386/cyclic_machdep.c Mon May 28 21:04:59 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cyclic_machdep.c,v 1.4 2012/12/02 01:05:16 chs Exp $ */
+/* $NetBSD: cyclic_machdep.c,v 1.5 2018/05/28 21:05:02 chs Exp $ */
/*-
* Copyright 2006-2008 John Birrell <jb%FreeBSD.org@localhost>
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: head/sys/cddl/dev/cyclic/i386/cyclic_machdep.c 222813 2011-06-07 08:46:13Z attilio $
*
*/
diff -r 879459739cfc -r 0d826dd9da8d external/cddl/osnet/dev/dtmalloc/dtmalloc.c
--- a/external/cddl/osnet/dev/dtmalloc/dtmalloc.c Mon May 28 21:04:41 2018 +0000
+++ b/external/cddl/osnet/dev/dtmalloc/dtmalloc.c Mon May 28 21:04:59 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dtmalloc.c,v 1.2 2010/02/21 01:46:33 darran Exp $ */
+/* $NetBSD: dtmalloc.c,v 1.3 2018/05/28 21:05:03 chs Exp $ */
/*
* CDDL HEADER START
@@ -22,7 +22,7 @@
*
* Portions Copyright 2006-2008 John Birrell jb%freebsd.org@localhost
*
- * $FreeBSD: src/sys/cddl/dev/dtmalloc/dtmalloc.c,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+ * $FreeBSD: head/sys/cddl/dev/dtmalloc/dtmalloc.c 252325 2013-06-28 03:14:40Z markj $
*
*/
@@ -30,6 +30,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
+#include <sys/ctype.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/module.h>
@@ -113,8 +114,17 @@
{
char name[DTRACE_FUNCNAMELEN];
struct malloc_type_internal *mtip = mtp->ks_handle;
Home |
Main Index |
Thread Index |
Old Index