Merge commit 'linus/master' into tracing/kprobes

[karo-tx-linux.git] / include / linux / syscalls.h

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index a990ace1a8380f01901b742a6b0821aff46a5d9d..b50974a93af0b83d2c1e3a826f4bdc6a8848ba62 100644 (file)
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -100,23 +100,23 @@ struct perf_event_attr;
 
 #ifdef CONFIG_EVENT_PROFILE
 #define TRACE_SYS_ENTER_PROFILE(sname)                                        \
-static int prof_sysenter_enable_##sname(void)                                 \
+static int prof_sysenter_enable_##sname(struct ftrace_event_call *unused)      \
 {                                                                             \
        return reg_prof_syscall_enter("sys"#sname);                            \
 }                                                                             \
                                                                               \
-static void prof_sysenter_disable_##sname(void)                                       \
+static void prof_sysenter_disable_##sname(struct ftrace_event_call *unused)    \
 {                                                                             \
        unreg_prof_syscall_enter("sys"#sname);                                 \
 }
 
 #define TRACE_SYS_EXIT_PROFILE(sname)                                         \
-static int prof_sysexit_enable_##sname(void)                                  \
+static int prof_sysexit_enable_##sname(struct ftrace_event_call *unused)       \
 {                                                                             \
        return reg_prof_syscall_exit("sys"#sname);                             \
 }                                                                             \
                                                                               \
-static void prof_sysexit_disable_##sname(void)                                \
+static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused)     \
 {                                                                              \
        unreg_prof_syscall_exit("sys"#sname);                                  \
 }
@@ -157,7 +157,7 @@ static void prof_sysexit_disable_##sname(void)                                     \
        struct trace_event enter_syscall_print_##sname = {              \
                .trace                  = print_syscall_enter,          \
        };                                                              \
-       static int init_enter_##sname(void)                             \
+       static int init_enter_##sname(struct ftrace_event_call *call)   \
        {                                                               \
                int num, id;                                            \
                num = syscall_name_to_nr("sys"#sname);                  \
@@ -193,7 +193,7 @@ static void prof_sysexit_disable_##sname(void)                                     \
        struct trace_event exit_syscall_print_##sname = {               \
                .trace                  = print_syscall_exit,           \
        };                                                              \
-       static int init_exit_##sname(void)                              \
+       static int init_exit_##sname(struct ftrace_event_call *call)    \
        {                                                               \
                int num, id;                                            \
                num = syscall_name_to_nr("sys"#sname);                  \