2018-05-22 19:49:53

by Mathieu Malaterre

Subject: [PATCH] workqueue: move function definitions within CONFIG_SMP block

In commit 7ee681b25284 ("workqueue: Convert to state machine callbacks"),
three new function definitions were added: ‘workqueue_prepare_cpu’,
‘workqueue_online_cpu’ and ‘workqueue_offline_cpu’.

Move these function definitions within a CONFIG_SMP block since they are
not used outside of it. This will match function declarations in header
<include/linux/workqueue.h>, and silence the following gcc warning (W=1):

kernel/workqueue.c:4743:5: warning: no previous prototype for ‘workqueue_prepare_cpu’ [-Wmissing-prototypes]
kernel/workqueue.c:4756:5: warning: no previous prototype for ‘workqueue_online_cpu’ [-Wmissing-prototypes]
kernel/workqueue.c:4783:5: warning: no previous prototype for ‘workqueue_offline_cpu’ [-Wmissing-prototypes]

Signed-off-by: Mathieu Malaterre <[email protected]>
---
kernel/workqueue.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index ca7959be8aaa..c1544225c696 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4579,6 +4579,8 @@ void show_workqueue_state(void)
rcu_read_unlock_sched();
}

+#ifdef CONFIG_SMP
+
/*
* CPU hotplug.
*
@@ -4799,8 +4801,6 @@ int workqueue_offline_cpu(unsigned int cpu)
return 0;
}

-#ifdef CONFIG_SMP
-
struct work_for_cpu {
struct work_struct work;
long (*fn)(void *);
--
2.11.0

2018-05-23 18:18:13

by Tejun Heo

Subject: Re: [PATCH] workqueue: move function definitions within CONFIG_SMP block

On Tue, May 22, 2018 at 09:47:32PM +0200, Mathieu Malaterre wrote:
> In commit 7ee681b25284 ("workqueue: Convert to state machine callbacks"),
> three new function definitions were added: ‘workqueue_prepare_cpu’,
> ‘workqueue_online_cpu’ and ‘workqueue_offline_cpu’.
>
> Move these function definitions within a CONFIG_SMP block since they are
> not used outside of it. This will match function declarations in header
> <include/linux/workqueue.h>, and silence the following gcc warning (W=1):
>
> kernel/workqueue.c:4743:5: warning: no previous prototype for ‘workqueue_prepare_cpu’ [-Wmissing-prototypes]
> kernel/workqueue.c:4756:5: warning: no previous prototype for ‘workqueue_online_cpu’ [-Wmissing-prototypes]
> kernel/workqueue.c:4783:5: warning: no previous prototype for ‘workqueue_offline_cpu’ [-Wmissing-prototypes]
>
> Signed-off-by: Mathieu Malaterre <[email protected]>

Applied to wq/for-4.18.

Thanks.

--
tejun