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>

diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index fdd955f2f1aaddf0df34135365b7e4793fa0a109..a4acf9bbffa7de6c0ce292ba6cd96d5cd7b12ba1 100644 (file)
--- 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,