From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 15 Mar 2016 16:02:27 +0000 (-0400)
Subject: syscall instrumentation: use system headers
X-Git-Tag: v2.8.0-rc1~5
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6d7f376d6c8fa2118e972a9a271a64142e82a15c;p=lttng-modules.git

syscall instrumentation: use system headers

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

diff --git a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers.h b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers.h
index 7fd7dded..ca71d869 100644
--- a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers.h
+++ b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_integers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_INTEGERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_INTEGERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "arm-32-syscalls-3.4.25_integers_override.h"
 #include "syscalls_integers_override.h"
@@ -821,7 +821,7 @@ SC_LTTNG_TRACEPOINT_EVENT(keyctl,
 #endif /*  _TRACE_SYSCALLS_INTEGERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_pointers.h b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_pointers.h
index 049c1aa0..76aab1b1 100644
--- a/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_pointers.h
+++ b/instrumentation/syscalls/headers/arm-32-syscalls-3.4.25_pointers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_POINTERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_POINTERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "arm-32-syscalls-3.4.25_pointers_override.h"
 #include "syscalls_pointers_override.h"
@@ -1350,7 +1350,7 @@ SC_LTTNG_TRACEPOINT_EVENT(process_vm_writev,
 #endif /*  _TRACE_SYSCALLS_POINTERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/headers/arm-64-syscalls-4.4.0_integers.h b/instrumentation/syscalls/headers/arm-64-syscalls-4.4.0_integers.h
index 3fbc0a7b..b033dc17 100644
--- a/instrumentation/syscalls/headers/arm-64-syscalls-4.4.0_integers.h
+++ b/instrumentation/syscalls/headers/arm-64-syscalls-4.4.0_integers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_INTEGERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_INTEGERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "arm-64-syscalls-4.4.0_integers_override.h"
 #include "syscalls_integers_override.h"
@@ -688,7 +688,7 @@ SC_LTTNG_TRACEPOINT_EVENT(remap_file_pages,
 #endif /*  _TRACE_SYSCALLS_INTEGERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/headers/arm-64-syscalls-4.4.0_pointers.h b/instrumentation/syscalls/headers/arm-64-syscalls-4.4.0_pointers.h
index de2833f8..f61ec756 100644
--- a/instrumentation/syscalls/headers/arm-64-syscalls-4.4.0_pointers.h
+++ b/instrumentation/syscalls/headers/arm-64-syscalls-4.4.0_pointers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_POINTERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_POINTERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "arm-64-syscalls-4.4.0_pointers_override.h"
 #include "syscalls_pointers_override.h"
@@ -1161,7 +1161,7 @@ SC_LTTNG_TRACEPOINT_EVENT(process_vm_writev,
 #endif /*  _TRACE_SYSCALLS_POINTERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_integers.h b/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_integers.h
index 309b8ef1..2c01d003 100644
--- a/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_integers.h
+++ b/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_integers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_INTEGERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_INTEGERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "mips-32-syscalls-3.13.0_integers_override.h"
 #include "syscalls_integers_override.h"
@@ -777,7 +777,7 @@ SC_LTTNG_TRACEPOINT_EVENT(mips_mmap2,
 #endif /*  _TRACE_SYSCALLS_INTEGERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_pointers.h b/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_pointers.h
index 22f57e52..33d7d74a 100644
--- a/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_pointers.h
+++ b/instrumentation/syscalls/headers/mips-32-syscalls-3.13.0_pointers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_POINTERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_POINTERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "mips-32-syscalls-3.13.0_pointers_override.h"
 #include "syscalls_pointers_override.h"
@@ -1273,7 +1273,7 @@ SC_LTTNG_TRACEPOINT_EVENT(epoll_pwait,
 #endif /*  _TRACE_SYSCALLS_POINTERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/headers/mips-32-syscalls-3.18.0_integers.h b/instrumentation/syscalls/headers/mips-32-syscalls-3.18.0_integers.h
index d5205281..430d4cf5 100644
--- a/instrumentation/syscalls/headers/mips-32-syscalls-3.18.0_integers.h
+++ b/instrumentation/syscalls/headers/mips-32-syscalls-3.18.0_integers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_INTEGERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_INTEGERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "mips-32-syscalls-3.18.0_integers_override.h"
 #include "syscalls_integers_override.h"
@@ -753,7 +753,7 @@ SC_LTTNG_TRACEPOINT_EVENT(mips_mmap2,
 #endif /*  _TRACE_SYSCALLS_INTEGERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/headers/mips-32-syscalls-3.18.0_pointers.h b/instrumentation/syscalls/headers/mips-32-syscalls-3.18.0_pointers.h
index 8ff4fee5..118eadc6 100644
--- a/instrumentation/syscalls/headers/mips-32-syscalls-3.18.0_pointers.h
+++ b/instrumentation/syscalls/headers/mips-32-syscalls-3.18.0_pointers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_POINTERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_POINTERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "mips-32-syscalls-3.18.0_pointers_override.h"
 #include "syscalls_pointers_override.h"
@@ -1322,7 +1322,7 @@ SC_LTTNG_TRACEPOINT_EVENT(epoll_pwait,
 #endif /*  _TRACE_SYSCALLS_POINTERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_integers.h b/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_integers.h
index e2a66d5f..c4d19538 100644
--- a/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_integers.h
+++ b/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_integers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_INTEGERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_INTEGERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "mips-64-syscalls-3.5.0_integers_override.h"
 #include "syscalls_integers_override.h"
@@ -791,7 +791,7 @@ SC_LTTNG_TRACEPOINT_EVENT(mips_mmap,
 #endif /*  _TRACE_SYSCALLS_INTEGERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_pointers.h b/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_pointers.h
index 9dd4a456..6605d913 100644
--- a/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_pointers.h
+++ b/instrumentation/syscalls/headers/mips-64-syscalls-3.5.0_pointers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_POINTERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_POINTERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "mips-64-syscalls-3.5.0_pointers_override.h"
 #include "syscalls_pointers_override.h"
@@ -1301,7 +1301,7 @@ SC_LTTNG_TRACEPOINT_EVENT(splice,
 #endif /*  _TRACE_SYSCALLS_POINTERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_integers.h b/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_integers.h
index 4c28e46d..ded32234 100644
--- a/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_integers.h
+++ b/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_integers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_INTEGERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_INTEGERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "powerpc-32-syscalls-3.0.34_integers_override.h"
 #include "syscalls_integers_override.h"
@@ -721,7 +721,7 @@ SC_LTTNG_TRACEPOINT_EVENT(keyctl,
 #endif /*  _TRACE_SYSCALLS_INTEGERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_pointers.h b/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_pointers.h
index d992c8f5..88c19092 100644
--- a/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_pointers.h
+++ b/instrumentation/syscalls/headers/powerpc-32-syscalls-3.0.34_pointers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_POINTERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_POINTERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "powerpc-32-syscalls-3.0.34_pointers_override.h"
 #include "syscalls_pointers_override.h"
@@ -1350,7 +1350,7 @@ SC_LTTNG_TRACEPOINT_EVENT(recvfrom,
 #endif /*  _TRACE_SYSCALLS_POINTERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/headers/syscalls_unknown.h b/instrumentation/syscalls/headers/syscalls_unknown.h
index be3b695e..c72e7d0e 100644
--- a/instrumentation/syscalls/headers/syscalls_unknown.h
+++ b/instrumentation/syscalls/headers/syscalls_unknown.h
@@ -1,7 +1,7 @@
 #if !defined(_TRACE_SYSCALLS_UNKNOWN_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_UNKNOWN_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 
 #define UNKNOWN_SYSCALL_NRARGS	6
@@ -50,4 +50,4 @@ LTTNG_TRACEPOINT_EVENT(compat_syscall_exit_unknown,
 #endif /*  _TRACE_SYSCALLS_UNKNOWN_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
diff --git a/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_integers.h b/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_integers.h
index f2745327..9d5dba08 100644
--- a/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_integers.h
+++ b/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_integers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_INTEGERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_INTEGERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "x86-32-syscalls-3.1.0-rc6_integers_override.h"
 #include "syscalls_integers_override.h"
@@ -817,7 +817,7 @@ SC_LTTNG_TRACEPOINT_EVENT(mmap_pgoff,
 #endif /*  _TRACE_SYSCALLS_INTEGERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_pointers.h b/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_pointers.h
index d06c5393..19d9adea 100644
--- a/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_pointers.h
+++ b/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_pointers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_POINTERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_POINTERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "x86-32-syscalls-3.1.0-rc6_pointers_override.h"
 #include "syscalls_pointers_override.h"
@@ -1301,7 +1301,7 @@ SC_LTTNG_TRACEPOINT_EVENT(epoll_pwait,
 #endif /*  _TRACE_SYSCALLS_POINTERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_integers.h b/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_integers.h
index 71eec5c5..f7cf7c1d 100644
--- a/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_integers.h
+++ b/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_integers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_INTEGERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_INTEGERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "x86-64-syscalls-3.10.0-rc7_integers_override.h"
 #include "syscalls_integers_override.h"
@@ -746,7 +746,7 @@ SC_LTTNG_TRACEPOINT_EVENT(mmap,
 #endif /*  _TRACE_SYSCALLS_INTEGERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers.h b/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers.h
index b54126ce..9d9a1b5c 100644
--- a/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers.h
+++ b/instrumentation/syscalls/headers/x86-64-syscalls-3.10.0-rc7_pointers.h
@@ -4,7 +4,7 @@
 #if !defined(_TRACE_SYSCALLS_POINTERS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_POINTERS_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include "x86-64-syscalls-3.10.0-rc7_pointers_override.h"
 #include "syscalls_pointers_override.h"
@@ -1343,7 +1343,7 @@ SC_LTTNG_TRACEPOINT_EVENT(process_vm_writev,
 #endif /*  _TRACE_SYSCALLS_POINTERS_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */
 
diff --git a/instrumentation/syscalls/lttng-syscalls-generate-headers.sh b/instrumentation/syscalls/lttng-syscalls-generate-headers.sh
index 5568be00..4b601b49 100755
--- a/instrumentation/syscalls/lttng-syscalls-generate-headers.sh
+++ b/instrumentation/syscalls/lttng-syscalls-generate-headers.sh
@@ -76,7 +76,7 @@ echo \
 #if !defined(_TRACE_SYSCALLS_${CLASSCAP}_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_${CLASSCAP}_H
 
-#include \"../../../probes/lttng-tracepoint-event.h\"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/syscalls.h>
 #include \"${INPUTFILE}_${CLASS}_override.h\"
 #include \"syscalls_${CLASS}_override.h\"
@@ -303,7 +303,7 @@ echo \
 #endif /*  _TRACE_SYSCALLS_${CLASSCAP}_H */
 
 /* This part must be outside protection */
-#include \"../../../probes/define_trace.h\"
+#include <probes/define_trace.h>
 
 #else /* CREATE_SYSCALL_TABLE */