X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fsyscalls.h;h=42e93ecc6dc3b02ce1b3c840049851f689e8a8db;hb=12318fb8ab85115216ef4355032320fae4d7941a;hp=e2f3bbd57dc4286b492a0e4c623521b8a65a2090;hpb=5b88d86e2d45fed6d405fd9fb72d6c1c22d35374;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/syscalls.h b/instrumentation/events/lttng-module/syscalls.h
index e2f3bbd5..42e93ecc 100644
--- a/instrumentation/events/lttng-module/syscalls.h
+++ b/instrumentation/events/lttng-module/syscalls.h
@@ -2,10 +2,10 @@
 #define TRACE_SYSTEM raw_syscalls
 #define TRACE_INCLUDE_FILE syscalls
 
-#if !defined(_TRACE_EVENTS_SYSCALLS_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_EVENTS_SYSCALLS_H
+#if !defined(LTTNG_TRACE_EVENTS_SYSCALLS_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_EVENTS_SYSCALLS_H
 
-#include <linux/tracepoint.h>
+#include "../../../probes/lttng-tracepoint-event.h"
 
 #ifdef CONFIG_HAVE_SYSCALL_TRACEPOINTS
 
@@ -17,7 +17,7 @@
 
 #endif /* _TRACE_SYSCALLS_DEF_ */
 
-TRACE_EVENT(sys_enter,
+LTTNG_TRACEPOINT_EVENT(sys_enter,
 
 	TP_PROTO(struct pt_regs *regs, long id),
 
@@ -31,10 +31,13 @@ TRACE_EVENT(sys_enter,
 	TP_fast_assign(
 		tp_assign(id, id)
 		{
-			unsigned long args_copy[6];
-
-			syscall_get_arguments(current, regs, 0, 6, args_copy);
-			tp_memcpy(args, args_copy, 6 * sizeof(args_copy));
+			tp_memcpy(args,
+				({
+					unsigned long args_copy[6];
+					syscall_get_arguments(current, regs,
+							0, 6, args_copy);
+					args_copy;
+				}), 6 * sizeof(unsigned long));
 		}
 	),
 
@@ -44,7 +47,7 @@ TRACE_EVENT(sys_enter,
 		  __entry->args[3], __entry->args[4], __entry->args[5])
 )
 
-TRACE_EVENT(sys_exit,
+LTTNG_TRACEPOINT_EVENT(sys_exit,
 
 	TP_PROTO(struct pt_regs *regs, long ret),
 
@@ -66,7 +69,7 @@ TRACE_EVENT(sys_exit,
 
 #endif /* CONFIG_HAVE_SYSCALL_TRACEPOINTS */
 
-#endif /* _TRACE_EVENTS_SYSCALLS_H */
+#endif /* LTTNG_TRACE_EVENTS_SYSCALLS_H */
 
 /* This part must be outside protection */
 #include "../../../probes/define_trace.h"