From: Paul E. McKenney <paulmck@linux.ibm.com>
Date: Fri, 25 Jan 2019 23:32:01 +0000 (-0800)
Subject: Merge branches 'consolidate.2019.01.26a' and 'fwd.2019.01.26a' into HEAD
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7a968bb26a9b09b6e44c48a8036a73e0bc497dbc;p=linux.git

Merge branches 'consolidate.2019.01.26a' and 'fwd.2019.01.26a' into HEAD

consolidate.2019.01.26a: RCU flavor consolidation cleanups.
fwd.2019.01.26a: RCU grace-period forward-progress fixes.
---

7a968bb26a9b09b6e44c48a8036a73e0bc497dbc
diff --cc kernel/rcu/tree.c
index e53a586b397be,9d0e2ac9356e7..1c4add0960780
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@@ -502,6 -507,23 +506,14 @@@ unsigned long rcu_exp_batches_completed
  }
  EXPORT_SYMBOL_GPL(rcu_exp_batches_completed);
  
 -/*
 - * Force a quiescent state.
 - */
 -void rcu_force_quiescent_state(void)
 -{
 -	force_quiescent_state();
 -}
 -EXPORT_SYMBOL_GPL(rcu_force_quiescent_state);
 -
+ /*
+  * Return the root node of the rcu_state structure.
+  */
+ static struct rcu_node *rcu_get_root(void)
+ {
+ 	return &rcu_state.node[0];
+ }
+ 
  /*
   * Convert a ->gp_state value to a character string.
   */