Commit fc1096ab authored by Valentin Schneider's avatar Valentin Schneider Committed by Neeraj Upadhyay
Browse files

rcu: Rename rcu_dynticks_zero_in_eqs() into rcu_watching_zero_in_eqs() 



The context_tracking.state RCU_DYNTICKS subvariable has been renamed to
RCU_WATCHING, reflect that change in the related helpers.

Signed-off-by: default avatarValentin Schneider <vschneid@redhat.com>
Reviewed-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Signed-off-by: default avatarNeeraj Upadhyay <neeraj.upadhyay@kernel.org>
parent 3116a32e

kernel/rcu/rcu.h

+2 −2
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ void srcutorture_get_gp_data(struct srcu_struct *sp, int *flags, 
#endif



#ifdef CONFIG_TINY_RCU

static inline bool rcu_dynticks_zero_in_eqs(int cpu, int *vp) { return false; }

static inline bool rcu_watching_zero_in_eqs(int cpu, int *vp) { return false; }

static inline unsigned long rcu_get_gp_seq(void) { return 0; }

static inline unsigned long rcu_exp_batches_completed(void) { return 0; }

static inline unsigned long
@@ -619,7 +619,7 @@ static inline void rcu_fwd_progress_check(unsigned long j) { } 
static inline void rcu_gp_slow_register(atomic_t *rgssp) { }

static inline void rcu_gp_slow_unregister(atomic_t *rgssp) { }

#else /* #ifdef CONFIG_TINY_RCU */

bool rcu_dynticks_zero_in_eqs(int cpu, int *vp);

bool rcu_watching_zero_in_eqs(int cpu, int *vp);

unsigned long rcu_get_gp_seq(void);

unsigned long rcu_exp_batches_completed(void);

unsigned long srcu_batches_completed(struct srcu_struct *sp);

kernel/rcu/tasks.h

+1 −1
Original line number Diff line number Diff line
@@ -1613,7 +1613,7 @@ static int trc_inspect_reader(struct task_struct *t, void *bhp_in) 
		// However, we cannot safely change its state.

		n_heavy_reader_attempts++;

		// Check for "running" idle tasks on offline CPUs.

		if (!rcu_dynticks_zero_in_eqs(cpu, &t->trc_reader_nesting))

		if (!rcu_watching_zero_in_eqs(cpu, &t->trc_reader_nesting))

			return -EINVAL; // No quiescent state, do it the hard way.

		n_heavy_reader_updates++;

		nesting = 0;

kernel/rcu/tree.c

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static bool rcu_watching_snap_stopped_since(struct rcu_data *rdp, int snap) 
 * Return true if the referenced integer is zero while the specified

 * CPU remains within a single extended quiescent state.

 */

bool rcu_dynticks_zero_in_eqs(int cpu, int *vp)

bool rcu_watching_zero_in_eqs(int cpu, int *vp)

{

	int snap;