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

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

Conflicts:

	scripts/Makefile.am
This commit is contained in:
Brian Behlendorf 2009-07-24 11:10:21 -07:00
parent 63eac41313 25a102501e
commit 430d6004e5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libzpool/kernel.c
View File

@ -181,8 +181,8 @@ zk_thread_create(caddr_t stk, size_t stksize, thread_func_t func, void *arg,
list_insert_head(&kthread_list, kt);
VERIFY3S(pthread_mutex_unlock(&kthread_lock), ==, 0);
VERIFY(pthread_create(&kt->t_tid, &kt->t_attr,
(void *(*)(void *))func, arg) == 0);
VERIFY3U(pthread_create(&kt->t_tid, &kt->t_attr,
(void *(*)(void *))func, arg), ==, 0);
return kt;
}

1
scripts/Makefile.am
View File

@ -13,6 +13,7 @@ check:
@echo -n " ZTEST "
@echo "===================================="
@echo
@ulimit -c unlimited
@$(ZTEST) -V
@echo
@echo -n "===================================="