Re: [PATCH] rcu: move rcu_{expedited,normal} definitions into rcupdate.h
From: Paul E. McKenney
Date: Wed Oct 16 2019 - 00:08:51 EST
On Tue, Oct 15, 2019 at 02:48:22PM +0100, Ben Dooks wrote:
> Move the rcu_{expedited,normal} definitions into rcupdate.h
> to make sure they are in sync, and avoid the following
> warning from sparse:
>
> kernel/ksysfs.c:150:5: warning: symbol 'rcu_expedited' was not declared. Should it be static?
> kernel/ksysfs.c:167:5: warning: symbol 'rcu_normal' was not declared. Should it be static?
>
> Signed-off-by: Ben Dooks <ben.dooks@xxxxxxxxxxxxxxx>
Good point, queued for review and testing, thank you!
Thanx, Paul
> ---
> Cc: "Paul E. McKenney" <paulmck@xxxxxxxxxx>
> Cc: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
> Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
> Cc: Lai Jiangshan <jiangshanlai@xxxxxxxxx>
> Cc: Joel Fernandes <joel@xxxxxxxxxxxxxxxxx>
> Cc: rcu@xxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> ---
> include/linux/rcupdate.h | 4 ++++
> kernel/rcu/update.c | 2 --
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
> index 75a2eded7aa2..a175d6e3ad77 100644
> --- a/include/linux/rcupdate.h
> +++ b/include/linux/rcupdate.h
> @@ -894,4 +894,8 @@ rcu_head_after_call_rcu(struct rcu_head *rhp, rcu_callback_t f)
> return false;
> }
>
> +/* kernel/ksysfs.c definitions */
> +extern int rcu_expedited;
> +extern int rcu_normal;
> +
> #endif /* __LINUX_RCUPDATE_H */
> diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
> index 1861103662db..294d357abd0c 100644
> --- a/kernel/rcu/update.c
> +++ b/kernel/rcu/update.c
> @@ -51,9 +51,7 @@
> #define MODULE_PARAM_PREFIX "rcupdate."
>
> #ifndef CONFIG_TINY_RCU
> -extern int rcu_expedited; /* from sysctl */
> module_param(rcu_expedited, int, 0);
> -extern int rcu_normal; /* from sysctl */
> module_param(rcu_normal, int, 0);
> static int rcu_normal_after_boot;
> module_param(rcu_normal_after_boot, int, 0);
> --
> 2.23.0
>