* [RFC: 2.6 patch] kernel/kthread.c: make kthread_stop_sem() static
@ 2006-04-23 11:40 Adrian Bunk
2006-04-23 13:37 ` Ingo Oeser
0 siblings, 1 reply; 6+ messages in thread
From: Adrian Bunk @ 2006-04-23 11:40 UTC (permalink / raw)
To: linux-kernel
This patch makes the needlessly global kthread_stop_sem() static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
include/linux/kthread.h | 12 ------------
kernel/kthread.c | 26 +++++++++++++++++---------
2 files changed, 17 insertions(+), 21 deletions(-)
--- linux-2.6.17-rc1-mm3-full/include/linux/kthread.h.old 2006-04-23 01:32:40.000000000 +0200
+++ linux-2.6.17-rc1-mm3-full/include/linux/kthread.h 2006-04-23 01:33:20.000000000 +0200
@@ -70,18 +70,6 @@
int kthread_stop(struct task_struct *k);
/**
- * 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);
-
-/**
* kthread_should_stop: should this kthread return now?
*
* When someone calls kthread_stop on your kthread, it will be woken
--- linux-2.6.17-rc1-mm3-full/kernel/kthread.c.old 2006-04-23 01:30:48.000000000 +0200
+++ linux-2.6.17-rc1-mm3-full/kernel/kthread.c 2006-04-23 01:33:11.000000000 +0200
@@ -164,15 +164,18 @@
set_task_cpu(k, cpu);
k->cpus_allowed = cpumask_of_cpu(cpu);
}
-EXPORT_SYMBOL(kthread_bind);
-int kthread_stop(struct task_struct *k)
-{
- return kthread_stop_sem(k, NULL);
-}
-EXPORT_SYMBOL(kthread_stop);
-
-int kthread_stop_sem(struct task_struct *k, struct semaphore *s)
+/**
+ * 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. */
+static int kthread_stop_sem(struct task_struct *k, struct semaphore *s)
{
int ret;
@@ -201,7 +204,12 @@
return ret;
}
-EXPORT_SYMBOL(kthread_stop_sem);
+
+int kthread_stop(struct task_struct *k)
+{
+ return kthread_stop_sem(k, NULL);
+}
+EXPORT_SYMBOL(kthread_stop);
static __init int helper_init(void)
{
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [RFC: 2.6 patch] kernel/kthread.c: make kthread_stop_sem() static
2006-04-23 11:40 [RFC: 2.6 patch] kernel/kthread.c: make kthread_stop_sem() static Adrian Bunk
@ 2006-04-23 13:37 ` Ingo Oeser
2006-04-26 12:31 ` [RFC: 2.6 patch] kernel/kthread.c: possible cleanups Adrian Bunk
0 siblings, 1 reply; 6+ messages in thread
From: Ingo Oeser @ 2006-04-23 13:37 UTC (permalink / raw)
To: Adrian Bunk; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 335 bytes --]
Hi Adrian,
On Sunday, 23. April 2006 13:40, Adrian Bunk wrote:
> This patch makes the needlessly global kthread_stop_sem() static.
Could you cleanup the code paths as well?
Now s is always NULL in kthread_stop_sem() and
kthread_stop_sem() is degenerated to kthread_stop().
So it can be folded into the latter.
Regards
Ingo Oeser
[-- Attachment #2: Type: application/pgp-signature, Size: 191 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [RFC: 2.6 patch] kernel/kthread.c: possible cleanups
2006-04-23 13:37 ` Ingo Oeser
@ 2006-04-26 12:31 ` Adrian Bunk
2006-04-26 17:39 ` Ingo Oeser
0 siblings, 1 reply; 6+ messages in thread
From: Adrian Bunk @ 2006-04-26 12:31 UTC (permalink / raw)
To: Ingo Oeser; +Cc: linux-kernel
On Sun, Apr 23, 2006 at 03:37:40PM +0200, Ingo Oeser wrote:
> Hi Adrian,
>
> On Sunday, 23. April 2006 13:40, Adrian Bunk wrote:
> > This patch makes the needlessly global kthread_stop_sem() static.
>
> Could you cleanup the code paths as well?
>
> Now s is always NULL in kthread_stop_sem() and
> kthread_stop_sem() is degenerated to kthread_stop().
> So it can be folded into the latter.
Sounds reasonable, updated patch below.
> Regards
>
> Ingo Oeser
cu
Adrian
<-- snip -->
This patch contains the following possible cleanups:
- fold the otherwise unused kthread_stop_sem() into kthread_stop()
- remove the unused EXPORT_SYMBOL(kthread_bind)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
include/linux/kthread.h | 12 ------------
kernel/kthread.c | 14 ++------------
2 files changed, 2 insertions(+), 24 deletions(-)
--- linux-2.6.17-rc1-mm3-full/include/linux/kthread.h.old 2006-04-26 12:46:06.000000000 +0200
+++ linux-2.6.17-rc1-mm3-full/include/linux/kthread.h 2006-04-26 12:46:33.000000000 +0200
@@ -70,18 +70,6 @@
int kthread_stop(struct task_struct *k);
/**
- * 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);
-
-/**
* kthread_should_stop: should this kthread return now?
*
* When someone calls kthread_stop on your kthread, it will be woken
--- linux-2.6.17-rc1-mm3-full/kernel/kthread.c.old 2006-04-26 12:46:16.000000000 +0200
+++ linux-2.6.17-rc1-mm3-full/kernel/kthread.c 2006-04-26 12:47:34.000000000 +0200
@@ -164,16 +164,9 @@
set_task_cpu(k, cpu);
k->cpus_allowed = cpumask_of_cpu(cpu);
}
-EXPORT_SYMBOL(kthread_bind);
int kthread_stop(struct task_struct *k)
{
- return kthread_stop_sem(k, NULL);
-}
-EXPORT_SYMBOL(kthread_stop);
-
-int kthread_stop_sem(struct task_struct *k, struct semaphore *s)
-{
int ret;
mutex_lock(&kthread_stop_lock);
@@ -187,10 +180,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. */
@@ -201,7 +191,7 @@
return ret;
}
-EXPORT_SYMBOL(kthread_stop_sem);
+EXPORT_SYMBOL(kthread_stop);
static __init int helper_init(void)
{
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [RFC: 2.6 patch] kernel/kthread.c: possible cleanups
2006-04-26 12:31 ` [RFC: 2.6 patch] kernel/kthread.c: possible cleanups Adrian Bunk
@ 2006-04-26 17:39 ` Ingo Oeser
0 siblings, 0 replies; 6+ messages in thread
From: Ingo Oeser @ 2006-04-26 17:39 UTC (permalink / raw)
To: Adrian Bunk; +Cc: linux-kernel
Hi Adrian,
On Wednesday, 26. April 2006 14:31, Adrian Bunk wrote:
> On Sun, Apr 23, 2006 at 03:37:40PM +0200, Ingo Oeser wrote:
> > Could you cleanup the code paths as well?
> >
> > Now s is always NULL in kthread_stop_sem() and
> > kthread_stop_sem() is degenerated to kthread_stop().
> > So it can be folded into the latter.
>
> Sounds reasonable, updated patch below.
Acked-by: Ingo Oeser <ioe-lkml@rameria.de>
Beautiful! Making Linux better line by line :-)
Regards
Ingo Oeser
^ permalink raw reply [flat|nested] 6+ messages in thread
* [RFC: 2.6 patch] kernel/kthread.c: possible cleanups
@ 2006-05-01 8:30 Adrian Bunk
0 siblings, 0 replies; 6+ messages in thread
From: Adrian Bunk @ 2006-05-01 8:30 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
This patch contains the following possible cleanups:
- fold the otherwise unused kthread_stop_sem() into kthread_stop()
- remove the unused EXPORT_SYMBOL(kthread_bind)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
This patch was already sent on:
- 26 Apr 2006
include/linux/kthread.h | 12 ------------
kernel/kthread.c | 14 ++------------
2 files changed, 2 insertions(+), 24 deletions(-)
--- linux-2.6.17-rc1-mm3-full/include/linux/kthread.h.old 2006-04-26 12:46:06.000000000 +0200
+++ linux-2.6.17-rc1-mm3-full/include/linux/kthread.h 2006-04-26 12:46:33.000000000 +0200
@@ -70,18 +70,6 @@
int kthread_stop(struct task_struct *k);
/**
- * 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);
-
-/**
* kthread_should_stop: should this kthread return now?
*
* When someone calls kthread_stop on your kthread, it will be woken
--- linux-2.6.17-rc1-mm3-full/kernel/kthread.c.old 2006-04-26 12:46:16.000000000 +0200
+++ linux-2.6.17-rc1-mm3-full/kernel/kthread.c 2006-04-26 12:47:34.000000000 +0200
@@ -164,16 +164,9 @@
set_task_cpu(k, cpu);
k->cpus_allowed = cpumask_of_cpu(cpu);
}
-EXPORT_SYMBOL(kthread_bind);
int kthread_stop(struct task_struct *k)
{
- return kthread_stop_sem(k, NULL);
-}
-EXPORT_SYMBOL(kthread_stop);
-
-int kthread_stop_sem(struct task_struct *k, struct semaphore *s)
-{
int ret;
mutex_lock(&kthread_stop_lock);
@@ -187,10 +180,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. */
@@ -201,7 +191,7 @@
return ret;
}
-EXPORT_SYMBOL(kthread_stop_sem);
+EXPORT_SYMBOL(kthread_stop);
static __init int helper_init(void)
{
^ permalink raw reply [flat|nested] 6+ messages in thread* [RFC: 2.6 patch] kernel/kthread.c: possible cleanups
@ 2006-05-16 17:44 Adrian Bunk
0 siblings, 0 replies; 6+ messages in thread
From: Adrian Bunk @ 2006-05-16 17:44 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
This patch contains the following possible cleanups:
- fold the otherwise unused kthread_stop_sem() into kthread_stop()
- remove the unused EXPORT_SYMBOL(kthread_bind)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
This patch was already sent on:
- 1 May 2006
- 26 Apr 2006
include/linux/kthread.h | 12 ------------
kernel/kthread.c | 14 ++------------
2 files changed, 2 insertions(+), 24 deletions(-)
--- linux-2.6.17-rc1-mm3-full/include/linux/kthread.h.old 2006-04-26 12:46:06.000000000 +0200
+++ linux-2.6.17-rc1-mm3-full/include/linux/kthread.h 2006-04-26 12:46:33.000000000 +0200
@@ -70,18 +70,6 @@
int kthread_stop(struct task_struct *k);
/**
- * 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);
-
-/**
* kthread_should_stop: should this kthread return now?
*
* When someone calls kthread_stop on your kthread, it will be woken
--- linux-2.6.17-rc1-mm3-full/kernel/kthread.c.old 2006-04-26 12:46:16.000000000 +0200
+++ linux-2.6.17-rc1-mm3-full/kernel/kthread.c 2006-04-26 12:47:34.000000000 +0200
@@ -164,16 +164,9 @@
set_task_cpu(k, cpu);
k->cpus_allowed = cpumask_of_cpu(cpu);
}
-EXPORT_SYMBOL(kthread_bind);
int kthread_stop(struct task_struct *k)
{
- return kthread_stop_sem(k, NULL);
-}
-EXPORT_SYMBOL(kthread_stop);
-
-int kthread_stop_sem(struct task_struct *k, struct semaphore *s)
-{
int ret;
mutex_lock(&kthread_stop_lock);
@@ -187,10 +180,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. */
@@ -201,7 +191,7 @@
return ret;
}
-EXPORT_SYMBOL(kthread_stop_sem);
+EXPORT_SYMBOL(kthread_stop);
static __init int helper_init(void)
{
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2006-05-16 17:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-23 11:40 [RFC: 2.6 patch] kernel/kthread.c: make kthread_stop_sem() static Adrian Bunk
2006-04-23 13:37 ` Ingo Oeser
2006-04-26 12:31 ` [RFC: 2.6 patch] kernel/kthread.c: possible cleanups Adrian Bunk
2006-04-26 17:39 ` Ingo Oeser
-- strict thread matches above, loose matches on Subject: below --
2006-05-01 8:30 Adrian Bunk
2006-05-16 17:44 Adrian Bunk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox