Commit c130d2dc authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Paul E. McKenney
Browse files

rcu: Rename some instance of CONFIG_PREEMPTION to CONFIG_PREEMPT_RCU 



CONFIG_PREEMPTION and CONFIG_PREEMPT_RCU are always identical,
but some code depends on CONFIG_PREEMPTION to access to
rcu_preempt functionality. This patch changes CONFIG_PREEMPTION
to CONFIG_PREEMPT_RCU in these cases.

Signed-off-by: default avatarLai Jiangshan <jiangshanlai@gmail.com>
Signed-off-by: default avatarLai Jiangshan <laijs@linux.alibaba.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 90326f05

kernel/rcu/tree.c

+2 −2
Original line number Diff line number Diff line
@@ -1934,7 +1934,7 @@ rcu_report_unblock_qs_rnp(struct rcu_node *rnp, unsigned long flags) 
	struct rcu_node *rnp_p;



	raw_lockdep_assert_held_rcu_node(rnp);

	if (WARN_ON_ONCE(!IS_ENABLED(CONFIG_PREEMPTION)) ||

	if (WARN_ON_ONCE(!IS_ENABLED(CONFIG_PREEMPT_RCU)) ||

	    WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp)) ||

	    rnp->qsmask != 0) {

		raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
@@ -2294,7 +2294,7 @@ static void force_qs_rnp(int (*f)(struct rcu_data *rdp)) 
		mask = 0;

		raw_spin_lock_irqsave_rcu_node(rnp, flags);

		if (rnp->qsmask == 0) {

			if (!IS_ENABLED(CONFIG_PREEMPTION) ||

			if (!IS_ENABLED(CONFIG_PREEMPT_RCU) ||

			    rcu_preempt_blocked_readers_cgp(rnp)) {

				/*

				 * No point in scanning bits because they

kernel/rcu/tree_stall.h

+3 −3
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static void rcu_iw_handler(struct irq_work *iwp) 
//

// Printing RCU CPU stall warnings



#ifdef CONFIG_PREEMPTION

#ifdef CONFIG_PREEMPT_RCU



/*

 * Dump detailed information for all tasks blocking the current RCU
@@ -215,7 +215,7 @@ static int rcu_print_task_stall(struct rcu_node *rnp) 
	return ndetected;

}



#else /* #ifdef CONFIG_PREEMPTION */

#else /* #ifdef CONFIG_PREEMPT_RCU */



/*

 * Because preemptible RCU does not exist, we never have to check for
@@ -233,7 +233,7 @@ static int rcu_print_task_stall(struct rcu_node *rnp) 
{

	return 0;

}

#endif /* #else #ifdef CONFIG_PREEMPTION */

#endif /* #else #ifdef CONFIG_PREEMPT_RCU */



/*

 * Dump stacks of all tasks running on stalled CPUs.  First try using

CRA Git | Maintained and supported by SUSTech CRA and CCSE