Merge branch 'gcc-branch' into refs/top-bases/zfs-branch

lib/libzpool/include/sys/zfs_context.h

@@ -195,7 +195,7 @@ typedef struct kthread kthread_t;
 	zk_thread_create(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(void (*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(void (*func)(), void *arg)
 {
 	pthread_t tid;