Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6776221b authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

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: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 58a09ec6

kernel/trace/ring_buffer.c

+0 −9
Original line number Diff line number Diff line
@@ -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