Эх сурвалжийг харах

rcu: Rename "empty" to "empty_norm" in preparation for boost rework

This commit undertakes a simple variable renaming to make way for
some rework of RCU priority boosting.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Paul E. McKenney 10 жил өмнө
parent
commit
74e871ac6c

+ 3 - 3
kernel/rcu/tree_plugin.h

@@ -313,8 +313,8 @@ static struct list_head *rcu_next_node_entry(struct task_struct *t,
  */
  */
 void rcu_read_unlock_special(struct task_struct *t)
 void rcu_read_unlock_special(struct task_struct *t)
 {
 {
-	int empty;
 	int empty_exp;
 	int empty_exp;
+	int empty_norm;
 	int empty_exp_now;
 	int empty_exp_now;
 	unsigned long flags;
 	unsigned long flags;
 	struct list_head *np;
 	struct list_head *np;
@@ -367,7 +367,7 @@ void rcu_read_unlock_special(struct task_struct *t)
 				break;
 				break;
 			raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
 			raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
 		}
 		}
-		empty = !rcu_preempt_blocked_readers_cgp(rnp);
+		empty_norm = !rcu_preempt_blocked_readers_cgp(rnp);
 		empty_exp = !rcu_preempted_readers_exp(rnp);
 		empty_exp = !rcu_preempted_readers_exp(rnp);
 		smp_mb(); /* ensure expedited fastpath sees end of RCU c-s. */
 		smp_mb(); /* ensure expedited fastpath sees end of RCU c-s. */
 		np = rcu_next_node_entry(t, rnp);
 		np = rcu_next_node_entry(t, rnp);
@@ -393,7 +393,7 @@ void rcu_read_unlock_special(struct task_struct *t)
 		 * so we must take a snapshot of the expedited state.
 		 * so we must take a snapshot of the expedited state.
 		 */
 		 */
 		empty_exp_now = !rcu_preempted_readers_exp(rnp);
 		empty_exp_now = !rcu_preempted_readers_exp(rnp);
-		if (!empty && !rcu_preempt_blocked_readers_cgp(rnp)) {
+		if (!empty_norm && !rcu_preempt_blocked_readers_cgp(rnp)) {
 			trace_rcu_quiescent_state_report(TPS("preempt_rcu"),
 			trace_rcu_quiescent_state_report(TPS("preempt_rcu"),
 							 rnp->gpnum,
 							 rnp->gpnum,
 							 0, rnp->qsmask,
 							 0, rnp->qsmask,