Merge branches 'release', 'ejd', 'sony' and 'wmi' into release

[mirror_ubuntu-artful-kernel.git] / include / linux / kthread.h

diff --git a/include/linux/kthread.h b/include/linux/kthread.h
index 7cce5dfa092f2a7bb2e6f401202dd5d6755ddff8..00dd957e245b43839db5e0972e74ff541e4dafd1 100644 (file)
--- a/include/linux/kthread.h
+++ b/include/linux/kthread.h
@@ -28,7 +28,9 @@ struct task_struct *kthread_create(int (*threadfn)(void *data),
 
 void kthread_bind(struct task_struct *k, unsigned int cpu);
 int kthread_stop(struct task_struct *k);
-int kthread_stop_sem(struct task_struct *k, struct semaphore *s);
 int kthread_should_stop(void);
 
+int kthreadd(void *unused);
+extern struct task_struct *kthreadd_task;
+
 #endif /* _LINUX_KTHREAD_H */