diff options
author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /include/linux/kthread.h | |
parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/linux/kthread.h')
-rw-r--r-- | include/linux/kthread.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/kthread.h b/include/linux/kthread.h index 7cce5dfa092..1c65e7a9f18 100644 --- a/include/linux/kthread.h +++ b/include/linux/kthread.h @@ -28,7 +28,6 @@ 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); #endif /* _LINUX_KTHREAD_H */ |