Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  kernel/profile.c: Switch /proc/irq/prof_cpu_mask to seq_file
  tracing: Export trace_profile_buf symbols
  tracing/events: use list_for_entry_continue
  tracing: remove max_tracer_type_len
  function-graph: use ftrace_graph_funcs directly
  tracing: Remove markers
  tracing: Allocate the ftrace event profile buffer dynamically
  tracing: Factorize the events profile accounting

1 files changed, 8 insertions, 16 deletions

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index a8e37821cc60..7d9803cbb20f 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -100,33 +100,25 @@ struct perf_counter_attr;
 
 #ifdef CONFIG_EVENT_PROFILE
 #define TRACE_SYS_ENTER_PROFILE(sname)                                         \
-static int prof_sysenter_enable_##sname(struct ftrace_event_call *event_call)  \
+static int prof_sysenter_enable_##sname(void)                                  \
 {                                                                              \
-        int ret = 0;                                                           \
-        if (!atomic_inc_return(&event_enter_##sname.profile_count))            \
-                ret = reg_prof_syscall_enter("sys"#sname);                     \
-        return ret;                                                            \
+        return reg_prof_syscall_enter("sys"#sname);                            \
 }                                                                              \
                                                                                \
-static void prof_sysenter_disable_##sname(struct ftrace_event_call *event_call)\
+static void prof_sysenter_disable_##sname(void)                                \
 {                                                                              \
-        if (atomic_add_negative(-1, &event_enter_##sname.profile_count))       \
-                unreg_prof_syscall_enter("sys"#sname);                         \
+        unreg_prof_syscall_enter("sys"#sname);                                 \
 }
 
 #define TRACE_SYS_EXIT_PROFILE(sname)                                          \
-static int prof_sysexit_enable_##sname(struct ftrace_event_call *event_call)   \
+static int prof_sysexit_enable_##sname(void)                                   \
 {                                                                              \
-        int ret = 0;                                                           \
-        if (!atomic_inc_return(&event_exit_##sname.profile_count))             \
-                ret = reg_prof_syscall_exit("sys"#sname);                      \
-        return ret;                                                            \
+        return reg_prof_syscall_exit("sys"#sname);                             \
 }                                                                              \
                                                                                \
-static void prof_sysexit_disable_##sname(struct ftrace_event_call *event_call) \
+static void prof_sysexit_disable_##sname(void)                                 \
 {                                                                              \
-        if (atomic_add_negative(-1, &event_exit_##sname.profile_count))        \
-                unreg_prof_syscall_exit("sys"#sname);                          \
+        unreg_prof_syscall_exit("sys"#sname);                                  \
 }
 
 #define TRACE_SYS_ENTER_PROFILE_INIT(sname)                                    \