diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-11-20 08:57:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-11-20 08:57:58 +0100 |
| commit | d360b78f99e5d1724279644c8eb51d5cf0de4027 (patch) | |
| tree | 011c67bd0654b141e8f7f9fe1d8e1338b05663ba /include/trace | |
| parent | Linux 3.18-rc5 (diff) | |
| parent | Merge branches 'torture.2014.11.03a', 'cpu.2014.11.03a', 'doc.2014.11.13a', '... (diff) | |
| download | linux-d360b78f99e5d1724279644c8eb51d5cf0de4027.tar.xz linux-d360b78f99e5d1724279644c8eb51d5cf0de4027.zip | |
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney:
- Streamline RCU's use of per-CPU variables, shifting from "cpu"
arguments to functions to "this_"-style per-CPU variable accessors.
- Signal-handling RCU updates.
- Real-time updates.
- Torture-test updates.
- Miscellaneous fixes.
- Documentation updates.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 e335e7d8c6c2..c78e88ce5ea3 100644 --- a/include/trace/events/rcu.h +++ b/include/trace/events/rcu.h @@ -36,7 +36,7 @@ TRACE_EVENT(rcu_utilization, #ifdef CONFIG_RCU_TRACE -#if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU) +#if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU) /* * Tracepoint for grace-period events. Takes a string identifying the @@ -345,7 +345,7 @@ TRACE_EVENT(rcu_fqs, __entry->cpu, __entry->qsevent) ); -#endif /* #if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU) */ +#endif /* #if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU) */ /* * Tracepoint for dyntick-idle entry/exit events. These take a string |