Imported Upstream version 0.6.4.1

[mirror_spl-debian.git] / module / splat / splat-condvar.c

diff --git a/module/splat/splat-condvar.c b/module/splat/splat-condvar.c
index 1fe306cb27dec2c8af819ac98e56477d8fccf74b..ed633acdaa8d3b5de386366851b7e3371cb50b1c 100644 (file)
--- a/module/splat/splat-condvar.c
+++ b/module/splat/splat-condvar.c
@@ -6,7 +6,7 @@
  *  UCRL-CODE-235197
  *
  *  This file is part of the SPL, Solaris Porting Layer.
- *  For details, see <http://github.com/behlendorf/spl/>.
+ *  For details, see <http://zfsonlinux.org/>.
  *
  *  The SPL is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
@@ -24,8 +24,9 @@
  *  Solaris Porting LAyer Tests (SPLAT) Condition Variable Tests.
 \*****************************************************************************/
 
-#include <linux/kthread.h>
 #include <sys/condvar.h>
+#include <sys/timer.h>
+#include <sys/thread.h>
 #include "splat-internal.h"
 
 #define SPLAT_CONDVAR_NAME             "condvar"
@@ -108,7 +109,7 @@ splat_condvar_test1(struct file *file, void *arg)
                ct[i].ct_cvp = &cv;
                ct[i].ct_name = SPLAT_CONDVAR_TEST1_NAME;
                ct[i].ct_rc = 0;
-               ct[i].ct_thread = kthread_create(splat_condvar_test12_thread,
+               ct[i].ct_thread = spl_kthread_create(splat_condvar_test12_thread,
                    &ct[i], "%s/%d", SPLAT_CONDVAR_TEST_NAME, i);
 
                if (!IS_ERR(ct[i].ct_thread)) {
@@ -173,7 +174,7 @@ splat_condvar_test2(struct file *file, void *arg)
                ct[i].ct_cvp = &cv;
                ct[i].ct_name = SPLAT_CONDVAR_TEST2_NAME;
                ct[i].ct_rc = 0;
-               ct[i].ct_thread = kthread_create(splat_condvar_test12_thread,
+               ct[i].ct_thread = spl_kthread_create(splat_condvar_test12_thread,
                    &ct[i], "%s/%d", SPLAT_CONDVAR_TEST_NAME, i);
 
                if (!IS_ERR(ct[i].ct_thread)) {
@@ -254,7 +255,7 @@ splat_condvar_test3(struct file *file, void *arg)
                ct[i].ct_cvp = &cv;
                ct[i].ct_name = SPLAT_CONDVAR_TEST3_NAME;
                ct[i].ct_rc = 0;
-               ct[i].ct_thread = kthread_create(splat_condvar_test34_thread,
+               ct[i].ct_thread = spl_kthread_create(splat_condvar_test34_thread,
                    &ct[i], "%s/%d", SPLAT_CONDVAR_TEST_NAME, i);
 
                if (!IS_ERR(ct[i].ct_thread)) {
@@ -324,7 +325,7 @@ splat_condvar_test4(struct file *file, void *arg)
                ct[i].ct_cvp = &cv;
                ct[i].ct_name = SPLAT_CONDVAR_TEST3_NAME;
                ct[i].ct_rc = 0;
-               ct[i].ct_thread = kthread_create(splat_condvar_test34_thread,
+               ct[i].ct_thread = spl_kthread_create(splat_condvar_test34_thread,
                    &ct[i], "%s/%d", SPLAT_CONDVAR_TEST_NAME, i);
 
                if (!IS_ERR(ct[i].ct_thread)) {