diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-08-04 18:40:58 +0300 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-08-04 18:40:58 +0300 |
| commit | 8ff4fbfd69a6c7b9598f8c1f2df34f89bac02c1a (patch) | |
| tree | a56504a1f6223a9a755e30ab4ce0fbeb79b94f8d /include | |
| parent | 9a54f98e341d09793247a6e598012edefb5ae7cb (diff) | |
| parent | af859beaaba4d57883b08f4acbcb3974bc1f975e (diff) | |
| download | linux-8ff4fbfd69a6c7b9598f8c1f2df34f89bac02c1a.tar.xz | |
Merge branches 'fixes.2015.07.22a' and 'initexp.2015.08.04a' into HEAD
fixes.2015.07.22a: Miscellaneous fixes.
initexp.2015.08.04a: Initialization and expedited updates.
(Single branch due to conflicts.)
Diffstat (limited to 'include')
| -rw-r--r-- | include/trace/events/rcu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h index c78e88ce5ea3..ef72c4aada56 100644 --- a/include/trace/events/rcu.h +++ b/include/trace/events/rcu.h @@ -661,7 +661,6 @@ TRACE_EVENT(rcu_torture_read, * Tracepoint for _rcu_barrier() execution. The string "s" describes * the _rcu_barrier phase: * "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 |