Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61cfd097 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu: Move RCU_BOOST variable declarations, eliminating #ifdef 



There are some RCU_BOOST-specific per-CPU variable declarations that
are needlessly defined under #ifdef in kernel/rcu/tree.c.  This commit
therefore moves these declarations into a pre-existing #ifdef in
kernel/rcu/tree_plugin.h.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 4568779f

kernel/rcu/tree.c

+0 −13
Original line number Diff line number Diff line
@@ -152,19 +152,6 @@ EXPORT_SYMBOL_GPL(rcu_scheduler_active); 
 */

static int rcu_scheduler_fully_active __read_mostly;



#ifdef CONFIG_RCU_BOOST



/*

 * Control variables for per-CPU and per-rcu_node kthreads.  These

 * handle all flavors of RCU.

 */

static DEFINE_PER_CPU(struct task_struct *, rcu_cpu_kthread_task);

DEFINE_PER_CPU(unsigned int, rcu_cpu_kthread_status);

DEFINE_PER_CPU(unsigned int, rcu_cpu_kthread_loops);

DEFINE_PER_CPU(char, rcu_cpu_has_work);



#endif /* #ifdef CONFIG_RCU_BOOST */



static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu);

static void invoke_rcu_core(void);

static void invoke_rcu_callbacks(struct rcu_state *rsp, struct rcu_data *rdp);

kernel/rcu/tree_plugin.h

+15 −2
Original line number Diff line number Diff line
@@ -33,11 +33,24 @@ 
#define RCU_KTHREAD_PRIO 1



#ifdef CONFIG_RCU_BOOST



#include "../locking/rtmutex_common.h"

#define RCU_BOOST_PRIO CONFIG_RCU_BOOST_PRIO

#else



/*

 * Control variables for per-CPU and per-rcu_node kthreads.  These

 * handle all flavors of RCU.

 */

static DEFINE_PER_CPU(struct task_struct *, rcu_cpu_kthread_task);

DEFINE_PER_CPU(unsigned int, rcu_cpu_kthread_status);

DEFINE_PER_CPU(unsigned int, rcu_cpu_kthread_loops);

DEFINE_PER_CPU(char, rcu_cpu_has_work);



#else /* #ifdef CONFIG_RCU_BOOST */



#define RCU_BOOST_PRIO RCU_KTHREAD_PRIO

#endif



#endif /* #else #ifdef CONFIG_RCU_BOOST */



#ifdef CONFIG_RCU_NOCB_CPU

static cpumask_var_t rcu_nocb_mask; /* CPUs to have callbacks offloaded. */