standardize on "syscalls"

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/instrumentation/syscalls/headers/x86-64-syscalls-3.0.4-integers.h b/instrumentation/syscalls/headers/x86-64-syscalls-3.0.4-integers.h
index 4dd473f0d5faf9f29e9bd81d93949c4f626aad10..a22e73891315acc68dc69826e48218a3fe74a50b 100644 (file)
--- a/instrumentation/syscalls/headers/x86-64-syscalls-3.0.4-integers.h
+++ b/instrumentation/syscalls/headers/x86-64-syscalls-3.0.4-integers.h
@@ -1,9 +1,9 @@
 /* THIS FILE IS AUTO-GENERATED. DO NOT EDIT */
 #undef TRACE_SYSTEM
-#define TRACE_SYSTEM syscall
+#define TRACE_SYSTEM syscalls
 
-#if !defined(_TRACE_SYSCALL_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_SYSCALL_H
+#if !defined(_TRACE_SYSCALLS_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_SYSCALLS_H
 
 #include <linux/tracepoint.h>
 #include <linux/syscalls.h>
@@ -527,7 +527,7 @@ TRACE_EVENT(sys_mmap,
        TP_printk()
 )
 
-#endif /*  _TRACE_SYSCALL_H */
+#endif /*  _TRACE_SYSCALLS_H */
 
 /* This part must be outside protection */
 #include "../../../probes/define_trace.h"

diff --git a/instrumentation/syscalls/lttng-syscalls-generate-headers.sh b/instrumentation/syscalls/lttng-syscalls-generate-headers.sh
index 35f4486a29679d157836c922abc18e3a06274c38..f241d343c543549861b3a5a3241fc28b4dfe05d7 100644 (file)
--- a/instrumentation/syscalls/lttng-syscalls-generate-headers.sh
+++ b/instrumentation/syscalls/lttng-syscalls-generate-headers.sh
@@ -45,10 +45,10 @@ echo "/* THIS FILE IS AUTO-GENERATED. DO NOT EDIT */" > ${HEADER}
 
 echo \
 "#undef TRACE_SYSTEM
-#define TRACE_SYSTEM syscall
+#define TRACE_SYSTEM syscalls
 
-#if !defined(_TRACE_SYSCALL_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_SYSCALL_H
+#if !defined(_TRACE_SYSCALLS_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_SYSCALLS_H
 
 #include <linux/tracepoint.h>
 #include <linux/syscalls.h>
@@ -162,7 +162,7 @@ sed 's/^syscall \([^ ]*\) nr \([^ ]*\) nbargs \([^ ]*\) '\
 
 echo -n \
 "
-#endif /*  _TRACE_SYSCALL_H */
+#endif /*  _TRACE_SYSCALLS_H */
 
 /* This part must be outside protection */
 #include \"../../../probes/define_trace.h\"