diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-01-06 13:44:20 -0600 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-01-06 15:22:07 -0500 |
| commit | 4bf0566db15eda214cc64a77d4d3b96e010ec6ac (patch) | |
| tree | 3cc1a5e635a2ad891ea0a13138264d02edc137ea /kernel/trace | |
| parent | 0641d368f206f2fe7725c9fa5f1461229ef8010f (diff) | |
tracing: Remove double-underscore naming in syscall trigger invocations
There's no reason to use double-underscores for any variable name in
ftrace_syscall_enter()/exit(), since those functions aren't generated
and there's no need to avoid namespace collisions as with the event
macros, which is where the original invocation code came from.
Link: http://lkml.kernel.org/r/0b489c9d1f7ee315cff60fa0e4c2b433ade8ae0d.1389036657.git.tom.zanussi@linux.intel.com
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_syscalls.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index fdd955f2f1a..a4acf9bbffa 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -306,7 +306,7 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id) struct syscall_trace_enter *entry; struct syscall_metadata *sys_data; struct ring_buffer_event *event; - enum event_trigger_type __tt = ETT_NONE; + enum event_trigger_type tt = ETT_NONE; struct ring_buffer *buffer; unsigned long irq_flags; unsigned long eflags; @@ -352,15 +352,15 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id) syscall_get_arguments(current, regs, 0, sys_data->nb_args, entry->args); if (eflags & FTRACE_EVENT_FL_TRIGGER_COND) - __tt = event_triggers_call(ftrace_file, entry); + tt = event_triggers_call(ftrace_file, entry); if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT, &ftrace_file->flags)) ring_buffer_discard_commit(buffer, event); else if (!filter_check_discard(ftrace_file, entry, buffer, event)) trace_current_buffer_unlock_commit(buffer, event, irq_flags, pc); - if (__tt) - event_triggers_post_call(ftrace_file, __tt); + if (tt) + event_triggers_post_call(ftrace_file, tt); } static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret) @@ -370,7 +370,7 @@ static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret) struct syscall_trace_exit *entry; struct syscall_metadata *sys_data; struct ring_buffer_event *event; - enum event_trigger_type __tt = ETT_NONE; + enum event_trigger_type tt = ETT_NONE; struct ring_buffer *buffer; unsigned long irq_flags; unsigned long eflags; @@ -414,15 +414,15 @@ static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret) entry->ret = syscall_get_return_value(current, regs); if (eflags & FTRACE_EVENT_FL_TRIGGER_COND) - __tt = event_triggers_call(ftrace_file, entry); + tt = event_triggers_call(ftrace_file, entry); if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT, &ftrace_file->flags)) ring_buffer_discard_commit(buffer, event); else if (!filter_check_discard(ftrace_file, entry, buffer, event)) trace_current_buffer_unlock_commit(buffer, event, irq_flags, pc); - if (__tt) - event_triggers_post_call(ftrace_file, __tt); + if (tt) + event_triggers_post_call(ftrace_file, tt); } static int reg_event_syscall_enter(struct ftrace_event_file *file, |