2 files changed, 70 insertions, 17 deletions

diff --git a/include/trace/events/syscalls.h b/include/trace/events/syscalls.h
new file mode 100644
index 000000000000..397dff2dbd5a
--- /dev/null
+++ b/include/trace/events/syscalls.h
@@ -0,0 +1,70 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM syscalls
+
+#if !defined(_TRACE_EVENTS_SYSCALLS_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_EVENTS_SYSCALLS_H
+
+#include <linux/tracepoint.h>
+
+#include <asm/ptrace.h>
+#include <asm/syscall.h>
+
+
+#ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS
+
+extern void syscall_regfunc(void);
+extern void syscall_unregfunc(void);
+
+TRACE_EVENT_FN(sys_enter,
+
+        TP_PROTO(struct pt_regs *regs, long id),
+
+        TP_ARGS(regs, id),
+
+        TP_STRUCT__entry(
+                __field(        long,           id              )
+                __array(        unsigned long,  args,   6       )
+        ),
+
+        TP_fast_assign(
+                __entry->id     = id;
+                syscall_get_arguments(current, regs, 0, 6, __entry->args);
+        ),
+
+        TP_printk("NR %ld (%lx, %lx, %lx, %lx, %lx, %lx)",
+                  __entry->id,
+                  __entry->args[0], __entry->args[1], __entry->args[2],
+                  __entry->args[3], __entry->args[4], __entry->args[5]),
+
+        syscall_regfunc, syscall_unregfunc
+);
+
+TRACE_EVENT_FN(sys_exit,
+
+        TP_PROTO(struct pt_regs *regs, long ret),
+
+        TP_ARGS(regs, ret),
+
+        TP_STRUCT__entry(
+                __field(        long,   id      )
+                __field(        long,   ret     )
+        ),
+
+        TP_fast_assign(
+                __entry->id     = syscall_get_nr(current, regs);
+                __entry->ret    = ret;
+        ),
+
+        TP_printk("NR %ld = %ld",
+                  __entry->id, __entry->ret),
+
+        syscall_regfunc, syscall_unregfunc
+);
+
+#endif /* CONFIG_HAVE_SYSCALL_TRACEPOINTS */
+
+#endif /* _TRACE_EVENTS_SYSCALLS_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
+
diff --git a/include/trace/syscall.h b/include/trace/syscall.h
index 4e1943001854..5dc283ba5ae0 100644
--- a/include/trace/syscall.h
+++ b/include/trace/syscall.h
@@ -8,23 +8,6 @@
 #include <asm/ptrace.h>
 
 
-#ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS
-
-extern void syscall_regfunc(void);
-extern void syscall_unregfunc(void);
-
-DECLARE_TRACE(syscall_enter,
-        TP_PROTO(struct pt_regs *regs, long id),
-        TP_ARGS(regs, id)
-);
-
-DECLARE_TRACE(syscall_exit,
-        TP_PROTO(struct pt_regs *regs, long ret),
-        TP_ARGS(regs, ret)
-);
-
-#endif
-
 /*
  * A syscall entry in the ftrace syscalls array.
  *