Since commit
644d6e9c2807041db2b4fd9c3350d4fa243060b1 "Remove sys_
prefix from syscall names" the build has been broken for non-x86
architectures.
Remove the sys_ prefix from syscall names and related macros as has
already been done for x86.
Correct "OVVERRIDE" typo in arm and powerpc headers while we're at it.
Successfully built against v3.17 for 32- and 64-bit mips and powerpc;
runtime tested on arm, verifying that mmap2, execve, and clone syscall
events are captured.
Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-#define OVERRIDE_TABLE_32_sys_arm_fadvise64_64
-#define OVERRIDE_TABLE_32_sys_sync_file_range2
+#define OVERRIDE_TABLE_32_arm_fadvise64_64
+#define OVERRIDE_TABLE_32_sync_file_range2
#ifndef CREATE_SYSCALL_TABLE
#ifndef CREATE_SYSCALL_TABLE
-SC_LTTNG_TRACEPOINT_EVENT(sys_arm_fadvise64_64,
+SC_LTTNG_TRACEPOINT_EVENT(arm_fadvise64_64,
TP_PROTO(int fd, int advice, loff_t offset, loff_t len),
TP_ARGS(fd, advice, offset, len),
TP_STRUCT__entry(
TP_PROTO(int fd, int advice, loff_t offset, loff_t len),
TP_ARGS(fd, advice, offset, len),
TP_STRUCT__entry(
-SC_LTTNG_TRACEPOINT_EVENT(sys_sync_file_range2,
+SC_LTTNG_TRACEPOINT_EVENT(sync_file_range2,
TP_PROTO(int fd, loff_t offset, loff_t nbytes, unsigned int flags),
TP_ARGS(fd, offset, nbytes, flags),
TP_STRUCT__entry(
TP_PROTO(int fd, loff_t offset, loff_t nbytes, unsigned int flags),
TP_ARGS(fd, offset, nbytes, flags),
TP_STRUCT__entry(
#else /* CREATE_SYSCALL_TABLE */
#else /* CREATE_SYSCALL_TABLE */
-#define OVVERRIDE_TABLE_32_sys_mmap
-TRACE_SYSCALL_TABLE(sys_mmap, sys_mmap, 90, 6)
+#define OVERRIDE_TABLE_32_mmap
+TRACE_SYSCALL_TABLE(mmap, mmap, 90, 6)
-#define OVERRIDE_TABLE_32_sys_arm_fadvise64_64
-TRACE_SYSCALL_TABLE(sys_arm_fadvise64_64, sys_arm_fadvise64_64, 270, 4)
-#define OVERRIDE_TABLE_32_sys_sync_file_range2
-TRACE_SYSCALL_TABLE(sys_sync_file_range2, sys_sync_file_range2, 341, 4)
+#define OVERRIDE_TABLE_32_arm_fadvise64_64
+TRACE_SYSCALL_TABLE(arm_fadvise64_64, arm_fadvise64_64, 270, 4)
+#define OVERRIDE_TABLE_32_sync_file_range2
+TRACE_SYSCALL_TABLE(sync_file_range2, sync_file_range2, 341, 4)
#endif /* CREATE_SYSCALL_TABLE */
#endif /* CREATE_SYSCALL_TABLE */
-#define OVERRIDE_TABLE_32_sys_mmap2
+#define OVERRIDE_TABLE_32_mmap2
#ifndef CREATE_SYSCALL_TABLE
#ifndef CREATE_SYSCALL_TABLE
-SC_LTTNG_TRACEPOINT_EVENT(sys_mmap2,
+SC_LTTNG_TRACEPOINT_EVENT(mmap2,
TP_PROTO(void *addr, size_t len, int prot,
int flags, int fd, off_t pgoff),
TP_ARGS(addr, len, prot, flags, fd, pgoff),
TP_PROTO(void *addr, size_t len, int prot,
int flags, int fd, off_t pgoff),
TP_ARGS(addr, len, prot, flags, fd, pgoff),
#else /* CREATE_SYSCALL_TABLE */
#else /* CREATE_SYSCALL_TABLE */
-#define OVERRIDE_TABLE_32_sys_execve
-TRACE_SYSCALL_TABLE(sys_execve, sys_execve, 11, 3)
-#define OVERRIDE_TABLE_32_sys_clone
-TRACE_SYSCALL_TABLE(sys_clone, sys_clone, 120, 5)
-#define OVERRIDE_TABLE_32_sys_mmap2
-TRACE_SYSCALL_TABLE(sys_mmap2, sys_mmap2, 192, 6)
+#define OVERRIDE_TABLE_32_execve
+TRACE_SYSCALL_TABLE(execve, execve, 11, 3)
+#define OVERRIDE_TABLE_32_clone
+TRACE_SYSCALL_TABLE(clone, clone, 120, 5)
+#define OVERRIDE_TABLE_32_mmap2
+TRACE_SYSCALL_TABLE(mmap2, mmap2, 192, 6)
#endif /* CREATE_SYSCALL_TABLE */
#endif /* CREATE_SYSCALL_TABLE */
#else /* CREATE_SYSCALL_TABLE */
#else /* CREATE_SYSCALL_TABLE */
-#define OVERRIDE_TABLE_32_sys_clone
-TRACE_SYSCALL_TABLE(sys_clone, sys_clone, 4120, 0)
+#define OVERRIDE_TABLE_32_clone
+TRACE_SYSCALL_TABLE(clone, clone, 4120, 0)
#endif /* CREATE_SYSCALL_TABLE */
#endif /* CREATE_SYSCALL_TABLE */
#else /* CREATE_SYSCALL_TABLE */
#define OVERRIDE_TABLE_64_sys_clone
#else /* CREATE_SYSCALL_TABLE */
#define OVERRIDE_TABLE_64_sys_clone
-TRACE_SYSCALL_TABLE(sys_clone, sys_clone, 5055, 0)
+TRACE_SYSCALL_TABLE(clone, clone, 5055, 0)
#endif /* CREATE_SYSCALL_TABLE */
#endif /* CREATE_SYSCALL_TABLE */
#else /* CREATE_SYSCALL_TABLE */
#else /* CREATE_SYSCALL_TABLE */
-#define OVVERRIDE_TABLE_32_sys_mmap
-TRACE_SYSCALL_TABLE(sys_mmap, sys_mmap, 90, 6)
+#define OVERRIDE_TABLE_32_mmap
+TRACE_SYSCALL_TABLE(mmap, mmap, 90, 6)
#endif /* CREATE_SYSCALL_TABLE */
#endif /* CREATE_SYSCALL_TABLE */
-#define OVERRIDE_TABLE_32_sys_mmap2
+#define OVERRIDE_TABLE_32_mmap2
#ifndef CREATE_SYSCALL_TABLE
#ifndef CREATE_SYSCALL_TABLE
-SC_LTTNG_TRACEPOINT_EVENT(sys_mmap2,
+SC_LTTNG_TRACEPOINT_EVENT(mmap2,
TP_PROTO(void *addr, size_t len, int prot,
int flags, int fd, off_t pgoff),
TP_ARGS(addr, len, prot, flags, fd, pgoff),
TP_PROTO(void *addr, size_t len, int prot,
int flags, int fd, off_t pgoff),
TP_ARGS(addr, len, prot, flags, fd, pgoff),
#else /* CREATE_SYSCALL_TABLE */
#else /* CREATE_SYSCALL_TABLE */
-#define OVERRIDE_TABLE_32_sys_execve
-TRACE_SYSCALL_TABLE(sys_execve, sys_execve, 11, 3)
-#define OVERRIDE_TABLE_32_sys_clone
-TRACE_SYSCALL_TABLE(sys_clone, sys_clone, 120, 5)
-#define OVERRIDE_TABLE_32_sys_mmap2
-TRACE_SYSCALL_TABLE(sys_mmap2, sys_mmap2, 192, 6)
+#define OVERRIDE_TABLE_32_execve
+TRACE_SYSCALL_TABLE(execve, execve, 11, 3)
+#define OVERRIDE_TABLE_32_clone
+TRACE_SYSCALL_TABLE(clone, clone, 120, 5)
+#define OVERRIDE_TABLE_32_mmap2
+TRACE_SYSCALL_TABLE(mmap2, mmap2, 192, 6)
#endif /* CREATE_SYSCALL_TABLE */
#endif /* CREATE_SYSCALL_TABLE */