From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751401AbWF1QyR (ORCPT ); Wed, 28 Jun 2006 12:54:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751410AbWF1QyR (ORCPT ); Wed, 28 Jun 2006 12:54:17 -0400 Received: from emailhub.stusta.mhn.de ([141.84.69.5]:28932 "HELO mailout.stusta.mhn.de") by vger.kernel.org with SMTP id S1751401AbWF1QyQ (ORCPT ); Wed, 28 Jun 2006 12:54:16 -0400 Date: Wed, 28 Jun 2006 18:54:14 +0200 From: Adrian Bunk To: linux-kernel@vger.kernel.org Subject: [2.6 patch] remove kernel/kthread.c:kthread_stop_sem() Message-ID: <20060628165414.GI13915@stusta.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.11+cvs20060403 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org This patch folds the otherwise unused kthread_stop_sem() into kthread_stop(). Signed-off-by: Adrian Bunk --- include/linux/kthread.h | 1 - kernel/kthread.c | 24 ++---------------------- 2 files changed, 2 insertions(+), 23 deletions(-) --- linux-2.6.17-mm2-full/include/linux/kthread.h.old 2006-06-27 00:04:31.000000000 +0200 +++ linux-2.6.17-mm2-full/include/linux/kthread.h 2006-06-27 00:04:59.000000000 +0200 @@ -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 */ --- linux-2.6.17-mm2-full/kernel/kthread.c.old 2006-06-27 00:04:53.000000000 +0200 +++ linux-2.6.17-mm2-full/kernel/kthread.c 2006-06-27 00:05:34.000000000 +0200 @@ -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) {