diff options
Diffstat (limited to 'kernel/trace/trace_branch.c')
| -rw-r--r-- | kernel/trace/trace_branch.c | 4 | 
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c index 6d08a5523ce0..6809b370e991 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c @@ -32,7 +32,6 @@ probe_likely_condition(struct ftrace_likely_data *f, int val, int expect)  {  	struct trace_array *tr = branch_tracer;  	struct trace_buffer *buffer; -	struct trace_array_cpu *data;  	struct ring_buffer_event *event;  	struct trace_branch *entry;  	unsigned long flags; @@ -54,8 +53,7 @@ probe_likely_condition(struct ftrace_likely_data *f, int val, int expect)  	raw_local_irq_save(flags);  	current->trace_recursion |= TRACE_BRANCH_BIT; -	data = this_cpu_ptr(tr->array_buffer.data); -	if (atomic_read(&data->disabled)) +	if (!tracer_tracing_is_on_cpu(tr, raw_smp_processor_id()))  		goto out;  	trace_ctx = tracing_gen_ctx_flags(flags);  | 
