projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[deliverable/linux.git]
/
kernel
/
trace
/
trace_events.c
diff --git
a/kernel/trace/trace_events.c
b/kernel/trace/trace_events.c
index 78b1ed230177246349d10ba83615b99f3adcbde3..97e2c4d2e9ebdfeed72e8518a34e0e25f6b045d4 100644
(file)
--- a/
kernel/trace/trace_events.c
+++ b/
kernel/trace/trace_events.c
@@
-1432,7
+1432,7
@@
static __init void event_trace_self_tests(void)
#ifdef CONFIG_FUNCTION_TRACER
#ifdef CONFIG_FUNCTION_TRACER
-static DEFINE_PER_CPU(atomic_t, test_event_disable);
+static DEFINE_PER_CPU(atomic_t,
ftrace_
test_event_disable);
static void
function_test_events_call(unsigned long ip, unsigned long parent_ip)
static void
function_test_events_call(unsigned long ip, unsigned long parent_ip)
@@
-1449,7
+1449,7
@@
function_test_events_call(unsigned long ip, unsigned long parent_ip)
pc = preempt_count();
resched = ftrace_preempt_disable();
cpu = raw_smp_processor_id();
pc = preempt_count();
resched = ftrace_preempt_disable();
cpu = raw_smp_processor_id();
- disabled = atomic_inc_return(&per_cpu(test_event_disable, cpu));
+ disabled = atomic_inc_return(&per_cpu(
ftrace_
test_event_disable, cpu));
if (disabled != 1)
goto out;
if (disabled != 1)
goto out;
@@
-1468,7
+1468,7
@@
function_test_events_call(unsigned long ip, unsigned long parent_ip)
trace_nowake_buffer_unlock_commit(buffer, event, flags, pc);
out:
trace_nowake_buffer_unlock_commit(buffer, event, flags, pc);
out:
- atomic_dec(&per_cpu(test_event_disable, cpu));
+ atomic_dec(&per_cpu(
ftrace_
test_event_disable, cpu));
ftrace_preempt_enable(resched);
}
ftrace_preempt_enable(resched);
}
This page took
0.028547 seconds
and
5
git commands to generate.