Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2008-12-18 10:03:01 -08:00
parent d7f107e21a 0a353443cd
commit 80ce7621bc
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libzpool/include/sys/zfs_context.h
View File

@ -190,12 +190,13 @@ _NOTE(CONSTCOND) } while (0)
#define curthread ((void *)(uintptr_t)pthread_self()) #define curthread ((void *)(uintptr_t)pthread_self())
typedef struct kthread kthread_t; typedef struct kthread kthread_t;
typedef void (*thread_func_t)(void *);
#define thread_create(stk, stksize, func, arg, len, pp, state, pri) \ #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) #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(why) (FALSE)
#define ISSIG(thr, why) (FALSE) #define ISSIG(thr, why) (FALSE)

2
lib/libzpool/kernel.c
View File

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