Gather detailed info from x86 64 32-bit compat syscall instrumentation

[lttng-modules.git] / instrumentation / syscalls / headers / x86-32-syscalls-3.1.0-rc6_integers.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 4825562b334377529c830802406e96e911911491..f4ee16c36511d94f5d4212c98df2e4e38fb2e583 100644 (file)
--- 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
@@ -7,76 +7,77 @@
 #include <linux/tracepoint.h>
 #include <linux/syscalls.h>
 #include "x86-32-syscalls-3.1.0-rc6_integers_override.h"
+#include "syscalls_integers_override.h"
 
 SC_DECLARE_EVENT_CLASS_NOARGS(syscalls_noargs,
        TP_STRUCT__entry(),
        TP_fast_assign(),
        TP_printk()
 )
-#ifndef OVERRIDE_sys_restart_syscall
+#ifndef OVERRIDE_32_sys_restart_syscall
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_restart_syscall)
 #endif
-#ifndef OVERRIDE_sys_getpid
+#ifndef OVERRIDE_32_sys_getpid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_getpid)
 #endif
-#ifndef OVERRIDE_sys_getuid16
+#ifndef OVERRIDE_32_sys_getuid16
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_getuid16)
 #endif
-#ifndef OVERRIDE_sys_pause
+#ifndef OVERRIDE_32_sys_pause
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_pause)
 #endif
-#ifndef OVERRIDE_sys_sync
+#ifndef OVERRIDE_32_sys_sync
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_sync)
 #endif
-#ifndef OVERRIDE_sys_getgid16
+#ifndef OVERRIDE_32_sys_getgid16
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_getgid16)
 #endif
-#ifndef OVERRIDE_sys_geteuid16
+#ifndef OVERRIDE_32_sys_geteuid16
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_geteuid16)
 #endif
-#ifndef OVERRIDE_sys_getegid16
+#ifndef OVERRIDE_32_sys_getegid16
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_getegid16)
 #endif
-#ifndef OVERRIDE_sys_getppid
+#ifndef OVERRIDE_32_sys_getppid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_getppid)
 #endif
-#ifndef OVERRIDE_sys_getpgrp
+#ifndef OVERRIDE_32_sys_getpgrp
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_getpgrp)
 #endif
-#ifndef OVERRIDE_sys_setsid
+#ifndef OVERRIDE_32_sys_setsid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_setsid)
 #endif
-#ifndef OVERRIDE_sys_sgetmask
+#ifndef OVERRIDE_32_sys_sgetmask
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_sgetmask)
 #endif
-#ifndef OVERRIDE_sys_vhangup
+#ifndef OVERRIDE_32_sys_vhangup
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_vhangup)
 #endif
-#ifndef OVERRIDE_sys_munlockall
+#ifndef OVERRIDE_32_sys_munlockall
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_munlockall)
 #endif
-#ifndef OVERRIDE_sys_sched_yield
+#ifndef OVERRIDE_32_sys_sched_yield
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_sched_yield)
 #endif
-#ifndef OVERRIDE_sys_getuid
+#ifndef OVERRIDE_32_sys_getuid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_getuid)
 #endif
-#ifndef OVERRIDE_sys_getgid
+#ifndef OVERRIDE_32_sys_getgid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_getgid)
 #endif
-#ifndef OVERRIDE_sys_geteuid
+#ifndef OVERRIDE_32_sys_geteuid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_geteuid)
 #endif
-#ifndef OVERRIDE_sys_getegid
+#ifndef OVERRIDE_32_sys_getegid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_getegid)
 #endif
-#ifndef OVERRIDE_sys_gettid
+#ifndef OVERRIDE_32_sys_gettid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_gettid)
 #endif
-#ifndef OVERRIDE_sys_inotify_init
+#ifndef OVERRIDE_32_sys_inotify_init
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_inotify_init)
 #endif
-#ifndef OVERRIDE_sys_exit
+#ifndef OVERRIDE_32_sys_exit
 SC_TRACE_EVENT(sys_exit,
        TP_PROTO(int error_code),
        TP_ARGS(error_code),
@@ -85,7 +86,7 @@ SC_TRACE_EVENT(sys_exit,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_close
+#ifndef OVERRIDE_32_sys_close
 SC_TRACE_EVENT(sys_close,
        TP_PROTO(unsigned int fd),
        TP_ARGS(fd),
@@ -94,7 +95,7 @@ SC_TRACE_EVENT(sys_close,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setuid16
+#ifndef OVERRIDE_32_sys_setuid16
 SC_TRACE_EVENT(sys_setuid16,
        TP_PROTO(old_uid_t uid),
        TP_ARGS(uid),
@@ -103,7 +104,7 @@ SC_TRACE_EVENT(sys_setuid16,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_alarm
+#ifndef OVERRIDE_32_sys_alarm
 SC_TRACE_EVENT(sys_alarm,
        TP_PROTO(unsigned int seconds),
        TP_ARGS(seconds),
@@ -112,7 +113,7 @@ SC_TRACE_EVENT(sys_alarm,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_nice
+#ifndef OVERRIDE_32_sys_nice
 SC_TRACE_EVENT(sys_nice,
        TP_PROTO(int increment),
        TP_ARGS(increment),
@@ -121,7 +122,7 @@ SC_TRACE_EVENT(sys_nice,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_dup
+#ifndef OVERRIDE_32_sys_dup
 SC_TRACE_EVENT(sys_dup,
        TP_PROTO(unsigned int fildes),
        TP_ARGS(fildes),
@@ -130,7 +131,7 @@ SC_TRACE_EVENT(sys_dup,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_brk
+#ifndef OVERRIDE_32_sys_brk
 SC_TRACE_EVENT(sys_brk,
        TP_PROTO(unsigned long brk),
        TP_ARGS(brk),
@@ -139,7 +140,7 @@ SC_TRACE_EVENT(sys_brk,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setgid16
+#ifndef OVERRIDE_32_sys_setgid16
 SC_TRACE_EVENT(sys_setgid16,
        TP_PROTO(old_gid_t gid),
        TP_ARGS(gid),
@@ -148,7 +149,7 @@ SC_TRACE_EVENT(sys_setgid16,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_umask
+#ifndef OVERRIDE_32_sys_umask
 SC_TRACE_EVENT(sys_umask,
        TP_PROTO(int mask),
        TP_ARGS(mask),
@@ -157,7 +158,7 @@ SC_TRACE_EVENT(sys_umask,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_ssetmask
+#ifndef OVERRIDE_32_sys_ssetmask
 SC_TRACE_EVENT(sys_ssetmask,
        TP_PROTO(int newmask),
        TP_ARGS(newmask),
@@ -166,7 +167,7 @@ SC_TRACE_EVENT(sys_ssetmask,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_fsync
+#ifndef OVERRIDE_32_sys_fsync
 SC_TRACE_EVENT(sys_fsync,
        TP_PROTO(unsigned int fd),
        TP_ARGS(fd),
@@ -175,7 +176,7 @@ SC_TRACE_EVENT(sys_fsync,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_getpgid
+#ifndef OVERRIDE_32_sys_getpgid
 SC_TRACE_EVENT(sys_getpgid,
        TP_PROTO(pid_t pid),
        TP_ARGS(pid),
@@ -184,7 +185,7 @@ SC_TRACE_EVENT(sys_getpgid,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_fchdir
+#ifndef OVERRIDE_32_sys_fchdir
 SC_TRACE_EVENT(sys_fchdir,
        TP_PROTO(unsigned int fd),
        TP_ARGS(fd),
@@ -193,7 +194,7 @@ SC_TRACE_EVENT(sys_fchdir,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_personality
+#ifndef OVERRIDE_32_sys_personality
 SC_TRACE_EVENT(sys_personality,
        TP_PROTO(unsigned int personality),
        TP_ARGS(personality),
@@ -202,7 +203,7 @@ SC_TRACE_EVENT(sys_personality,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setfsuid16
+#ifndef OVERRIDE_32_sys_setfsuid16
 SC_TRACE_EVENT(sys_setfsuid16,
        TP_PROTO(old_uid_t uid),
        TP_ARGS(uid),
@@ -211,7 +212,7 @@ SC_TRACE_EVENT(sys_setfsuid16,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setfsgid16
+#ifndef OVERRIDE_32_sys_setfsgid16
 SC_TRACE_EVENT(sys_setfsgid16,
        TP_PROTO(old_gid_t gid),
        TP_ARGS(gid),
@@ -220,7 +221,7 @@ SC_TRACE_EVENT(sys_setfsgid16,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_getsid
+#ifndef OVERRIDE_32_sys_getsid
 SC_TRACE_EVENT(sys_getsid,
        TP_PROTO(pid_t pid),
        TP_ARGS(pid),
@@ -229,7 +230,7 @@ SC_TRACE_EVENT(sys_getsid,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_fdatasync
+#ifndef OVERRIDE_32_sys_fdatasync
 SC_TRACE_EVENT(sys_fdatasync,
        TP_PROTO(unsigned int fd),
        TP_ARGS(fd),
@@ -238,7 +239,7 @@ SC_TRACE_EVENT(sys_fdatasync,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_mlockall
+#ifndef OVERRIDE_32_sys_mlockall
 SC_TRACE_EVENT(sys_mlockall,
        TP_PROTO(int flags),
        TP_ARGS(flags),
@@ -247,7 +248,7 @@ SC_TRACE_EVENT(sys_mlockall,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_sched_getscheduler
+#ifndef OVERRIDE_32_sys_sched_getscheduler
 SC_TRACE_EVENT(sys_sched_getscheduler,
        TP_PROTO(pid_t pid),
        TP_ARGS(pid),
@@ -256,7 +257,7 @@ SC_TRACE_EVENT(sys_sched_getscheduler,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_sched_get_priority_max
+#ifndef OVERRIDE_32_sys_sched_get_priority_max
 SC_TRACE_EVENT(sys_sched_get_priority_max,
        TP_PROTO(int policy),
        TP_ARGS(policy),
@@ -265,7 +266,7 @@ SC_TRACE_EVENT(sys_sched_get_priority_max,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_sched_get_priority_min
+#ifndef OVERRIDE_32_sys_sched_get_priority_min
 SC_TRACE_EVENT(sys_sched_get_priority_min,
        TP_PROTO(int policy),
        TP_ARGS(policy),
@@ -274,7 +275,7 @@ SC_TRACE_EVENT(sys_sched_get_priority_min,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setuid
+#ifndef OVERRIDE_32_sys_setuid
 SC_TRACE_EVENT(sys_setuid,
        TP_PROTO(uid_t uid),
        TP_ARGS(uid),
@@ -283,7 +284,7 @@ SC_TRACE_EVENT(sys_setuid,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setgid
+#ifndef OVERRIDE_32_sys_setgid
 SC_TRACE_EVENT(sys_setgid,
        TP_PROTO(gid_t gid),
        TP_ARGS(gid),
@@ -292,7 +293,7 @@ SC_TRACE_EVENT(sys_setgid,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setfsuid
+#ifndef OVERRIDE_32_sys_setfsuid
 SC_TRACE_EVENT(sys_setfsuid,
        TP_PROTO(uid_t uid),
        TP_ARGS(uid),
@@ -301,7 +302,7 @@ SC_TRACE_EVENT(sys_setfsuid,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setfsgid
+#ifndef OVERRIDE_32_sys_setfsgid
 SC_TRACE_EVENT(sys_setfsgid,
        TP_PROTO(gid_t gid),
        TP_ARGS(gid),
@@ -310,7 +311,7 @@ SC_TRACE_EVENT(sys_setfsgid,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_io_destroy
+#ifndef OVERRIDE_32_sys_io_destroy
 SC_TRACE_EVENT(sys_io_destroy,
        TP_PROTO(aio_context_t ctx),
        TP_ARGS(ctx),
@@ -319,7 +320,7 @@ SC_TRACE_EVENT(sys_io_destroy,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_exit_group
+#ifndef OVERRIDE_32_sys_exit_group
 SC_TRACE_EVENT(sys_exit_group,
        TP_PROTO(int error_code),
        TP_ARGS(error_code),
@@ -328,7 +329,7 @@ SC_TRACE_EVENT(sys_exit_group,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_epoll_create
+#ifndef OVERRIDE_32_sys_epoll_create
 SC_TRACE_EVENT(sys_epoll_create,
        TP_PROTO(int size),
        TP_ARGS(size),
@@ -337,7 +338,7 @@ SC_TRACE_EVENT(sys_epoll_create,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_timer_getoverrun
+#ifndef OVERRIDE_32_sys_timer_getoverrun
 SC_TRACE_EVENT(sys_timer_getoverrun,
        TP_PROTO(timer_t timer_id),
        TP_ARGS(timer_id),
@@ -346,7 +347,7 @@ SC_TRACE_EVENT(sys_timer_getoverrun,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_timer_delete
+#ifndef OVERRIDE_32_sys_timer_delete
 SC_TRACE_EVENT(sys_timer_delete,
        TP_PROTO(timer_t timer_id),
        TP_ARGS(timer_id),
@@ -355,7 +356,7 @@ SC_TRACE_EVENT(sys_timer_delete,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_unshare
+#ifndef OVERRIDE_32_sys_unshare
 SC_TRACE_EVENT(sys_unshare,
        TP_PROTO(unsigned long unshare_flags),
        TP_ARGS(unshare_flags),
@@ -364,7 +365,7 @@ SC_TRACE_EVENT(sys_unshare,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_eventfd
+#ifndef OVERRIDE_32_sys_eventfd
 SC_TRACE_EVENT(sys_eventfd,
        TP_PROTO(unsigned int count),
        TP_ARGS(count),
@@ -373,7 +374,7 @@ SC_TRACE_EVENT(sys_eventfd,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_epoll_create1
+#ifndef OVERRIDE_32_sys_epoll_create1
 SC_TRACE_EVENT(sys_epoll_create1,
        TP_PROTO(int flags),
        TP_ARGS(flags),
@@ -382,7 +383,7 @@ SC_TRACE_EVENT(sys_epoll_create1,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_inotify_init1
+#ifndef OVERRIDE_32_sys_inotify_init1
 SC_TRACE_EVENT(sys_inotify_init1,
        TP_PROTO(int flags),
        TP_ARGS(flags),
@@ -391,7 +392,7 @@ SC_TRACE_EVENT(sys_inotify_init1,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_syncfs
+#ifndef OVERRIDE_32_sys_syncfs
 SC_TRACE_EVENT(sys_syncfs,
        TP_PROTO(int fd),
        TP_ARGS(fd),
@@ -400,7 +401,7 @@ SC_TRACE_EVENT(sys_syncfs,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_kill
+#ifndef OVERRIDE_32_sys_kill
 SC_TRACE_EVENT(sys_kill,
        TP_PROTO(pid_t pid, int sig),
        TP_ARGS(pid, sig),
@@ -409,7 +410,7 @@ SC_TRACE_EVENT(sys_kill,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_signal
+#ifndef OVERRIDE_32_sys_signal
 SC_TRACE_EVENT(sys_signal,
        TP_PROTO(int sig, __sighandler_t handler),
        TP_ARGS(sig, handler),
@@ -418,7 +419,7 @@ SC_TRACE_EVENT(sys_signal,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setpgid
+#ifndef OVERRIDE_32_sys_setpgid
 SC_TRACE_EVENT(sys_setpgid,
        TP_PROTO(pid_t pid, pid_t pgid),
        TP_ARGS(pid, pgid),
@@ -427,7 +428,7 @@ SC_TRACE_EVENT(sys_setpgid,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_dup2
+#ifndef OVERRIDE_32_sys_dup2
 SC_TRACE_EVENT(sys_dup2,
        TP_PROTO(unsigned int oldfd, unsigned int newfd),
        TP_ARGS(oldfd, newfd),
@@ -436,7 +437,7 @@ SC_TRACE_EVENT(sys_dup2,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setreuid16
+#ifndef OVERRIDE_32_sys_setreuid16
 SC_TRACE_EVENT(sys_setreuid16,
        TP_PROTO(old_uid_t ruid, old_uid_t euid),
        TP_ARGS(ruid, euid),
@@ -445,7 +446,7 @@ SC_TRACE_EVENT(sys_setreuid16,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setregid16
+#ifndef OVERRIDE_32_sys_setregid16
 SC_TRACE_EVENT(sys_setregid16,
        TP_PROTO(old_gid_t rgid, old_gid_t egid),
        TP_ARGS(rgid, egid),
@@ -454,7 +455,7 @@ SC_TRACE_EVENT(sys_setregid16,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_munmap
+#ifndef OVERRIDE_32_sys_munmap
 SC_TRACE_EVENT(sys_munmap,
        TP_PROTO(unsigned long addr, size_t len),
        TP_ARGS(addr, len),
@@ -463,7 +464,7 @@ SC_TRACE_EVENT(sys_munmap,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_ftruncate
+#ifndef OVERRIDE_32_sys_ftruncate
 SC_TRACE_EVENT(sys_ftruncate,
        TP_PROTO(unsigned int fd, unsigned long length),
        TP_ARGS(fd, length),
@@ -472,7 +473,7 @@ SC_TRACE_EVENT(sys_ftruncate,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_fchmod
+#ifndef OVERRIDE_32_sys_fchmod
 SC_TRACE_EVENT(sys_fchmod,
        TP_PROTO(unsigned int fd, mode_t mode),
        TP_ARGS(fd, mode),
@@ -481,7 +482,7 @@ SC_TRACE_EVENT(sys_fchmod,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_getpriority
+#ifndef OVERRIDE_32_sys_getpriority
 SC_TRACE_EVENT(sys_getpriority,
        TP_PROTO(int which, int who),
        TP_ARGS(which, who),
@@ -490,7 +491,7 @@ SC_TRACE_EVENT(sys_getpriority,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_bdflush
+#ifndef OVERRIDE_32_sys_bdflush
 SC_TRACE_EVENT(sys_bdflush,
        TP_PROTO(int func, long data),
        TP_ARGS(func, data),
@@ -499,7 +500,7 @@ SC_TRACE_EVENT(sys_bdflush,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_flock
+#ifndef OVERRIDE_32_sys_flock
 SC_TRACE_EVENT(sys_flock,
        TP_PROTO(unsigned int fd, unsigned int cmd),
        TP_ARGS(fd, cmd),
@@ -508,7 +509,7 @@ SC_TRACE_EVENT(sys_flock,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_mlock
+#ifndef OVERRIDE_32_sys_mlock
 SC_TRACE_EVENT(sys_mlock,
        TP_PROTO(unsigned long start, size_t len),
        TP_ARGS(start, len),
@@ -517,7 +518,7 @@ SC_TRACE_EVENT(sys_mlock,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_munlock
+#ifndef OVERRIDE_32_sys_munlock
 SC_TRACE_EVENT(sys_munlock,
        TP_PROTO(unsigned long start, size_t len),
        TP_ARGS(start, len),
@@ -526,7 +527,7 @@ SC_TRACE_EVENT(sys_munlock,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setreuid
+#ifndef OVERRIDE_32_sys_setreuid
 SC_TRACE_EVENT(sys_setreuid,
        TP_PROTO(uid_t ruid, uid_t euid),
        TP_ARGS(ruid, euid),
@@ -535,7 +536,7 @@ SC_TRACE_EVENT(sys_setreuid,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setregid
+#ifndef OVERRIDE_32_sys_setregid
 SC_TRACE_EVENT(sys_setregid,
        TP_PROTO(gid_t rgid, gid_t egid),
        TP_ARGS(rgid, egid),
@@ -544,7 +545,7 @@ SC_TRACE_EVENT(sys_setregid,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_tkill
+#ifndef OVERRIDE_32_sys_tkill
 SC_TRACE_EVENT(sys_tkill,
        TP_PROTO(pid_t pid, int sig),
        TP_ARGS(pid, sig),
@@ -553,7 +554,7 @@ SC_TRACE_EVENT(sys_tkill,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_ioprio_get
+#ifndef OVERRIDE_32_sys_ioprio_get
 SC_TRACE_EVENT(sys_ioprio_get,
        TP_PROTO(int which, int who),
        TP_ARGS(which, who),
@@ -562,7 +563,7 @@ SC_TRACE_EVENT(sys_ioprio_get,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_inotify_rm_watch
+#ifndef OVERRIDE_32_sys_inotify_rm_watch
 SC_TRACE_EVENT(sys_inotify_rm_watch,
        TP_PROTO(int fd, __s32 wd),
        TP_ARGS(fd, wd),
@@ -571,7 +572,7 @@ SC_TRACE_EVENT(sys_inotify_rm_watch,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_timerfd_create
+#ifndef OVERRIDE_32_sys_timerfd_create
 SC_TRACE_EVENT(sys_timerfd_create,
        TP_PROTO(int clockid, int flags),
        TP_ARGS(clockid, flags),
@@ -580,7 +581,7 @@ SC_TRACE_EVENT(sys_timerfd_create,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_eventfd2
+#ifndef OVERRIDE_32_sys_eventfd2
 SC_TRACE_EVENT(sys_eventfd2,
        TP_PROTO(unsigned int count, int flags),
        TP_ARGS(count, flags),
@@ -589,7 +590,7 @@ SC_TRACE_EVENT(sys_eventfd2,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_fanotify_init
+#ifndef OVERRIDE_32_sys_fanotify_init
 SC_TRACE_EVENT(sys_fanotify_init,
        TP_PROTO(unsigned int flags, unsigned int event_f_flags),
        TP_ARGS(flags, event_f_flags),
@@ -598,7 +599,7 @@ SC_TRACE_EVENT(sys_fanotify_init,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setns
+#ifndef OVERRIDE_32_sys_setns
 SC_TRACE_EVENT(sys_setns,
        TP_PROTO(int fd, int nstype),
        TP_ARGS(fd, nstype),
@@ -607,7 +608,7 @@ SC_TRACE_EVENT(sys_setns,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_lseek
+#ifndef OVERRIDE_32_sys_lseek
 SC_TRACE_EVENT(sys_lseek,
        TP_PROTO(unsigned int fd, off_t offset, unsigned int origin),
        TP_ARGS(fd, offset, origin),
@@ -616,7 +617,7 @@ SC_TRACE_EVENT(sys_lseek,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_ioctl
+#ifndef OVERRIDE_32_sys_ioctl
 SC_TRACE_EVENT(sys_ioctl,
        TP_PROTO(unsigned int fd, unsigned int cmd, unsigned long arg),
        TP_ARGS(fd, cmd, arg),
@@ -625,7 +626,7 @@ SC_TRACE_EVENT(sys_ioctl,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_fcntl
+#ifndef OVERRIDE_32_sys_fcntl
 SC_TRACE_EVENT(sys_fcntl,
        TP_PROTO(unsigned int fd, unsigned int cmd, unsigned long arg),
        TP_ARGS(fd, cmd, arg),
@@ -634,7 +635,7 @@ SC_TRACE_EVENT(sys_fcntl,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_fchown16
+#ifndef OVERRIDE_32_sys_fchown16
 SC_TRACE_EVENT(sys_fchown16,
        TP_PROTO(unsigned int fd, old_uid_t user, old_gid_t group),
        TP_ARGS(fd, user, group),
@@ -643,7 +644,7 @@ SC_TRACE_EVENT(sys_fchown16,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setpriority
+#ifndef OVERRIDE_32_sys_setpriority
 SC_TRACE_EVENT(sys_setpriority,
        TP_PROTO(int which, int who, int niceval),
        TP_ARGS(which, who, niceval),
@@ -652,7 +653,7 @@ SC_TRACE_EVENT(sys_setpriority,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_mprotect
+#ifndef OVERRIDE_32_sys_mprotect
 SC_TRACE_EVENT(sys_mprotect,
        TP_PROTO(unsigned long start, size_t len, unsigned long prot),
        TP_ARGS(start, len, prot),
@@ -661,7 +662,7 @@ SC_TRACE_EVENT(sys_mprotect,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_sysfs
+#ifndef OVERRIDE_32_sys_sysfs
 SC_TRACE_EVENT(sys_sysfs,
        TP_PROTO(int option, unsigned long arg1, unsigned long arg2),
        TP_ARGS(option, arg1, arg2),
@@ -670,7 +671,7 @@ SC_TRACE_EVENT(sys_sysfs,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_msync
+#ifndef OVERRIDE_32_sys_msync
 SC_TRACE_EVENT(sys_msync,
        TP_PROTO(unsigned long start, size_t len, int flags),
        TP_ARGS(start, len, flags),
@@ -679,7 +680,7 @@ SC_TRACE_EVENT(sys_msync,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setresuid16
+#ifndef OVERRIDE_32_sys_setresuid16
 SC_TRACE_EVENT(sys_setresuid16,
        TP_PROTO(old_uid_t ruid, old_uid_t euid, old_uid_t suid),
        TP_ARGS(ruid, euid, suid),
@@ -688,7 +689,7 @@ SC_TRACE_EVENT(sys_setresuid16,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setresgid16
+#ifndef OVERRIDE_32_sys_setresgid16
 SC_TRACE_EVENT(sys_setresgid16,
        TP_PROTO(old_gid_t rgid, old_gid_t egid, old_gid_t sgid),
        TP_ARGS(rgid, egid, sgid),
@@ -697,7 +698,7 @@ SC_TRACE_EVENT(sys_setresgid16,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_fchown
+#ifndef OVERRIDE_32_sys_fchown
 SC_TRACE_EVENT(sys_fchown,
        TP_PROTO(unsigned int fd, uid_t user, gid_t group),
        TP_ARGS(fd, user, group),
@@ -706,7 +707,7 @@ SC_TRACE_EVENT(sys_fchown,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setresuid
+#ifndef OVERRIDE_32_sys_setresuid
 SC_TRACE_EVENT(sys_setresuid,
        TP_PROTO(uid_t ruid, uid_t euid, uid_t suid),
        TP_ARGS(ruid, euid, suid),
@@ -715,7 +716,7 @@ SC_TRACE_EVENT(sys_setresuid,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setresgid
+#ifndef OVERRIDE_32_sys_setresgid
 SC_TRACE_EVENT(sys_setresgid,
        TP_PROTO(gid_t rgid, gid_t egid, gid_t sgid),
        TP_ARGS(rgid, egid, sgid),
@@ -724,7 +725,7 @@ SC_TRACE_EVENT(sys_setresgid,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_madvise
+#ifndef OVERRIDE_32_sys_madvise
 SC_TRACE_EVENT(sys_madvise,
        TP_PROTO(unsigned long start, size_t len_in, int behavior),
        TP_ARGS(start, len_in, behavior),
@@ -733,7 +734,7 @@ SC_TRACE_EVENT(sys_madvise,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_fcntl64
+#ifndef OVERRIDE_32_sys_fcntl64
 SC_TRACE_EVENT(sys_fcntl64,
        TP_PROTO(unsigned int fd, unsigned int cmd, unsigned long arg),
        TP_ARGS(fd, cmd, arg),
@@ -742,7 +743,7 @@ SC_TRACE_EVENT(sys_fcntl64,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_tgkill
+#ifndef OVERRIDE_32_sys_tgkill
 SC_TRACE_EVENT(sys_tgkill,
        TP_PROTO(pid_t tgid, pid_t pid, int sig),
        TP_ARGS(tgid, pid, sig),
@@ -751,7 +752,7 @@ SC_TRACE_EVENT(sys_tgkill,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_ioprio_set
+#ifndef OVERRIDE_32_sys_ioprio_set
 SC_TRACE_EVENT(sys_ioprio_set,
        TP_PROTO(int which, int who, int ioprio),
        TP_ARGS(which, who, ioprio),
@@ -760,7 +761,7 @@ SC_TRACE_EVENT(sys_ioprio_set,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_dup3
+#ifndef OVERRIDE_32_sys_dup3
 SC_TRACE_EVENT(sys_dup3,
        TP_PROTO(unsigned int oldfd, unsigned int newfd, int flags),
        TP_ARGS(oldfd, newfd, flags),
@@ -769,7 +770,7 @@ SC_TRACE_EVENT(sys_dup3,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_ptrace
+#ifndef OVERRIDE_32_sys_ptrace
 SC_TRACE_EVENT(sys_ptrace,
        TP_PROTO(long request, long pid, unsigned long addr, unsigned long data),
        TP_ARGS(request, pid, addr, data),
@@ -778,7 +779,7 @@ SC_TRACE_EVENT(sys_ptrace,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_tee
+#ifndef OVERRIDE_32_sys_tee
 SC_TRACE_EVENT(sys_tee,
        TP_PROTO(int fdin, int fdout, size_t len, unsigned int flags),
        TP_ARGS(fdin, fdout, len, flags),
@@ -787,7 +788,7 @@ SC_TRACE_EVENT(sys_tee,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_mremap
+#ifndef OVERRIDE_32_sys_mremap
 SC_TRACE_EVENT(sys_mremap,
        TP_PROTO(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr),
        TP_ARGS(addr, old_len, new_len, flags, new_addr),
@@ -796,7 +797,7 @@ SC_TRACE_EVENT(sys_mremap,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_prctl
+#ifndef OVERRIDE_32_sys_prctl
 SC_TRACE_EVENT(sys_prctl,
        TP_PROTO(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5),
        TP_ARGS(option, arg2, arg3, arg4, arg5),
@@ -805,7 +806,7 @@ SC_TRACE_EVENT(sys_prctl,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_remap_file_pages
+#ifndef OVERRIDE_32_sys_remap_file_pages
 SC_TRACE_EVENT(sys_remap_file_pages,
        TP_PROTO(unsigned long start, unsigned long size, unsigned long prot, unsigned long pgoff, unsigned long flags),
        TP_ARGS(start, size, prot, pgoff, flags),
@@ -814,7 +815,7 @@ SC_TRACE_EVENT(sys_remap_file_pages,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_keyctl
+#ifndef OVERRIDE_32_sys_keyctl
 SC_TRACE_EVENT(sys_keyctl,
        TP_PROTO(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5),
        TP_ARGS(option, arg2, arg3, arg4, arg5),
@@ -823,7 +824,7 @@ SC_TRACE_EVENT(sys_keyctl,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_mmap_pgoff
+#ifndef OVERRIDE_32_sys_mmap_pgoff
 SC_TRACE_EVENT(sys_mmap_pgoff,
        TP_PROTO(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long pgoff),
        TP_ARGS(addr, len, prot, flags, fd, pgoff),
@@ -841,320 +842,321 @@ SC_TRACE_EVENT(sys_mmap_pgoff,
 #else /* CREATE_SYSCALL_TABLE */
 
 #include "x86-32-syscalls-3.1.0-rc6_integers_override.h"
+#include "syscalls_integers_override.h"
 
-#ifndef OVERRIDE_TABLE_sys_restart_syscall
+#ifndef OVERRIDE_TABLE_32_sys_restart_syscall
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_restart_syscall, 0, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_getpid
+#ifndef OVERRIDE_TABLE_32_sys_getpid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_getpid, 20, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_getuid16
+#ifndef OVERRIDE_TABLE_32_sys_getuid16
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_getuid16, 24, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_pause
+#ifndef OVERRIDE_TABLE_32_sys_pause
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_pause, 29, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_sync
+#ifndef OVERRIDE_TABLE_32_sys_sync
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_sync, 36, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_getgid16
+#ifndef OVERRIDE_TABLE_32_sys_getgid16
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_getgid16, 47, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_geteuid16
+#ifndef OVERRIDE_TABLE_32_sys_geteuid16
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_geteuid16, 49, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_getegid16
+#ifndef OVERRIDE_TABLE_32_sys_getegid16
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_getegid16, 50, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_getppid
+#ifndef OVERRIDE_TABLE_32_sys_getppid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_getppid, 64, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_getpgrp
+#ifndef OVERRIDE_TABLE_32_sys_getpgrp
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_getpgrp, 65, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setsid
+#ifndef OVERRIDE_TABLE_32_sys_setsid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_setsid, 66, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_sgetmask
+#ifndef OVERRIDE_TABLE_32_sys_sgetmask
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_sgetmask, 68, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_vhangup
+#ifndef OVERRIDE_TABLE_32_sys_vhangup
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_vhangup, 111, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_munlockall
+#ifndef OVERRIDE_TABLE_32_sys_munlockall
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_munlockall, 153, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_sched_yield
+#ifndef OVERRIDE_TABLE_32_sys_sched_yield
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_sched_yield, 158, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_getuid
+#ifndef OVERRIDE_TABLE_32_sys_getuid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_getuid, 199, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_getgid
+#ifndef OVERRIDE_TABLE_32_sys_getgid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_getgid, 200, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_geteuid
+#ifndef OVERRIDE_TABLE_32_sys_geteuid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_geteuid, 201, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_getegid
+#ifndef OVERRIDE_TABLE_32_sys_getegid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_getegid, 202, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_gettid
+#ifndef OVERRIDE_TABLE_32_sys_gettid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_gettid, 224, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_inotify_init
+#ifndef OVERRIDE_TABLE_32_sys_inotify_init
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_inotify_init, 291, 0)
 #endif
-#ifndef OVERRIDE_TABLE_sys_exit
+#ifndef OVERRIDE_TABLE_32_sys_exit
 TRACE_SYSCALL_TABLE(sys_exit, sys_exit, 1, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_close
+#ifndef OVERRIDE_TABLE_32_sys_close
 TRACE_SYSCALL_TABLE(sys_close, sys_close, 6, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_lseek
+#ifndef OVERRIDE_TABLE_32_sys_lseek
 TRACE_SYSCALL_TABLE(sys_lseek, sys_lseek, 19, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setuid16
+#ifndef OVERRIDE_TABLE_32_sys_setuid16
 TRACE_SYSCALL_TABLE(sys_setuid16, sys_setuid16, 23, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_ptrace
+#ifndef OVERRIDE_TABLE_32_sys_ptrace
 TRACE_SYSCALL_TABLE(sys_ptrace, sys_ptrace, 26, 4)
 #endif
-#ifndef OVERRIDE_TABLE_sys_alarm
+#ifndef OVERRIDE_TABLE_32_sys_alarm
 TRACE_SYSCALL_TABLE(sys_alarm, sys_alarm, 27, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_nice
+#ifndef OVERRIDE_TABLE_32_sys_nice
 TRACE_SYSCALL_TABLE(sys_nice, sys_nice, 34, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_kill
+#ifndef OVERRIDE_TABLE_32_sys_kill
 TRACE_SYSCALL_TABLE(sys_kill, sys_kill, 37, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_dup
+#ifndef OVERRIDE_TABLE_32_sys_dup
 TRACE_SYSCALL_TABLE(sys_dup, sys_dup, 41, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_brk
+#ifndef OVERRIDE_TABLE_32_sys_brk
 TRACE_SYSCALL_TABLE(sys_brk, sys_brk, 45, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setgid16
+#ifndef OVERRIDE_TABLE_32_sys_setgid16
 TRACE_SYSCALL_TABLE(sys_setgid16, sys_setgid16, 46, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_signal
+#ifndef OVERRIDE_TABLE_32_sys_signal
 TRACE_SYSCALL_TABLE(sys_signal, sys_signal, 48, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_ioctl
+#ifndef OVERRIDE_TABLE_32_sys_ioctl
 TRACE_SYSCALL_TABLE(sys_ioctl, sys_ioctl, 54, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_fcntl
+#ifndef OVERRIDE_TABLE_32_sys_fcntl
 TRACE_SYSCALL_TABLE(sys_fcntl, sys_fcntl, 55, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setpgid
+#ifndef OVERRIDE_TABLE_32_sys_setpgid
 TRACE_SYSCALL_TABLE(sys_setpgid, sys_setpgid, 57, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_umask
+#ifndef OVERRIDE_TABLE_32_sys_umask
 TRACE_SYSCALL_TABLE(sys_umask, sys_umask, 60, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_dup2
+#ifndef OVERRIDE_TABLE_32_sys_dup2
 TRACE_SYSCALL_TABLE(sys_dup2, sys_dup2, 63, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_ssetmask
+#ifndef OVERRIDE_TABLE_32_sys_ssetmask
 TRACE_SYSCALL_TABLE(sys_ssetmask, sys_ssetmask, 69, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setreuid16
+#ifndef OVERRIDE_TABLE_32_sys_setreuid16
 TRACE_SYSCALL_TABLE(sys_setreuid16, sys_setreuid16, 70, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setregid16
+#ifndef OVERRIDE_TABLE_32_sys_setregid16
 TRACE_SYSCALL_TABLE(sys_setregid16, sys_setregid16, 71, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_munmap
+#ifndef OVERRIDE_TABLE_32_sys_munmap
 TRACE_SYSCALL_TABLE(sys_munmap, sys_munmap, 91, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_ftruncate
+#ifndef OVERRIDE_TABLE_32_sys_ftruncate
 TRACE_SYSCALL_TABLE(sys_ftruncate, sys_ftruncate, 93, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_fchmod
+#ifndef OVERRIDE_TABLE_32_sys_fchmod
 TRACE_SYSCALL_TABLE(sys_fchmod, sys_fchmod, 94, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_fchown16
+#ifndef OVERRIDE_TABLE_32_sys_fchown16
 TRACE_SYSCALL_TABLE(sys_fchown16, sys_fchown16, 95, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_getpriority
+#ifndef OVERRIDE_TABLE_32_sys_getpriority
 TRACE_SYSCALL_TABLE(sys_getpriority, sys_getpriority, 96, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setpriority
+#ifndef OVERRIDE_TABLE_32_sys_setpriority
 TRACE_SYSCALL_TABLE(sys_setpriority, sys_setpriority, 97, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_fsync
+#ifndef OVERRIDE_TABLE_32_sys_fsync
 TRACE_SYSCALL_TABLE(sys_fsync, sys_fsync, 118, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_mprotect
+#ifndef OVERRIDE_TABLE_32_sys_mprotect
 TRACE_SYSCALL_TABLE(sys_mprotect, sys_mprotect, 125, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_getpgid
+#ifndef OVERRIDE_TABLE_32_sys_getpgid
 TRACE_SYSCALL_TABLE(sys_getpgid, sys_getpgid, 132, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_fchdir
+#ifndef OVERRIDE_TABLE_32_sys_fchdir
 TRACE_SYSCALL_TABLE(sys_fchdir, sys_fchdir, 133, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_bdflush
+#ifndef OVERRIDE_TABLE_32_sys_bdflush
 TRACE_SYSCALL_TABLE(sys_bdflush, sys_bdflush, 134, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_sysfs
+#ifndef OVERRIDE_TABLE_32_sys_sysfs
 TRACE_SYSCALL_TABLE(sys_sysfs, sys_sysfs, 135, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_personality
+#ifndef OVERRIDE_TABLE_32_sys_personality
 TRACE_SYSCALL_TABLE(sys_personality, sys_personality, 136, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setfsuid16
+#ifndef OVERRIDE_TABLE_32_sys_setfsuid16
 TRACE_SYSCALL_TABLE(sys_setfsuid16, sys_setfsuid16, 138, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setfsgid16
+#ifndef OVERRIDE_TABLE_32_sys_setfsgid16
 TRACE_SYSCALL_TABLE(sys_setfsgid16, sys_setfsgid16, 139, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_flock
+#ifndef OVERRIDE_TABLE_32_sys_flock
 TRACE_SYSCALL_TABLE(sys_flock, sys_flock, 143, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_msync
+#ifndef OVERRIDE_TABLE_32_sys_msync
 TRACE_SYSCALL_TABLE(sys_msync, sys_msync, 144, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_getsid
+#ifndef OVERRIDE_TABLE_32_sys_getsid
 TRACE_SYSCALL_TABLE(sys_getsid, sys_getsid, 147, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_fdatasync
+#ifndef OVERRIDE_TABLE_32_sys_fdatasync
 TRACE_SYSCALL_TABLE(sys_fdatasync, sys_fdatasync, 148, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_mlock
+#ifndef OVERRIDE_TABLE_32_sys_mlock
 TRACE_SYSCALL_TABLE(sys_mlock, sys_mlock, 150, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_munlock
+#ifndef OVERRIDE_TABLE_32_sys_munlock
 TRACE_SYSCALL_TABLE(sys_munlock, sys_munlock, 151, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_mlockall
+#ifndef OVERRIDE_TABLE_32_sys_mlockall
 TRACE_SYSCALL_TABLE(sys_mlockall, sys_mlockall, 152, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_sched_getscheduler
+#ifndef OVERRIDE_TABLE_32_sys_sched_getscheduler
 TRACE_SYSCALL_TABLE(sys_sched_getscheduler, sys_sched_getscheduler, 157, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_sched_get_priority_max
+#ifndef OVERRIDE_TABLE_32_sys_sched_get_priority_max
 TRACE_SYSCALL_TABLE(sys_sched_get_priority_max, sys_sched_get_priority_max, 159, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_sched_get_priority_min
+#ifndef OVERRIDE_TABLE_32_sys_sched_get_priority_min
 TRACE_SYSCALL_TABLE(sys_sched_get_priority_min, sys_sched_get_priority_min, 160, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_mremap
+#ifndef OVERRIDE_TABLE_32_sys_mremap
 TRACE_SYSCALL_TABLE(sys_mremap, sys_mremap, 163, 5)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setresuid16
+#ifndef OVERRIDE_TABLE_32_sys_setresuid16
 TRACE_SYSCALL_TABLE(sys_setresuid16, sys_setresuid16, 164, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setresgid16
+#ifndef OVERRIDE_TABLE_32_sys_setresgid16
 TRACE_SYSCALL_TABLE(sys_setresgid16, sys_setresgid16, 170, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_prctl
+#ifndef OVERRIDE_TABLE_32_sys_prctl
 TRACE_SYSCALL_TABLE(sys_prctl, sys_prctl, 172, 5)
 #endif
-#ifndef OVERRIDE_TABLE_sys_mmap_pgoff
+#ifndef OVERRIDE_TABLE_32_sys_mmap_pgoff
 TRACE_SYSCALL_TABLE(sys_mmap_pgoff, sys_mmap_pgoff, 192, 6)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setreuid
+#ifndef OVERRIDE_TABLE_32_sys_setreuid
 TRACE_SYSCALL_TABLE(sys_setreuid, sys_setreuid, 203, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setregid
+#ifndef OVERRIDE_TABLE_32_sys_setregid
 TRACE_SYSCALL_TABLE(sys_setregid, sys_setregid, 204, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_fchown
+#ifndef OVERRIDE_TABLE_32_sys_fchown
 TRACE_SYSCALL_TABLE(sys_fchown, sys_fchown, 207, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setresuid
+#ifndef OVERRIDE_TABLE_32_sys_setresuid
 TRACE_SYSCALL_TABLE(sys_setresuid, sys_setresuid, 208, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setresgid
+#ifndef OVERRIDE_TABLE_32_sys_setresgid
 TRACE_SYSCALL_TABLE(sys_setresgid, sys_setresgid, 210, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setuid
+#ifndef OVERRIDE_TABLE_32_sys_setuid
 TRACE_SYSCALL_TABLE(sys_setuid, sys_setuid, 213, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setgid
+#ifndef OVERRIDE_TABLE_32_sys_setgid
 TRACE_SYSCALL_TABLE(sys_setgid, sys_setgid, 214, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setfsuid
+#ifndef OVERRIDE_TABLE_32_sys_setfsuid
 TRACE_SYSCALL_TABLE(sys_setfsuid, sys_setfsuid, 215, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setfsgid
+#ifndef OVERRIDE_TABLE_32_sys_setfsgid
 TRACE_SYSCALL_TABLE(sys_setfsgid, sys_setfsgid, 216, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_madvise
+#ifndef OVERRIDE_TABLE_32_sys_madvise
 TRACE_SYSCALL_TABLE(sys_madvise, sys_madvise, 219, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_fcntl64
+#ifndef OVERRIDE_TABLE_32_sys_fcntl64
 TRACE_SYSCALL_TABLE(sys_fcntl64, sys_fcntl64, 221, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_tkill
+#ifndef OVERRIDE_TABLE_32_sys_tkill
 TRACE_SYSCALL_TABLE(sys_tkill, sys_tkill, 238, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_io_destroy
+#ifndef OVERRIDE_TABLE_32_sys_io_destroy
 TRACE_SYSCALL_TABLE(sys_io_destroy, sys_io_destroy, 246, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_exit_group
+#ifndef OVERRIDE_TABLE_32_sys_exit_group
 TRACE_SYSCALL_TABLE(sys_exit_group, sys_exit_group, 252, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_epoll_create
+#ifndef OVERRIDE_TABLE_32_sys_epoll_create
 TRACE_SYSCALL_TABLE(sys_epoll_create, sys_epoll_create, 254, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_remap_file_pages
+#ifndef OVERRIDE_TABLE_32_sys_remap_file_pages
 TRACE_SYSCALL_TABLE(sys_remap_file_pages, sys_remap_file_pages, 257, 5)
 #endif
-#ifndef OVERRIDE_TABLE_sys_timer_getoverrun
+#ifndef OVERRIDE_TABLE_32_sys_timer_getoverrun
 TRACE_SYSCALL_TABLE(sys_timer_getoverrun, sys_timer_getoverrun, 262, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_timer_delete
+#ifndef OVERRIDE_TABLE_32_sys_timer_delete
 TRACE_SYSCALL_TABLE(sys_timer_delete, sys_timer_delete, 263, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_tgkill
+#ifndef OVERRIDE_TABLE_32_sys_tgkill
 TRACE_SYSCALL_TABLE(sys_tgkill, sys_tgkill, 270, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_keyctl
+#ifndef OVERRIDE_TABLE_32_sys_keyctl
 TRACE_SYSCALL_TABLE(sys_keyctl, sys_keyctl, 288, 5)
 #endif
-#ifndef OVERRIDE_TABLE_sys_ioprio_set
+#ifndef OVERRIDE_TABLE_32_sys_ioprio_set
 TRACE_SYSCALL_TABLE(sys_ioprio_set, sys_ioprio_set, 289, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_ioprio_get
+#ifndef OVERRIDE_TABLE_32_sys_ioprio_get
 TRACE_SYSCALL_TABLE(sys_ioprio_get, sys_ioprio_get, 290, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_inotify_rm_watch
+#ifndef OVERRIDE_TABLE_32_sys_inotify_rm_watch
 TRACE_SYSCALL_TABLE(sys_inotify_rm_watch, sys_inotify_rm_watch, 293, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_unshare
+#ifndef OVERRIDE_TABLE_32_sys_unshare
 TRACE_SYSCALL_TABLE(sys_unshare, sys_unshare, 310, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_tee
+#ifndef OVERRIDE_TABLE_32_sys_tee
 TRACE_SYSCALL_TABLE(sys_tee, sys_tee, 315, 4)
 #endif
-#ifndef OVERRIDE_TABLE_sys_timerfd_create
+#ifndef OVERRIDE_TABLE_32_sys_timerfd_create
 TRACE_SYSCALL_TABLE(sys_timerfd_create, sys_timerfd_create, 322, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_eventfd
+#ifndef OVERRIDE_TABLE_32_sys_eventfd
 TRACE_SYSCALL_TABLE(sys_eventfd, sys_eventfd, 323, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_eventfd2
+#ifndef OVERRIDE_TABLE_32_sys_eventfd2
 TRACE_SYSCALL_TABLE(sys_eventfd2, sys_eventfd2, 328, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_epoll_create1
+#ifndef OVERRIDE_TABLE_32_sys_epoll_create1
 TRACE_SYSCALL_TABLE(sys_epoll_create1, sys_epoll_create1, 329, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_dup3
+#ifndef OVERRIDE_TABLE_32_sys_dup3
 TRACE_SYSCALL_TABLE(sys_dup3, sys_dup3, 330, 3)
 #endif
-#ifndef OVERRIDE_TABLE_sys_inotify_init1
+#ifndef OVERRIDE_TABLE_32_sys_inotify_init1
 TRACE_SYSCALL_TABLE(sys_inotify_init1, sys_inotify_init1, 332, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_fanotify_init
+#ifndef OVERRIDE_TABLE_32_sys_fanotify_init
 TRACE_SYSCALL_TABLE(sys_fanotify_init, sys_fanotify_init, 338, 2)
 #endif
-#ifndef OVERRIDE_TABLE_sys_syncfs
+#ifndef OVERRIDE_TABLE_32_sys_syncfs
 TRACE_SYSCALL_TABLE(sys_syncfs, sys_syncfs, 344, 1)
 #endif
-#ifndef OVERRIDE_TABLE_sys_setns
+#ifndef OVERRIDE_TABLE_32_sys_setns
 TRACE_SYSCALL_TABLE(sys_setns, sys_setns, 346, 2)
 #endif