]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ring-buffer: Allways do the trace_recursive checks
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>
Wed, 27 May 2015 14:44:43 +0000 (10:44 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Wed, 27 May 2015 14:44:43 +0000 (10:44 -0400)
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>
kernel/trace/ring_buffer.c

index 8b0421eca0013705d012ce4baf2bb56a39750ed5..1c037ad923db2733bb90c0d90c77c4e3d0419d66 100644 (file)
@@ -2637,8 +2637,6 @@ rb_reserve_next_event(struct ring_buffer *buffer,
        return NULL;
 }
 
-#ifdef CONFIG_TRACING
-
 /*
  * The lock and unlock are done within a preempt disable section.
  * The current_context per_cpu variable can only be modified
@@ -2708,13 +2706,6 @@ trace_recursive_unlock(struct ring_buffer_per_cpu *cpu_buffer)
        cpu_buffer->current_context &= cpu_buffer->current_context - 1;
 }
 
-#else
-
-#define trace_recursive_lock(cpu_buffer)       (0)
-#define trace_recursive_unlock(cpu_buffer)     do { } while (0)
-
-#endif
-
 /**
  * ring_buffer_lock_reserve - reserve a part of the buffer
  * @buffer: the ring buffer to reserve from