From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757657AbaAJPVI (ORCPT ); Fri, 10 Jan 2014 10:21:08 -0500 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.225]:43231 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751205AbaAJPVD (ORCPT ); Fri, 10 Jan 2014 10:21:03 -0500 Message-Id: <20140110152100.323074566@goodmis.org> User-Agent: quilt/0.60-1 Date: Fri, 10 Jan 2014 10:20:06 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Frederic Weisbecker , Andrew Morton , Tom Zanussi Subject: [for-next][PATCH 2/5] tracing: Remove double-underscore naming in syscall trigger invocations References: <20140110152004.200225053@goodmis.org> Content-Disposition: inline; filename=0002-tracing-Remove-double-underscore-naming-in-syscall-t.patch X-RR-Connecting-IP: 107.14.168.118:25 X-Cloudmark-Score: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tom Zanussi 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 Signed-off-by: Steven Rostedt --- kernel/trace/trace_syscalls.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index fdd955f..a4acf9b 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, -- 1.8.4.3