Merge branch 'refs/heads/upstream-HEAD' into repo-HEAD

sdimitro · Apr 10, 2019 · aedc12e · aedc12e
2 parents f302c75 + 5ae4e44
commit aedc12e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/libzpool/kernel.c b/lib/libzpool/kernel.c
@@ -814,7 +814,8 @@ __dprintf(boolean_t dprint, const char *file, const char *func,
 		if (dprintf_find_string("pid"))
 			(void) printf("%d ", getpid());
 		if (dprintf_find_string("tid"))
-			(void) printf("%u ", (uint_t)pthread_self());
+			(void) printf("%ju ",
+			    (uintmax_t)(uintptr_t)pthread_self());
 		if (dprintf_find_string("cpu"))
 			(void) printf("%u ", getcpuid());
 		if (dprintf_find_string("time"))