aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2014-01-06 14:44:20 -0500
committerSteven Rostedt <rostedt@goodmis.org>2014-01-06 15:22:07 -0500
commit4bf0566db15eda214cc64a77d4d3b96e010ec6ac (patch)
tree3cc1a5e635a2ad891ea0a13138264d02edc137ea /kernel/trace
parent0641d368f206f2fe7725c9fa5f1461229ef8010f (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.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index fdd955f2f1aa..a4acf9bbffa7 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)
306 struct syscall_trace_enter *entry; 306 struct syscall_trace_enter *entry;
307 struct syscall_metadata *sys_data; 307 struct syscall_metadata *sys_data;
308 struct ring_buffer_event *event; 308 struct ring_buffer_event *event;
309 enum event_trigger_type __tt = ETT_NONE; 309 enum event_trigger_type tt = ETT_NONE;
310 struct ring_buffer *buffer; 310 struct ring_buffer *buffer;
311 unsigned long irq_flags; 311 unsigned long irq_flags;
312 unsigned long eflags; 312 unsigned long eflags;
@@ -352,15 +352,15 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id)
352 syscall_get_arguments(current, regs, 0, sys_data->nb_args, entry->args); 352 syscall_get_arguments(current, regs, 0, sys_data->nb_args, entry->args);
353 353
354 if (eflags & FTRACE_EVENT_FL_TRIGGER_COND) 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 if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT, &ftrace_file->flags)) 357 if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT, &ftrace_file->flags))
358 ring_buffer_discard_commit(buffer, event); 358 ring_buffer_discard_commit(buffer, event);
359 else if (!filter_check_discard(ftrace_file, entry, buffer, event)) 359 else if (!filter_check_discard(ftrace_file, entry, buffer, event))
360 trace_current_buffer_unlock_commit(buffer, event, 360 trace_current_buffer_unlock_commit(buffer, event,
361 irq_flags, pc); 361 irq_flags, pc);
362 if (__tt) 362 if (tt)
363 event_triggers_post_call(ftrace_file, __tt); 363 event_triggers_post_call(ftrace_file, tt);
364} 364}
365 365
366static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret) 366static 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)
370 struct syscall_trace_exit *entry; 370 struct syscall_trace_exit *entry;
371 struct syscall_metadata *sys_data; 371 struct syscall_metadata *sys_data;
372 struct ring_buffer_event *event; 372 struct ring_buffer_event *event;
373 enum event_trigger_type __tt = ETT_NONE; 373 enum event_trigger_type tt = ETT_NONE;
374 struct ring_buffer *buffer; 374 struct ring_buffer *buffer;
375 unsigned long irq_flags; 375 unsigned long irq_flags;
376 unsigned long eflags; 376 unsigned long eflags;
@@ -414,15 +414,15 @@ static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret)
414 entry->ret = syscall_get_return_value(current, regs); 414 entry->ret = syscall_get_return_value(current, regs);
415 415
416 if (eflags & FTRACE_EVENT_FL_TRIGGER_COND) 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 if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT, &ftrace_file->flags)) 419 if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT, &ftrace_file->flags))
420 ring_buffer_discard_commit(buffer, event); 420 ring_buffer_discard_commit(buffer, event);
421 else if (!filter_check_discard(ftrace_file, entry, buffer, event)) 421 else if (!filter_check_discard(ftrace_file, entry, buffer, event))
422 trace_current_buffer_unlock_commit(buffer, event, 422 trace_current_buffer_unlock_commit(buffer, event,
423 irq_flags, pc); 423 irq_flags, pc);
424 if (__tt) 424 if (tt)
425 event_triggers_post_call(ftrace_file, __tt); 425 event_triggers_post_call(ftrace_file, tt);
426} 426}
427 427
428static int reg_event_syscall_enter(struct ftrace_event_file *file, 428static int reg_event_syscall_enter(struct ftrace_event_file *file,