aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/trace_events.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index aa08be69a1b6..54b1de5074b6 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -1318,7 +1318,7 @@ static __init void event_trace_self_tests(void)
1318 1318
1319#ifdef CONFIG_FUNCTION_TRACER 1319#ifdef CONFIG_FUNCTION_TRACER
1320 1320
1321static DEFINE_PER_CPU(atomic_t, test_event_disable); 1321static DEFINE_PER_CPU(atomic_t, ftrace_test_event_disable);
1322 1322
1323static void 1323static void
1324function_test_events_call(unsigned long ip, unsigned long parent_ip) 1324function_test_events_call(unsigned long ip, unsigned long parent_ip)
@@ -1334,7 +1334,7 @@ function_test_events_call(unsigned long ip, unsigned long parent_ip)
1334 pc = preempt_count(); 1334 pc = preempt_count();
1335 resched = ftrace_preempt_disable(); 1335 resched = ftrace_preempt_disable();
1336 cpu = raw_smp_processor_id(); 1336 cpu = raw_smp_processor_id();
1337 disabled = atomic_inc_return(&per_cpu(test_event_disable, cpu)); 1337 disabled = atomic_inc_return(&per_cpu(ftrace_test_event_disable, cpu));
1338 1338
1339 if (disabled != 1) 1339 if (disabled != 1)
1340 goto out; 1340 goto out;
@@ -1352,7 +1352,7 @@ function_test_events_call(unsigned long ip, unsigned long parent_ip)
1352 trace_nowake_buffer_unlock_commit(event, flags, pc); 1352 trace_nowake_buffer_unlock_commit(event, flags, pc);
1353 1353
1354 out: 1354 out:
1355 atomic_dec(&per_cpu(test_event_disable, cpu)); 1355 atomic_dec(&per_cpu(ftrace_test_event_disable, cpu));
1356 ftrace_preempt_enable(resched); 1356 ftrace_preempt_enable(resched);
1357} 1357}
1358 1358