Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk

lib/libzpool/include/sys/zfs_context.h

@@ -190,12 +190,13 @@ _NOTE(CONSTCOND) } while (0)
 #define	curthread	((void *)(uintptr_t)pthread_self())
 
 typedef struct kthread kthread_t;
+typedef void (*thread_func_t)(void *);
 
 #define	thread_create(stk, stksize, func, arg, len, pp, state, pri)	\
-	zk_thread_create(func, arg)
+	zk_thread_create((thread_func_t)func, arg)
 #define	thread_exit() pthread_exit(NULL)
 
-extern kthread_t *zk_thread_create(void (*func)(void), void *arg);
+extern kthread_t *zk_thread_create(thread_func_t func, void *arg);
 
 #define	issig(why)	(FALSE)
 #define	ISSIG(thr, why)	(FALSE)

lib/libzpool/kernel.c

@@ -56,7 +56,7 @@ struct utsname utsname = {
  */
 /*ARGSUSED*/
 kthread_t *
-zk_thread_create(void (*func)(void), void *arg)
+zk_thread_create(thread_func_t func, void *arg)
 {
 	pthread_t tid;