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

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-08 15:34:50 -08:00
parent d5749926b7 a62f51b079
commit 16f62b30f0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zfs/lib/libspl/include/sys/zfs_context.h
View File

@ -71,6 +71,7 @@ extern "C" {
#include <sys/sdt.h> #include <sys/sdt.h>
#include <sys/kstat.h> #include <sys/kstat.h>
#include <sys/u8_textprep.h> #include <sys/u8_textprep.h>
#include <sys/va_list.h>
#include <sys/sysevent/eventdefs.h> #include <sys/sysevent/eventdefs.h>
/* /*

2
zfs/lib/libspl/kernel.c
View File

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