Commit 5afff48b authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

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: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 4bb3c5f4

kernel/rcu/srcu.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static void __synchronize_srcu(struct srcu_struct *sp, int trycount) 
 */

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_TRYCOUNT);

}

kernel/rcu/tree.c

+5 −4
Original line number Diff line number Diff line
@@ -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;

kernel/rcu/tree_plugin.h

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ void synchronize_rcu(void) 
			   "Illegal synchronize_rcu() in RCU read-side critical section");

	if (!rcu_scheduler_active)

		return;

	if (rcu_expedited)

	if (rcu_gp_is_expedited())

		synchronize_rcu_expedited();

	else

		wait_rcu_gp(call_rcu);