Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52e92e57 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

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



Remove the now-unneeded kthread_stop_sem().

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 098c5eea

include/linux/kthread.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

kernel/kthread.c

+2 −22
Original line number Diff line number Diff line
@@ -215,23 +215,6 @@ EXPORT_SYMBOL(kthread_bind); 
 * was never called.

 */

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;
@@ -246,9 +229,6 @@ int kthread_stop_sem(struct task_struct *k, struct semaphore *s) 


	/* 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);

	put_task_struct(k);
@@ -260,7 +240,7 @@ int kthread_stop_sem(struct task_struct *k, struct semaphore *s) 


	return ret;

}

EXPORT_SYMBOL(kthread_stop_sem);

EXPORT_SYMBOL(kthread_stop);



static __init int helper_init(void)

{