remove kernel/kthread.c:kthread_stop_sem()
RFC PATCH 1/1 remove kernel/kthread.c:kthread_stop_sem()
This patch moves the otherwise unused kthread_stop_sem() into kthread_stop().
Signed-off-by Adrian Bunk <[email protected]>
---
include/linux/kthread.h | 12 ------------ kernel/kthread.c | 14 ++------------ 2 files changed, 2 insertions(+), 24 deletions(-)
include/linux/kthread.h renamed from include/linux/kthread.h.old +0 -1
@@ -28,7 +28,6 @@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 */
kernel/kthread.c renamed from kernel/kthread.c.old +2 -22
@@ -216,23 +216,6 @@*/ int kthread_stop (struct task_struct *k) { -return kthread_stop_sem (k,NULL ); -} -EXPORT_SYMBOL (kthread_stop); - -/** -* kthread_stop_sem - stop a thread created by kthread_create(). -* @k: thread created by kthread_create(). -* @s: semaphore that @k waits on while idle. -* -* Does essentially the same thing as kthread_stop() above, but wakes -* @k by calling up(@s). -* -* Returns the result of threadfn(), or %-EINTR if wake_up_process() -* was never called. -*/ -int kthread_stop_sem (struct task_struct *k,struct semaphore *s) -{int ret;mutex_lock (&kthread_stop_lock);
@@ -246,10 +229,7 @@/* Now set kthread_should_stop() to true, and wake it up. */ kthread_stop_info.k = k; -if (s) -up (s); -else -wake_up_process (k); +wake_up_process (k);put_task_struct (k);/* Once it dies, reset stop ptr, gather result and we're done. */
@@ -260,7 +240,7 @@return ret; } -EXPORT_SYMBOL (kthread_stop_sem); +EXPORT_SYMBOL (kthread_stop);static __init int helper_init (void ) {