[PATCH] rcu: move rcu_{expedited,normal} definitions into rcupdate.h

[PATCH] rcu: move rcu_{expedited,normal} definitions into rcupdate.h

[Ben Dooks]

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@codethink.co.uk>
---
Cc: "Paul E. McKenney" <paulmck@kernel.org>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Lai Jiangshan <jiangshanlai@gmail.com>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: rcu@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 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

Re: [PATCH] rcu: move rcu_{expedited,normal} definitions into rcupdate.h

[Paul E. McKenney]

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@codethink.co.uk>

Good point, queued for review and testing, thank you!

								Thanx, Paul

> ---
> Cc: "Paul E. McKenney" <paulmck@kernel.org>
> Cc: Josh Triplett <josh@joshtriplett.org>
> Cc: Steven Rostedt <rostedt@goodmis.org>
> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
> Cc: Lai Jiangshan <jiangshanlai@gmail.com>
> Cc: Joel Fernandes <joel@joelfernandes.org>
> Cc: rcu@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> ---
>  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
>