summaryrefslogtreecommitdiffstats
path: root/kernel/rcu/tree.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/rcu/tree.c')
-rw-r--r--kernel/rcu/tree.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 5efdce756fdf..6a37afd5436c 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -1881,7 +1881,7 @@ rcu_report_unblock_qs_rnp(struct rcu_node *rnp, unsigned long flags)
1881 struct rcu_node *rnp_p; 1881 struct rcu_node *rnp_p;
1882 1882
1883 raw_lockdep_assert_held_rcu_node(rnp); 1883 raw_lockdep_assert_held_rcu_node(rnp);
1884 if (WARN_ON_ONCE(!IS_ENABLED(CONFIG_PREEMPT)) || 1884 if (WARN_ON_ONCE(!IS_ENABLED(CONFIG_PREEMPTION)) ||
1885 WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp)) || 1885 WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp)) ||
1886 rnp->qsmask != 0) { 1886 rnp->qsmask != 0) {
1887 raw_spin_unlock_irqrestore_rcu_node(rnp, flags); 1887 raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
@@ -2205,7 +2205,7 @@ static void force_qs_rnp(int (*f)(struct rcu_data *rdp))
2205 mask = 0; 2205 mask = 0;
2206 raw_spin_lock_irqsave_rcu_node(rnp, flags); 2206 raw_spin_lock_irqsave_rcu_node(rnp, flags);
2207 if (rnp->qsmask == 0) { 2207 if (rnp->qsmask == 0) {
2208 if (!IS_ENABLED(CONFIG_PREEMPT) || 2208 if (!IS_ENABLED(CONFIG_PREEMPTION) ||
2209 rcu_preempt_blocked_readers_cgp(rnp)) { 2209 rcu_preempt_blocked_readers_cgp(rnp)) {
2210 /* 2210 /*
2211 * No point in scanning bits because they 2211 * No point in scanning bits because they
@@ -2622,7 +2622,7 @@ static int rcu_blocking_is_gp(void)
2622{ 2622{
2623 int ret; 2623 int ret;
2624 2624
2625 if (IS_ENABLED(CONFIG_PREEMPT)) 2625 if (IS_ENABLED(CONFIG_PREEMPTION))
2626 return rcu_scheduler_active == RCU_SCHEDULER_INACTIVE; 2626 return rcu_scheduler_active == RCU_SCHEDULER_INACTIVE;
2627 might_sleep(); /* Check for RCU read-side critical section. */ 2627 might_sleep(); /* Check for RCU read-side critical section. */
2628 preempt_disable(); 2628 preempt_disable();