diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-05-13 22:21:25 +0300 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2015-05-13 22:25:39 +0300 |
commit | 09a5059aa1a2cbf8c8993e61b013cc83a0dd5833 (patch) | |
tree | 751b58cfad60eab0f637ea4966888b7828bd94de /include | |
parent | 5d6ad960a71f0b36d95d74ef93285733b9f62f59 (diff) | |
download | linux-09a5059aa1a2cbf8c8993e61b013cc83a0dd5833.tar.xz |
tracing: Rename ftrace_trigger_soft_disabled() to trace_trigger_soft_disabled()
The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The ftrace_trigger_soft_disabled() tests if a
trace_event is soft disabled (called but not traced), and returns true if
it is. It has nothing to do with function tracing and should be renamed.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/trace_events.h | 4 | ||||
-rw-r--r-- | include/trace/perf.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index a46c138b2eea..1063c850dbab 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -426,7 +426,7 @@ extern void event_triggers_post_call(struct trace_event_file *file, enum event_trigger_type tt); /** - * ftrace_trigger_soft_disabled - do triggers and test if soft disabled + * trace_trigger_soft_disabled - do triggers and test if soft disabled * @file: The file pointer of the event to test * * If any triggers without filters are attached to this event, they @@ -435,7 +435,7 @@ extern void event_triggers_post_call(struct trace_event_file *file, * otherwise false. */ static inline bool -ftrace_trigger_soft_disabled(struct trace_event_file *file) +trace_trigger_soft_disabled(struct trace_event_file *file) { unsigned long eflags = file->flags; diff --git a/include/trace/perf.h b/include/trace/perf.h index 792eca92c43a..c9b831f3da23 100644 --- a/include/trace/perf.h +++ b/include/trace/perf.h @@ -159,7 +159,7 @@ ftrace_raw_event_##call(void *__data, proto) \ struct ftrace_raw_##call *entry; \ int __data_size; \ \ - if (ftrace_trigger_soft_disabled(trace_file)) \ + if (trace_trigger_soft_disabled(trace_file)) \ return; \ \ __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ |