aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_events.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/trace_events.c')
-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 787f0fb0994e..56c260b83a9c 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -1411,7 +1411,7 @@ static __init void event_trace_self_tests(void)
1411 1411
1412#ifdef CONFIG_FUNCTION_TRACER 1412#ifdef CONFIG_FUNCTION_TRACER
1413 1413
1414static DEFINE_PER_CPU(atomic_t, test_event_disable); 1414static DEFINE_PER_CPU(atomic_t, ftrace_test_event_disable);
1415 1415
1416static void 1416static void
1417function_test_events_call(unsigned long ip, unsigned long parent_ip) 1417function_test_events_call(unsigned long ip, unsigned long parent_ip)
@@ -1428,7 +1428,7 @@ function_test_events_call(unsigned long ip, unsigned long parent_ip)
1428 pc = preempt_count(); 1428 pc = preempt_count();
1429 resched = ftrace_preempt_disable(); 1429 resched = ftrace_preempt_disable();
1430 cpu = raw_smp_processor_id(); 1430 cpu = raw_smp_processor_id();
1431 disabled = atomic_inc_return(&per_cpu(test_event_disable, cpu)); 1431 disabled = atomic_inc_return(&per_cpu(ftrace_test_event_disable, cpu));
1432 1432
1433 if (disabled != 1) 1433 if (disabled != 1)
1434 goto out; 1434 goto out;
@@ -1447,7 +1447,7 @@ function_test_events_call(unsigned long ip, unsigned long parent_ip)
1447 trace_nowake_buffer_unlock_commit(buffer, event, flags, pc); 1447 trace_nowake_buffer_unlock_commit(buffer, event, flags, pc);
1448 1448
1449 out: 1449 out:
1450 atomic_dec(&per_cpu(test_event_disable, cpu)); 1450 atomic_dec(&per_cpu(ftrace_test_event_disable, cpu));
1451 ftrace_preempt_enable(resched); 1451 ftrace_preempt_enable(resched);
1452} 1452}
1453 1453