evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rcu: Update from rcu_expedited variable to rcu_gp_is_expedited()

Browse source 
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>
This commit is contained in:
Paul E. McKenney 2015-02-18 16:39:09 -08:00
parent 4bb3c5f414
commit 5afff48bdf
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/rcu/srcu.c
View file

@ -507,7 +507,7 @@ static void __synchronize_srcu(struct srcu_struct *sp, int trycount)
*/ */
void synchronize_srcu(struct srcu_struct *sp) void synchronize_srcu(struct srcu_struct *sp)
{ {
__synchronize_srcu(sp, rcu_expedited __synchronize_srcu(sp, rcu_gp_is_expedited()
? SYNCHRONIZE_SRCU_EXP_TRYCOUNT ? SYNCHRONIZE_SRCU_EXP_TRYCOUNT
: SYNCHRONIZE_SRCU_TRYCOUNT); : SYNCHRONIZE_SRCU_TRYCOUNT);
} }

9
kernel/rcu/tree.c
View file

@ -2954,7 +2954,7 @@ void synchronize_sched(void)
"Illegal synchronize_sched() in RCU-sched read-side critical section"); "Illegal synchronize_sched() in RCU-sched read-side critical section");
if (rcu_blocking_is_gp()) if (rcu_blocking_is_gp())
return; return;
if (rcu_expedited) if (rcu_gp_is_expedited())
synchronize_sched_expedited(); synchronize_sched_expedited();
else else
wait_rcu_gp(call_rcu_sched); 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"); "Illegal synchronize_rcu_bh() in RCU-bh read-side critical section");
if (rcu_blocking_is_gp()) if (rcu_blocking_is_gp())
return; return;
if (rcu_expedited) if (rcu_gp_is_expedited())
synchronize_rcu_bh_expedited(); synchronize_rcu_bh_expedited();
else else
wait_rcu_gp(call_rcu_bh); 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_HIBERNATION_PREPARE:
case PM_SUSPEND_PREPARE: case PM_SUSPEND_PREPARE:
if (nr_cpu_ids <= 256) /* Expediting bad for large systems. */ if (nr_cpu_ids <= 256) /* Expediting bad for large systems. */
rcu_expedited = 1; rcu_expedite_gp();
break; break;
case PM_POST_HIBERNATION: case PM_POST_HIBERNATION:
case PM_POST_SUSPEND: case PM_POST_SUSPEND:
rcu_expedited = 0; if (nr_cpu_ids <= 256) /* Expediting bad for large systems. */
rcu_unexpedite_gp();
break; break;
default: default:
break; break;

2
kernel/rcu/tree_plugin.h
View file

@ -585,7 +585,7 @@ void synchronize_rcu(void)
"Illegal synchronize_rcu() in RCU read-side critical section"); "Illegal synchronize_rcu() in RCU read-side critical section");
if (!rcu_scheduler_active) if (!rcu_scheduler_active)
return; return;
if (rcu_expedited) if (rcu_gp_is_expedited())
synchronize_rcu_expedited(); synchronize_rcu_expedited();
else else
wait_rcu_gp(call_rcu); wait_rcu_gp(call_rcu);