diff options
| author | Paul E. McKenney <paulmck@linux.ibm.com> | 2019-08-13 14:41:48 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.ibm.com> | 2019-08-13 14:41:48 -0700 |
| commit | 07f038a408fb215fd656de78304b6ff4c7e4e490 (patch) | |
| tree | 7e78a89f7a5981382d252cafcc58d9a4d66c9957 /include/trace | |
| parent | 6738ff85c3ee8073d5b030cb26241d0009d4ce29 (diff) | |
| parent | cfcdef5e30469f3f2d6786ad35fc3fdef2a3833f (diff) | |
Merge LKMM and RCU commits
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/rcu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h index 02a3f78f7cd8..694bd040cf51 100644 --- a/include/trace/events/rcu.h +++ b/include/trace/events/rcu.h @@ -100,7 +100,6 @@ TRACE_EVENT_RCU(rcu_grace_period, * "Startedroot": Requested a nocb grace period based on root-node data. * "NoGPkthread": The RCU grace-period kthread has not yet started. * "StartWait": Start waiting for the requested grace period. - * "ResumeWait": Resume waiting after signal. * "EndWait": Complete wait. * "Cleanup": Clean up rcu_node structure after previous GP. * "CleanupMore": Clean up, and another GP is needed. @@ -267,7 +266,8 @@ TRACE_EVENT_RCU(rcu_exp_funnel_lock, * "WakeNotPoll": Don't wake rcuo kthread because it is polling. * "DeferredWake": Carried out the "IsDeferred" wakeup. * "Poll": Start of new polling cycle for rcu_nocb_poll. - * "Sleep": Sleep waiting for CBs for !rcu_nocb_poll. + * "Sleep": Sleep waiting for GP for !rcu_nocb_poll. + * "CBSleep": Sleep waiting for CBs for !rcu_nocb_poll. * "WokeEmpty": rcuo kthread woke to find empty list. * "WokeNonEmpty": rcuo kthread woke to find non-empty list. * "WaitQueue": Enqueue partially done, timed wait for it to complete. |