Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull core fixes from Ingo Molnar:
 "The tree contains two RCU fixes and a compiler quirk comment fix"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  rcu: Make rcu_barrier() understand about missing rcuo kthreads
  compiler/gcc4+: Remove inaccurate comment about 'asm goto' miscompiles
  rcu: More on deadlock between CPU hotplug and expedited grace periods

3 files changed, 9 insertions, 11 deletions

diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index 2507fd2a1eb4..d1a558239b1a 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -71,7 +71,6 @@
  *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
  *
  * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
- * Fixed in GCC 4.8.2 and later versions.
  *
  * (asm goto is automatically volatile - the naming reflects this.)
  */
diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
index cdd1cc202d51..c8c565952548 100644
--- a/include/linux/compiler-gcc5.h
+++ b/include/linux/compiler-gcc5.h
@@ -53,7 +53,6 @@
  *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
  *
  * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
- * Fixed in GCC 4.8.2 and later versions.
  *
  * (asm goto is automatically volatile - the naming reflects this.)
  */
diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h
index 9b56f37148cf..e335e7d8c6c2 100644
--- a/include/trace/events/rcu.h
+++ b/include/trace/events/rcu.h
@@ -660,18 +660,18 @@ TRACE_EVENT(rcu_torture_read,
 /*
  * Tracepoint for _rcu_barrier() execution.  The string "s" describes
  * the _rcu_barrier phase:
- *      "Begin": rcu_barrier_callback() started.
- *      "Check": rcu_barrier_callback() checking for piggybacking.
- *      "EarlyExit": rcu_barrier_callback() piggybacked, thus early exit.
- *      "Inc1": rcu_barrier_callback() piggyback check counter incremented.
- *      "Offline": rcu_barrier_callback() found offline CPU
- *      "OnlineNoCB": rcu_barrier_callback() found online no-CBs CPU.
- *      "OnlineQ": rcu_barrier_callback() found online CPU with callbacks.
- *      "OnlineNQ": rcu_barrier_callback() found online CPU, no callbacks.
+ *      "Begin": _rcu_barrier() started.
+ *      "Check": _rcu_barrier() checking for piggybacking.
+ *      "EarlyExit": _rcu_barrier() piggybacked, thus early exit.
+ *      "Inc1": _rcu_barrier() piggyback check counter incremented.
+ *      "OfflineNoCB": _rcu_barrier() found callback on never-online CPU
+ *      "OnlineNoCB": _rcu_barrier() found online no-CBs CPU.
+ *      "OnlineQ": _rcu_barrier() found online CPU with callbacks.
+ *      "OnlineNQ": _rcu_barrier() found online CPU, no callbacks.
  *      "IRQ": An rcu_barrier_callback() callback posted on remote CPU.
  *      "CB": An rcu_barrier_callback() invoked a callback, not the last.
  *      "LastCB": An rcu_barrier_callback() invoked the last callback.
- *      "Inc2": rcu_barrier_callback() piggyback check counter incremented.
+ *      "Inc2": _rcu_barrier() piggyback check counter incremented.
  * The "cpu" argument is the CPU or -1 if meaningless, the "cnt" argument
  * is the count of remaining callbacks, and "done" is the piggybacking count.
  */