diff options
| author | mm <mm@FreeBSD.org> | 2012-09-04 21:58:22 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-09-04 21:58:22 +0000 |
| commit | da0fd458fcfe1103d348568dcb3b73d20f1fa851 (patch) | |
| tree | f54f5ac4255415066ddd9c2a0a5abb320a950aea | |
| parent | f546be070921471fa2492272803f1b52133718ff (diff) | |
| download | FreeBSD-src-da0fd458fcfe1103d348568dcb3b73d20f1fa851.zip FreeBSD-src-da0fd458fcfe1103d348568dcb3b73d20f1fa851.tar.gz | |
Update vendor/illumos/dist and vendor/illumos-gate/dist
to illumos-gate revision 13794:7c5e0e746b2c
Obtained from: ssh://anonhg@hg.illumos.org/illumos-gate
| -rw-r--r-- | cmd/ztest/ztest.c | 2 | ||||
| -rw-r--r-- | lib/libzpool/common/sys/zfs_context.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index bb6398c..caa7834 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -5835,6 +5835,8 @@ main(int argc, char **argv) (void) setvbuf(stdout, NULL, _IOLBF, 0); + dprintf_setup(&argc, argv); + if (!ischild) { process_options(argc, argv); diff --git a/lib/libzpool/common/sys/zfs_context.h b/lib/libzpool/common/sys/zfs_context.h index 39af927..8ca60b7 100644 --- a/lib/libzpool/common/sys/zfs_context.h +++ b/lib/libzpool/common/sys/zfs_context.h @@ -61,6 +61,7 @@ extern "C" { #include <atomic.h> #include <dirent.h> #include <time.h> +#include <procfs.h> #include <libsysevent.h> #include <sys/note.h> #include <sys/types.h> |
