diff options
| author | Paul E. McKenney | 2015-02-19 01:39:09 +0100 |
|---|---|---|
| committer | Paul E. McKenney | 2015-02-26 21:03:01 +0100 |
| commit | 5afff48bdf7481570c9385a8a674a81ffb8f09ee (patch) | |
| tree | ed5c3a224b7227e9055d0a6e5afab49d4c26571c /kernel/rcu/tree.c | |
| parent | rcu: Add rcu_expedite_gp() and rcu_unexpedite_gp() to rcutorture (diff) | |
| download | kernel-qcow2-linux-5afff48bdf7481570c9385a8a674a81ffb8f09ee.tar.gz kernel-qcow2-linux-5afff48bdf7481570c9385a8a674a81ffb8f09ee.tar.xz kernel-qcow2-linux-5afff48bdf7481570c9385a8a674a81ffb8f09ee.zip | |
rcu: Update from rcu_expedited variable to rcu_gp_is_expedited()
This commit updates open-coded tests of the rcu_expedited variable
to instead use rcu_gp_is_expedited().
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/rcu/tree.c')
| -rw-r--r-- | kernel/rcu/tree.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 48d640ca1a05..4325fbe79d84 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -2954,7 +2954,7 @@ void synchronize_sched(void) "Illegal synchronize_sched() in RCU-sched read-side critical section"); if (rcu_blocking_is_gp()) return; - if (rcu_expedited) + if (rcu_gp_is_expedited()) synchronize_sched_expedited(); else wait_rcu_gp(call_rcu_sched); @@ -2981,7 +2981,7 @@ void synchronize_rcu_bh(void) "Illegal synchronize_rcu_bh() in RCU-bh read-side critical section"); if (rcu_blocking_is_gp()) return; - if (rcu_expedited) + if (rcu_gp_is_expedited()) synchronize_rcu_bh_expedited(); else wait_rcu_gp(call_rcu_bh); @@ -3660,11 +3660,12 @@ static int rcu_pm_notify(struct notifier_block *self, case PM_HIBERNATION_PREPARE: case PM_SUSPEND_PREPARE: if (nr_cpu_ids <= 256) /* Expediting bad for large systems. */ - rcu_expedited = 1; + rcu_expedite_gp(); break; case PM_POST_HIBERNATION: case PM_POST_SUSPEND: - rcu_expedited = 0; + if (nr_cpu_ids <= 256) /* Expediting bad for large systems. */ + rcu_unexpedite_gp(); break; default: break; |