Skip to content

Commit c130d2d

Browse files
laijspaulmckrcu
authored andcommitted
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: Lai Jiangshan <[email protected]> Signed-off-by: Lai Jiangshan <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]>
1 parent 90326f0 commit c130d2d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

kernel/rcu/tree.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1934,7 +1934,7 @@ rcu_report_unblock_qs_rnp(struct rcu_node *rnp, unsigned long flags)
19341934
struct rcu_node *rnp_p;
19351935

19361936
raw_lockdep_assert_held_rcu_node(rnp);
1937-
if (WARN_ON_ONCE(!IS_ENABLED(CONFIG_PREEMPTION)) ||
1937+
if (WARN_ON_ONCE(!IS_ENABLED(CONFIG_PREEMPT_RCU)) ||
19381938
WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp)) ||
19391939
rnp->qsmask != 0) {
19401940
raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
@@ -2294,7 +2294,7 @@ static void force_qs_rnp(int (*f)(struct rcu_data *rdp))
22942294
mask = 0;
22952295
raw_spin_lock_irqsave_rcu_node(rnp, flags);
22962296
if (rnp->qsmask == 0) {
2297-
if (!IS_ENABLED(CONFIG_PREEMPTION) ||
2297+
if (!IS_ENABLED(CONFIG_PREEMPT_RCU) ||
22982298
rcu_preempt_blocked_readers_cgp(rnp)) {
22992299
/*
23002300
* No point in scanning bits because they

kernel/rcu/tree_stall.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ static void rcu_iw_handler(struct irq_work *iwp)
163163
//
164164
// Printing RCU CPU stall warnings
165165

166-
#ifdef CONFIG_PREEMPTION
166+
#ifdef CONFIG_PREEMPT_RCU
167167

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

218-
#else /* #ifdef CONFIG_PREEMPTION */
218+
#else /* #ifdef CONFIG_PREEMPT_RCU */
219219

220220
/*
221221
* 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)
233233
{
234234
return 0;
235235
}
236-
#endif /* #else #ifdef CONFIG_PREEMPTION */
236+
#endif /* #else #ifdef CONFIG_PREEMPT_RCU */
237237

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

0 commit comments

Comments
 (0)