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

Commit 9288f99a authored by Christoph Lameter's avatar Christoph Lameter Committed by Tejun Heo
Browse files

this_cpu: Use this_cpu_xx for ftrace 



this_cpu_xx can reduce the instruction count here and also
avoid address arithmetic.

Signed-off-by: default avatarChristoph Lameter <cl@linux-foundation.org>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 494f6a9e

kernel/trace/trace.c

+4 −4
Original line number Diff line number Diff line
@@ -86,17 +86,17 @@ static int dummy_set_flag(u32 old_flags, u32 bit, int set) 
 */

static int tracing_disabled = 1;



DEFINE_PER_CPU(local_t, ftrace_cpu_disabled);

DEFINE_PER_CPU(int, ftrace_cpu_disabled);



static inline void ftrace_disable_cpu(void)

{

	preempt_disable();

	local_inc(&__get_cpu_var(ftrace_cpu_disabled));

	__this_cpu_inc(per_cpu_var(ftrace_cpu_disabled));

}



static inline void ftrace_enable_cpu(void)

{

	local_dec(&__get_cpu_var(ftrace_cpu_disabled));

	__this_cpu_dec(per_cpu_var(ftrace_cpu_disabled));

	preempt_enable();

}
@@ -1085,7 +1085,7 @@ trace_function(struct trace_array *tr, 
	struct ftrace_entry *entry;



	/* If we are reading the ring buffer, don't trace */

	if (unlikely(local_read(&__get_cpu_var(ftrace_cpu_disabled))))

	if (unlikely(__this_cpu_read(per_cpu_var(ftrace_cpu_disabled))))

		return;



	event = trace_buffer_lock_reserve(buffer, TRACE_FN, sizeof(*entry),

kernel/trace/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ extern int DYN_FTRACE_TEST_NAME(void); 


extern int ring_buffer_expanded;

extern bool tracing_selftest_disabled;

DECLARE_PER_CPU(local_t, ftrace_cpu_disabled);

DECLARE_PER_CPU(int, ftrace_cpu_disabled);



#ifdef CONFIG_FTRACE_STARTUP_TEST

extern int trace_selftest_startup_function(struct tracer *trace,