diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-05-27 10:44:43 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2015-05-27 10:44:43 -0400 |
commit | 6776221bfe50afdc053527055577012a1acaabd5 (patch) | |
tree | 83fb1799e4fe5c585603f3660c9f2c796892c906 | |
parent | 58a09ec6e3ec88c9c7e061479f1ef7fe93324a87 (diff) |
ring-buffer: Allways do the trace_recursive checks
Currently the trace_recursive checks are only done if CONFIG_TRACING
is enabled. That was because there use to be a dependency with tracing
for the recursive checks (it used the task_struct trace recursive
variable). But now it uses its own variable and there is no dependency.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r-- | kernel/trace/ring_buffer.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 8b0421eca001..1c037ad923db 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
@@ -2637,8 +2637,6 @@ rb_reserve_next_event(struct ring_buffer *buffer, | |||
2637 | return NULL; | 2637 | return NULL; |
2638 | } | 2638 | } |
2639 | 2639 | ||
2640 | #ifdef CONFIG_TRACING | ||
2641 | |||
2642 | /* | 2640 | /* |
2643 | * The lock and unlock are done within a preempt disable section. | 2641 | * The lock and unlock are done within a preempt disable section. |
2644 | * The current_context per_cpu variable can only be modified | 2642 | * The current_context per_cpu variable can only be modified |
@@ -2708,13 +2706,6 @@ trace_recursive_unlock(struct ring_buffer_per_cpu *cpu_buffer) | |||
2708 | cpu_buffer->current_context &= cpu_buffer->current_context - 1; | 2706 | cpu_buffer->current_context &= cpu_buffer->current_context - 1; |
2709 | } | 2707 | } |
2710 | 2708 | ||
2711 | #else | ||
2712 | |||
2713 | #define trace_recursive_lock(cpu_buffer) (0) | ||
2714 | #define trace_recursive_unlock(cpu_buffer) do { } while (0) | ||
2715 | |||
2716 | #endif | ||
2717 | |||
2718 | /** | 2709 | /** |
2719 | * ring_buffer_lock_reserve - reserve a part of the buffer | 2710 | * ring_buffer_lock_reserve - reserve a part of the buffer |
2720 | * @buffer: the ring buffer to reserve from | 2711 | * @buffer: the ring buffer to reserve from |