iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] remove kernel/kthread.c:kthread_stop_sem()

Browse Source 
Remove the now-unneeded kthread_stop_sem().

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Adrian Bunk 2006-07-14 00:24:05 -07:00 committed by Linus Torvalds
parent 098c5eea03
commit 52e92e5788
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/kthread.h
View File

@ -28,7 +28,6 @@ struct task_struct *kthread_create(int (*threadfn)(void *data),
void kthread_bind(struct task_struct *k, unsigned int cpu); void kthread_bind(struct task_struct *k, unsigned int cpu);
int kthread_stop(struct task_struct *k); int kthread_stop(struct task_struct *k);
int kthread_stop_sem(struct task_struct *k, struct semaphore *s);
int kthread_should_stop(void); int kthread_should_stop(void);
#endif /* _LINUX_KTHREAD_H */ #endif /* _LINUX_KTHREAD_H */

24
kernel/kthread.c
View File

@ -215,23 +215,6 @@ EXPORT_SYMBOL(kthread_bind);
* was never called. * was never called.
*/ */
int kthread_stop(struct task_struct *k) 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; int ret;
@ -246,10 +229,7 @@ int kthread_stop_sem(struct task_struct *k, struct semaphore *s)
/* Now set kthread_should_stop() to true, and wake it up. */ /* Now set kthread_should_stop() to true, and wake it up. */
kthread_stop_info.k = k; kthread_stop_info.k = k;
if (s) wake_up_process(k);
up(s);
else
wake_up_process(k);
put_task_struct(k); put_task_struct(k);
/* Once it dies, reset stop ptr, gather result and we're done. */ /* Once it dies, reset stop ptr, gather result and we're done. */
@ -260,7 +240,7 @@ int kthread_stop_sem(struct task_struct *k, struct semaphore *s)
return ret; return ret;
} }
EXPORT_SYMBOL(kthread_stop_sem); EXPORT_SYMBOL(kthread_stop);
static __init int helper_init(void) static __init int helper_init(void)
{ {