summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/trace/events/rcu.h1
-rw-r--r--kernel/rcutree_plugin.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h
index 337099783f37..aaa55e1b8c48 100644
--- a/include/trace/events/rcu.h
+++ b/include/trace/events/rcu.h
@@ -292,6 +292,7 @@ TRACE_EVENT(rcu_dyntick,
292 * "More callbacks": Still more callbacks, try again to clear them out. 292 * "More callbacks": Still more callbacks, try again to clear them out.
293 * "Callbacks drained": All callbacks processed, off to dyntick idle! 293 * "Callbacks drained": All callbacks processed, off to dyntick idle!
294 * "Timer": Timer fired to cause CPU to continue processing callbacks. 294 * "Timer": Timer fired to cause CPU to continue processing callbacks.
295 * "Cleanup after idle": Idle exited, timer canceled.
295 */ 296 */
296TRACE_EVENT(rcu_prep_idle, 297TRACE_EVENT(rcu_prep_idle,
297 298
diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
index c023464816be..1e561ab952a3 100644
--- a/kernel/rcutree_plugin.h
+++ b/kernel/rcutree_plugin.h
@@ -2085,6 +2085,7 @@ static void rcu_prepare_for_idle_init(int cpu)
2085static void rcu_cleanup_after_idle(int cpu) 2085static void rcu_cleanup_after_idle(int cpu)
2086{ 2086{
2087 hrtimer_cancel(&per_cpu(rcu_idle_gp_timer, cpu)); 2087 hrtimer_cancel(&per_cpu(rcu_idle_gp_timer, cpu));
2088 trace_rcu_prep_idle("Cleanup after idle");
2088} 2089}
2089 2090
2090/* 2091/*