Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Tom Zanussi and committed by
Steven Rostedt
4bf0566d 0641d368

+8 -8
+8 -8
kernel/trace/trace_syscalls.c
··· 306 306 struct syscall_trace_enter *entry; 307 307 struct syscall_metadata *sys_data; 308 308 struct ring_buffer_event *event; 309 - enum event_trigger_type __tt = ETT_NONE; 309 + enum event_trigger_type tt = ETT_NONE; 310 310 struct ring_buffer *buffer; 311 311 unsigned long irq_flags; 312 312 unsigned long eflags; ··· 352 352 syscall_get_arguments(current, regs, 0, sys_data->nb_args, entry->args); 353 353 354 354 if (eflags & FTRACE_EVENT_FL_TRIGGER_COND) 355 - __tt = event_triggers_call(ftrace_file, entry); 355 + tt = event_triggers_call(ftrace_file, entry); 356 356 357 357 if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT, &ftrace_file->flags)) 358 358 ring_buffer_discard_commit(buffer, event); 359 359 else if (!filter_check_discard(ftrace_file, entry, buffer, event)) 360 360 trace_current_buffer_unlock_commit(buffer, event, 361 361 irq_flags, pc); 362 - if (__tt) 363 - event_triggers_post_call(ftrace_file, __tt); 362 + if (tt) 363 + event_triggers_post_call(ftrace_file, tt); 364 364 } 365 365 366 366 static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret) ··· 370 370 struct syscall_trace_exit *entry; 371 371 struct syscall_metadata *sys_data; 372 372 struct ring_buffer_event *event; 373 - enum event_trigger_type __tt = ETT_NONE; 373 + enum event_trigger_type tt = ETT_NONE; 374 374 struct ring_buffer *buffer; 375 375 unsigned long irq_flags; 376 376 unsigned long eflags; ··· 414 414 entry->ret = syscall_get_return_value(current, regs); 415 415 416 416 if (eflags & FTRACE_EVENT_FL_TRIGGER_COND) 417 - __tt = event_triggers_call(ftrace_file, entry); 417 + tt = event_triggers_call(ftrace_file, entry); 418 418 419 419 if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT, &ftrace_file->flags)) 420 420 ring_buffer_discard_commit(buffer, event); 421 421 else if (!filter_check_discard(ftrace_file, entry, buffer, event)) 422 422 trace_current_buffer_unlock_commit(buffer, event, 423 423 irq_flags, pc); 424 - if (__tt) 425 - event_triggers_post_call(ftrace_file, __tt); 424 + if (tt) 425 + event_triggers_post_call(ftrace_file, tt); 426 426 } 427 427 428 428 static int reg_event_syscall_enter(struct ftrace_event_file *file,