X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fsyscalls%2Fheaders%2Fx86-64-syscalls-3.0.4_integers.h;h=6d0dbb90807f7ee9747af018d7cdd0ea7485021f;hb=fa73137a9984cd453fe895cca204f9d73291c1b2;hp=5752f763cf597f67f9923d2b8f65833ca312982f;hpb=a93244f8421385c560a70d0308a69e7c9289916e;p=lttng-modules.git

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 5752f763..6d0dbb90 100644
--- a/instrumentation/syscalls/headers/x86-64-syscalls-3.0.4_integers.h
+++ b/instrumentation/syscalls/headers/x86-64-syscalls-3.0.4_integers.h
@@ -7,61 +7,62 @@
 #include <linux/tracepoint.h>
 #include <linux/syscalls.h>
 #include "x86-64-syscalls-3.0.4_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_sched_yield
+#ifndef OVERRIDE_64_sys_sched_yield
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_sched_yield)
 #endif
-#ifndef OVERRIDE_sys_pause
+#ifndef OVERRIDE_64_sys_pause
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_pause)
 #endif
-#ifndef OVERRIDE_sys_getpid
+#ifndef OVERRIDE_64_sys_getpid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_getpid)
 #endif
-#ifndef OVERRIDE_sys_getuid
+#ifndef OVERRIDE_64_sys_getuid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_getuid)
 #endif
-#ifndef OVERRIDE_sys_getgid
+#ifndef OVERRIDE_64_sys_getgid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_getgid)
 #endif
-#ifndef OVERRIDE_sys_geteuid
+#ifndef OVERRIDE_64_sys_geteuid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_geteuid)
 #endif
-#ifndef OVERRIDE_sys_getegid
+#ifndef OVERRIDE_64_sys_getegid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_getegid)
 #endif
-#ifndef OVERRIDE_sys_getppid
+#ifndef OVERRIDE_64_sys_getppid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_getppid)
 #endif
-#ifndef OVERRIDE_sys_getpgrp
+#ifndef OVERRIDE_64_sys_getpgrp
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_getpgrp)
 #endif
-#ifndef OVERRIDE_sys_setsid
+#ifndef OVERRIDE_64_sys_setsid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_setsid)
 #endif
-#ifndef OVERRIDE_sys_munlockall
+#ifndef OVERRIDE_64_sys_munlockall
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_munlockall)
 #endif
-#ifndef OVERRIDE_sys_vhangup
+#ifndef OVERRIDE_64_sys_vhangup
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_vhangup)
 #endif
-#ifndef OVERRIDE_sys_sync
+#ifndef OVERRIDE_64_sys_sync
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_sync)
 #endif
-#ifndef OVERRIDE_sys_gettid
+#ifndef OVERRIDE_64_sys_gettid
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_gettid)
 #endif
-#ifndef OVERRIDE_sys_restart_syscall
+#ifndef OVERRIDE_64_sys_restart_syscall
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_restart_syscall)
 #endif
-#ifndef OVERRIDE_sys_inotify_init
+#ifndef OVERRIDE_64_sys_inotify_init
 SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_inotify_init)
 #endif
-#ifndef OVERRIDE_sys_close
+#ifndef OVERRIDE_64_sys_close
 SC_TRACE_EVENT(sys_close,
 	TP_PROTO(unsigned int fd),
 	TP_ARGS(fd),
@@ -70,7 +71,7 @@ SC_TRACE_EVENT(sys_close,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_brk
+#ifndef OVERRIDE_64_sys_brk
 SC_TRACE_EVENT(sys_brk,
 	TP_PROTO(unsigned long brk),
 	TP_ARGS(brk),
@@ -79,7 +80,7 @@ SC_TRACE_EVENT(sys_brk,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_dup
+#ifndef OVERRIDE_64_sys_dup
 SC_TRACE_EVENT(sys_dup,
 	TP_PROTO(unsigned int fildes),
 	TP_ARGS(fildes),
@@ -88,7 +89,7 @@ SC_TRACE_EVENT(sys_dup,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_alarm
+#ifndef OVERRIDE_64_sys_alarm
 SC_TRACE_EVENT(sys_alarm,
 	TP_PROTO(unsigned int seconds),
 	TP_ARGS(seconds),
@@ -97,7 +98,7 @@ SC_TRACE_EVENT(sys_alarm,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_exit
+#ifndef OVERRIDE_64_sys_exit
 SC_TRACE_EVENT(sys_exit,
 	TP_PROTO(int error_code),
 	TP_ARGS(error_code),
@@ -106,7 +107,7 @@ SC_TRACE_EVENT(sys_exit,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_fsync
+#ifndef OVERRIDE_64_sys_fsync
 SC_TRACE_EVENT(sys_fsync,
 	TP_PROTO(unsigned int fd),
 	TP_ARGS(fd),
@@ -115,7 +116,7 @@ SC_TRACE_EVENT(sys_fsync,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_fdatasync
+#ifndef OVERRIDE_64_sys_fdatasync
 SC_TRACE_EVENT(sys_fdatasync,
 	TP_PROTO(unsigned int fd),
 	TP_ARGS(fd),
@@ -124,7 +125,7 @@ SC_TRACE_EVENT(sys_fdatasync,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_fchdir
+#ifndef OVERRIDE_64_sys_fchdir
 SC_TRACE_EVENT(sys_fchdir,
 	TP_PROTO(unsigned int fd),
 	TP_ARGS(fd),
@@ -133,7 +134,7 @@ SC_TRACE_EVENT(sys_fchdir,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_umask
+#ifndef OVERRIDE_64_sys_umask
 SC_TRACE_EVENT(sys_umask,
 	TP_PROTO(int mask),
 	TP_ARGS(mask),
@@ -142,7 +143,7 @@ SC_TRACE_EVENT(sys_umask,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setuid
+#ifndef OVERRIDE_64_sys_setuid
 SC_TRACE_EVENT(sys_setuid,
 	TP_PROTO(uid_t uid),
 	TP_ARGS(uid),
@@ -151,7 +152,7 @@ SC_TRACE_EVENT(sys_setuid,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setgid
+#ifndef OVERRIDE_64_sys_setgid
 SC_TRACE_EVENT(sys_setgid,
 	TP_PROTO(gid_t gid),
 	TP_ARGS(gid),
@@ -160,7 +161,7 @@ SC_TRACE_EVENT(sys_setgid,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_getpgid
+#ifndef OVERRIDE_64_sys_getpgid
 SC_TRACE_EVENT(sys_getpgid,
 	TP_PROTO(pid_t pid),
 	TP_ARGS(pid),
@@ -169,7 +170,7 @@ SC_TRACE_EVENT(sys_getpgid,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setfsuid
+#ifndef OVERRIDE_64_sys_setfsuid
 SC_TRACE_EVENT(sys_setfsuid,
 	TP_PROTO(uid_t uid),
 	TP_ARGS(uid),
@@ -178,7 +179,7 @@ SC_TRACE_EVENT(sys_setfsuid,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setfsgid
+#ifndef OVERRIDE_64_sys_setfsgid
 SC_TRACE_EVENT(sys_setfsgid,
 	TP_PROTO(gid_t gid),
 	TP_ARGS(gid),
@@ -187,7 +188,7 @@ SC_TRACE_EVENT(sys_setfsgid,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_getsid
+#ifndef OVERRIDE_64_sys_getsid
 SC_TRACE_EVENT(sys_getsid,
 	TP_PROTO(pid_t pid),
 	TP_ARGS(pid),
@@ -196,7 +197,7 @@ SC_TRACE_EVENT(sys_getsid,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_personality
+#ifndef OVERRIDE_64_sys_personality
 SC_TRACE_EVENT(sys_personality,
 	TP_PROTO(unsigned int personality),
 	TP_ARGS(personality),
@@ -205,7 +206,7 @@ SC_TRACE_EVENT(sys_personality,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_sched_getscheduler
+#ifndef OVERRIDE_64_sys_sched_getscheduler
 SC_TRACE_EVENT(sys_sched_getscheduler,
 	TP_PROTO(pid_t pid),
 	TP_ARGS(pid),
@@ -214,7 +215,7 @@ SC_TRACE_EVENT(sys_sched_getscheduler,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_sched_get_priority_max
+#ifndef OVERRIDE_64_sys_sched_get_priority_max
 SC_TRACE_EVENT(sys_sched_get_priority_max,
 	TP_PROTO(int policy),
 	TP_ARGS(policy),
@@ -223,7 +224,7 @@ SC_TRACE_EVENT(sys_sched_get_priority_max,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_sched_get_priority_min
+#ifndef OVERRIDE_64_sys_sched_get_priority_min
 SC_TRACE_EVENT(sys_sched_get_priority_min,
 	TP_PROTO(int policy),
 	TP_ARGS(policy),
@@ -232,7 +233,7 @@ SC_TRACE_EVENT(sys_sched_get_priority_min,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_mlockall
+#ifndef OVERRIDE_64_sys_mlockall
 SC_TRACE_EVENT(sys_mlockall,
 	TP_PROTO(int flags),
 	TP_ARGS(flags),
@@ -241,7 +242,7 @@ SC_TRACE_EVENT(sys_mlockall,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_io_destroy
+#ifndef OVERRIDE_64_sys_io_destroy
 SC_TRACE_EVENT(sys_io_destroy,
 	TP_PROTO(aio_context_t ctx),
 	TP_ARGS(ctx),
@@ -250,7 +251,7 @@ SC_TRACE_EVENT(sys_io_destroy,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_epoll_create
+#ifndef OVERRIDE_64_sys_epoll_create
 SC_TRACE_EVENT(sys_epoll_create,
 	TP_PROTO(int size),
 	TP_ARGS(size),
@@ -259,7 +260,7 @@ SC_TRACE_EVENT(sys_epoll_create,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_timer_getoverrun
+#ifndef OVERRIDE_64_sys_timer_getoverrun
 SC_TRACE_EVENT(sys_timer_getoverrun,
 	TP_PROTO(timer_t timer_id),
 	TP_ARGS(timer_id),
@@ -268,7 +269,7 @@ SC_TRACE_EVENT(sys_timer_getoverrun,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_timer_delete
+#ifndef OVERRIDE_64_sys_timer_delete
 SC_TRACE_EVENT(sys_timer_delete,
 	TP_PROTO(timer_t timer_id),
 	TP_ARGS(timer_id),
@@ -277,7 +278,7 @@ SC_TRACE_EVENT(sys_timer_delete,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_exit_group
+#ifndef OVERRIDE_64_sys_exit_group
 SC_TRACE_EVENT(sys_exit_group,
 	TP_PROTO(int error_code),
 	TP_ARGS(error_code),
@@ -286,7 +287,7 @@ SC_TRACE_EVENT(sys_exit_group,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_unshare
+#ifndef OVERRIDE_64_sys_unshare
 SC_TRACE_EVENT(sys_unshare,
 	TP_PROTO(unsigned long unshare_flags),
 	TP_ARGS(unshare_flags),
@@ -295,7 +296,7 @@ SC_TRACE_EVENT(sys_unshare,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_eventfd
+#ifndef OVERRIDE_64_sys_eventfd
 SC_TRACE_EVENT(sys_eventfd,
 	TP_PROTO(unsigned int count),
 	TP_ARGS(count),
@@ -304,7 +305,7 @@ SC_TRACE_EVENT(sys_eventfd,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_epoll_create1
+#ifndef OVERRIDE_64_sys_epoll_create1
 SC_TRACE_EVENT(sys_epoll_create1,
 	TP_PROTO(int flags),
 	TP_ARGS(flags),
@@ -313,7 +314,7 @@ SC_TRACE_EVENT(sys_epoll_create1,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_inotify_init1
+#ifndef OVERRIDE_64_sys_inotify_init1
 SC_TRACE_EVENT(sys_inotify_init1,
 	TP_PROTO(int flags),
 	TP_ARGS(flags),
@@ -322,7 +323,7 @@ SC_TRACE_EVENT(sys_inotify_init1,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_syncfs
+#ifndef OVERRIDE_64_sys_syncfs
 SC_TRACE_EVENT(sys_syncfs,
 	TP_PROTO(int fd),
 	TP_ARGS(fd),
@@ -331,7 +332,7 @@ SC_TRACE_EVENT(sys_syncfs,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_munmap
+#ifndef OVERRIDE_64_sys_munmap
 SC_TRACE_EVENT(sys_munmap,
 	TP_PROTO(unsigned long addr, size_t len),
 	TP_ARGS(addr, len),
@@ -340,7 +341,7 @@ SC_TRACE_EVENT(sys_munmap,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_dup2
+#ifndef OVERRIDE_64_sys_dup2
 SC_TRACE_EVENT(sys_dup2,
 	TP_PROTO(unsigned int oldfd, unsigned int newfd),
 	TP_ARGS(oldfd, newfd),
@@ -349,7 +350,7 @@ SC_TRACE_EVENT(sys_dup2,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_shutdown
+#ifndef OVERRIDE_64_sys_shutdown
 SC_TRACE_EVENT(sys_shutdown,
 	TP_PROTO(int fd, int how),
 	TP_ARGS(fd, how),
@@ -358,7 +359,7 @@ SC_TRACE_EVENT(sys_shutdown,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_listen
+#ifndef OVERRIDE_64_sys_listen
 SC_TRACE_EVENT(sys_listen,
 	TP_PROTO(int fd, int backlog),
 	TP_ARGS(fd, backlog),
@@ -367,7 +368,7 @@ SC_TRACE_EVENT(sys_listen,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_kill
+#ifndef OVERRIDE_64_sys_kill
 SC_TRACE_EVENT(sys_kill,
 	TP_PROTO(pid_t pid, int sig),
 	TP_ARGS(pid, sig),
@@ -376,7 +377,7 @@ SC_TRACE_EVENT(sys_kill,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_msgget
+#ifndef OVERRIDE_64_sys_msgget
 SC_TRACE_EVENT(sys_msgget,
 	TP_PROTO(key_t key, int msgflg),
 	TP_ARGS(key, msgflg),
@@ -385,7 +386,7 @@ SC_TRACE_EVENT(sys_msgget,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_flock
+#ifndef OVERRIDE_64_sys_flock
 SC_TRACE_EVENT(sys_flock,
 	TP_PROTO(unsigned int fd, unsigned int cmd),
 	TP_ARGS(fd, cmd),
@@ -394,7 +395,7 @@ SC_TRACE_EVENT(sys_flock,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_ftruncate
+#ifndef OVERRIDE_64_sys_ftruncate
 SC_TRACE_EVENT(sys_ftruncate,
 	TP_PROTO(unsigned int fd, unsigned long length),
 	TP_ARGS(fd, length),
@@ -403,7 +404,7 @@ SC_TRACE_EVENT(sys_ftruncate,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_fchmod
+#ifndef OVERRIDE_64_sys_fchmod
 SC_TRACE_EVENT(sys_fchmod,
 	TP_PROTO(unsigned int fd, mode_t mode),
 	TP_ARGS(fd, mode),
@@ -412,7 +413,7 @@ SC_TRACE_EVENT(sys_fchmod,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setpgid
+#ifndef OVERRIDE_64_sys_setpgid
 SC_TRACE_EVENT(sys_setpgid,
 	TP_PROTO(pid_t pid, pid_t pgid),
 	TP_ARGS(pid, pgid),
@@ -421,7 +422,7 @@ SC_TRACE_EVENT(sys_setpgid,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setreuid
+#ifndef OVERRIDE_64_sys_setreuid
 SC_TRACE_EVENT(sys_setreuid,
 	TP_PROTO(uid_t ruid, uid_t euid),
 	TP_ARGS(ruid, euid),
@@ -430,7 +431,7 @@ SC_TRACE_EVENT(sys_setreuid,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setregid
+#ifndef OVERRIDE_64_sys_setregid
 SC_TRACE_EVENT(sys_setregid,
 	TP_PROTO(gid_t rgid, gid_t egid),
 	TP_ARGS(rgid, egid),
@@ -439,7 +440,7 @@ SC_TRACE_EVENT(sys_setregid,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_getpriority
+#ifndef OVERRIDE_64_sys_getpriority
 SC_TRACE_EVENT(sys_getpriority,
 	TP_PROTO(int which, int who),
 	TP_ARGS(which, who),
@@ -448,7 +449,7 @@ SC_TRACE_EVENT(sys_getpriority,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_mlock
+#ifndef OVERRIDE_64_sys_mlock
 SC_TRACE_EVENT(sys_mlock,
 	TP_PROTO(unsigned long start, size_t len),
 	TP_ARGS(start, len),
@@ -457,7 +458,7 @@ SC_TRACE_EVENT(sys_mlock,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_munlock
+#ifndef OVERRIDE_64_sys_munlock
 SC_TRACE_EVENT(sys_munlock,
 	TP_PROTO(unsigned long start, size_t len),
 	TP_ARGS(start, len),
@@ -466,7 +467,7 @@ SC_TRACE_EVENT(sys_munlock,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_tkill
+#ifndef OVERRIDE_64_sys_tkill
 SC_TRACE_EVENT(sys_tkill,
 	TP_PROTO(pid_t pid, int sig),
 	TP_ARGS(pid, sig),
@@ -475,7 +476,7 @@ SC_TRACE_EVENT(sys_tkill,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_ioprio_get
+#ifndef OVERRIDE_64_sys_ioprio_get
 SC_TRACE_EVENT(sys_ioprio_get,
 	TP_PROTO(int which, int who),
 	TP_ARGS(which, who),
@@ -484,7 +485,7 @@ SC_TRACE_EVENT(sys_ioprio_get,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_inotify_rm_watch
+#ifndef OVERRIDE_64_sys_inotify_rm_watch
 SC_TRACE_EVENT(sys_inotify_rm_watch,
 	TP_PROTO(int fd, __s32 wd),
 	TP_ARGS(fd, wd),
@@ -493,7 +494,7 @@ SC_TRACE_EVENT(sys_inotify_rm_watch,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_timerfd_create
+#ifndef OVERRIDE_64_sys_timerfd_create
 SC_TRACE_EVENT(sys_timerfd_create,
 	TP_PROTO(int clockid, int flags),
 	TP_ARGS(clockid, flags),
@@ -502,7 +503,7 @@ SC_TRACE_EVENT(sys_timerfd_create,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_eventfd2
+#ifndef OVERRIDE_64_sys_eventfd2
 SC_TRACE_EVENT(sys_eventfd2,
 	TP_PROTO(unsigned int count, int flags),
 	TP_ARGS(count, flags),
@@ -511,7 +512,7 @@ SC_TRACE_EVENT(sys_eventfd2,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setns
+#ifndef OVERRIDE_64_sys_setns
 SC_TRACE_EVENT(sys_setns,
 	TP_PROTO(int fd, int nstype),
 	TP_ARGS(fd, nstype),
@@ -520,7 +521,7 @@ SC_TRACE_EVENT(sys_setns,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_lseek
+#ifndef OVERRIDE_64_sys_lseek
 SC_TRACE_EVENT(sys_lseek,
 	TP_PROTO(unsigned int fd, off_t offset, unsigned int origin),
 	TP_ARGS(fd, offset, origin),
@@ -529,7 +530,7 @@ SC_TRACE_EVENT(sys_lseek,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_mprotect
+#ifndef OVERRIDE_64_sys_mprotect
 SC_TRACE_EVENT(sys_mprotect,
 	TP_PROTO(unsigned long start, size_t len, unsigned long prot),
 	TP_ARGS(start, len, prot),
@@ -538,7 +539,7 @@ SC_TRACE_EVENT(sys_mprotect,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_ioctl
+#ifndef OVERRIDE_64_sys_ioctl
 SC_TRACE_EVENT(sys_ioctl,
 	TP_PROTO(unsigned int fd, unsigned int cmd, unsigned long arg),
 	TP_ARGS(fd, cmd, arg),
@@ -547,7 +548,7 @@ SC_TRACE_EVENT(sys_ioctl,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_msync
+#ifndef OVERRIDE_64_sys_msync
 SC_TRACE_EVENT(sys_msync,
 	TP_PROTO(unsigned long start, size_t len, int flags),
 	TP_ARGS(start, len, flags),
@@ -556,7 +557,7 @@ SC_TRACE_EVENT(sys_msync,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_madvise
+#ifndef OVERRIDE_64_sys_madvise
 SC_TRACE_EVENT(sys_madvise,
 	TP_PROTO(unsigned long start, size_t len_in, int behavior),
 	TP_ARGS(start, len_in, behavior),
@@ -565,7 +566,7 @@ SC_TRACE_EVENT(sys_madvise,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_shmget
+#ifndef OVERRIDE_64_sys_shmget
 SC_TRACE_EVENT(sys_shmget,
 	TP_PROTO(key_t key, size_t size, int shmflg),
 	TP_ARGS(key, size, shmflg),
@@ -574,7 +575,7 @@ SC_TRACE_EVENT(sys_shmget,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_socket
+#ifndef OVERRIDE_64_sys_socket
 SC_TRACE_EVENT(sys_socket,
 	TP_PROTO(int family, int type, int protocol),
 	TP_ARGS(family, type, protocol),
@@ -583,7 +584,7 @@ SC_TRACE_EVENT(sys_socket,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_semget
+#ifndef OVERRIDE_64_sys_semget
 SC_TRACE_EVENT(sys_semget,
 	TP_PROTO(key_t key, int nsems, int semflg),
 	TP_ARGS(key, nsems, semflg),
@@ -592,7 +593,7 @@ SC_TRACE_EVENT(sys_semget,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_fcntl
+#ifndef OVERRIDE_64_sys_fcntl
 SC_TRACE_EVENT(sys_fcntl,
 	TP_PROTO(unsigned int fd, unsigned int cmd, unsigned long arg),
 	TP_ARGS(fd, cmd, arg),
@@ -601,7 +602,7 @@ SC_TRACE_EVENT(sys_fcntl,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_fchown
+#ifndef OVERRIDE_64_sys_fchown
 SC_TRACE_EVENT(sys_fchown,
 	TP_PROTO(unsigned int fd, uid_t user, gid_t group),
 	TP_ARGS(fd, user, group),
@@ -610,7 +611,7 @@ SC_TRACE_EVENT(sys_fchown,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setresuid
+#ifndef OVERRIDE_64_sys_setresuid
 SC_TRACE_EVENT(sys_setresuid,
 	TP_PROTO(uid_t ruid, uid_t euid, uid_t suid),
 	TP_ARGS(ruid, euid, suid),
@@ -619,7 +620,7 @@ SC_TRACE_EVENT(sys_setresuid,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setresgid
+#ifndef OVERRIDE_64_sys_setresgid
 SC_TRACE_EVENT(sys_setresgid,
 	TP_PROTO(gid_t rgid, gid_t egid, gid_t sgid),
 	TP_ARGS(rgid, egid, sgid),
@@ -628,7 +629,7 @@ SC_TRACE_EVENT(sys_setresgid,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_sysfs
+#ifndef OVERRIDE_64_sys_sysfs
 SC_TRACE_EVENT(sys_sysfs,
 	TP_PROTO(int option, unsigned long arg1, unsigned long arg2),
 	TP_ARGS(option, arg1, arg2),
@@ -637,7 +638,7 @@ SC_TRACE_EVENT(sys_sysfs,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_setpriority
+#ifndef OVERRIDE_64_sys_setpriority
 SC_TRACE_EVENT(sys_setpriority,
 	TP_PROTO(int which, int who, int niceval),
 	TP_ARGS(which, who, niceval),
@@ -646,7 +647,7 @@ SC_TRACE_EVENT(sys_setpriority,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_tgkill
+#ifndef OVERRIDE_64_sys_tgkill
 SC_TRACE_EVENT(sys_tgkill,
 	TP_PROTO(pid_t tgid, pid_t pid, int sig),
 	TP_ARGS(tgid, pid, sig),
@@ -655,7 +656,7 @@ SC_TRACE_EVENT(sys_tgkill,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_ioprio_set
+#ifndef OVERRIDE_64_sys_ioprio_set
 SC_TRACE_EVENT(sys_ioprio_set,
 	TP_PROTO(int which, int who, int ioprio),
 	TP_ARGS(which, who, ioprio),
@@ -664,7 +665,7 @@ SC_TRACE_EVENT(sys_ioprio_set,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_dup3
+#ifndef OVERRIDE_64_sys_dup3
 SC_TRACE_EVENT(sys_dup3,
 	TP_PROTO(unsigned int oldfd, unsigned int newfd, int flags),
 	TP_ARGS(oldfd, newfd, flags),
@@ -673,7 +674,7 @@ SC_TRACE_EVENT(sys_dup3,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_ptrace
+#ifndef OVERRIDE_64_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),
@@ -682,7 +683,7 @@ SC_TRACE_EVENT(sys_ptrace,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_tee
+#ifndef OVERRIDE_64_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),
@@ -691,7 +692,7 @@ SC_TRACE_EVENT(sys_tee,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_mremap
+#ifndef OVERRIDE_64_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),
@@ -700,7 +701,7 @@ SC_TRACE_EVENT(sys_mremap,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_prctl
+#ifndef OVERRIDE_64_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),
@@ -709,7 +710,7 @@ SC_TRACE_EVENT(sys_prctl,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_remap_file_pages
+#ifndef OVERRIDE_64_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),
@@ -718,7 +719,7 @@ SC_TRACE_EVENT(sys_remap_file_pages,
 	TP_printk()
 )
 #endif
-#ifndef OVERRIDE_sys_mmap
+#ifndef OVERRIDE_64_sys_mmap
 SC_TRACE_EVENT(sys_mmap,
 	TP_PROTO(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long off),
 	TP_ARGS(addr, len, prot, flags, fd, off),
@@ -736,275 +737,276 @@ SC_TRACE_EVENT(sys_mmap,
 #else /* CREATE_SYSCALL_TABLE */
 
 #include "x86-64-syscalls-3.0.4_integers_override.h"
+#include "syscalls_integers_override.h"
 
-#ifndef OVERRIDE_sys_sched_yield
+#ifndef OVERRIDE_TABLE_64_sys_sched_yield
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_sched_yield, 24, 0)
 #endif
-#ifndef OVERRIDE_sys_pause
+#ifndef OVERRIDE_TABLE_64_sys_pause
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_pause, 34, 0)
 #endif
-#ifndef OVERRIDE_sys_getpid
+#ifndef OVERRIDE_TABLE_64_sys_getpid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_getpid, 39, 0)
 #endif
-#ifndef OVERRIDE_sys_getuid
+#ifndef OVERRIDE_TABLE_64_sys_getuid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_getuid, 102, 0)
 #endif
-#ifndef OVERRIDE_sys_getgid
+#ifndef OVERRIDE_TABLE_64_sys_getgid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_getgid, 104, 0)
 #endif
-#ifndef OVERRIDE_sys_geteuid
+#ifndef OVERRIDE_TABLE_64_sys_geteuid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_geteuid, 107, 0)
 #endif
-#ifndef OVERRIDE_sys_getegid
+#ifndef OVERRIDE_TABLE_64_sys_getegid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_getegid, 108, 0)
 #endif
-#ifndef OVERRIDE_sys_getppid
+#ifndef OVERRIDE_TABLE_64_sys_getppid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_getppid, 110, 0)
 #endif
-#ifndef OVERRIDE_sys_getpgrp
+#ifndef OVERRIDE_TABLE_64_sys_getpgrp
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_getpgrp, 111, 0)
 #endif
-#ifndef OVERRIDE_sys_setsid
+#ifndef OVERRIDE_TABLE_64_sys_setsid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_setsid, 112, 0)
 #endif
-#ifndef OVERRIDE_sys_munlockall
+#ifndef OVERRIDE_TABLE_64_sys_munlockall
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_munlockall, 152, 0)
 #endif
-#ifndef OVERRIDE_sys_vhangup
+#ifndef OVERRIDE_TABLE_64_sys_vhangup
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_vhangup, 153, 0)
 #endif
-#ifndef OVERRIDE_sys_sync
+#ifndef OVERRIDE_TABLE_64_sys_sync
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_sync, 162, 0)
 #endif
-#ifndef OVERRIDE_sys_gettid
+#ifndef OVERRIDE_TABLE_64_sys_gettid
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_gettid, 186, 0)
 #endif
-#ifndef OVERRIDE_sys_restart_syscall
+#ifndef OVERRIDE_TABLE_64_sys_restart_syscall
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_restart_syscall, 219, 0)
 #endif
-#ifndef OVERRIDE_sys_inotify_init
+#ifndef OVERRIDE_TABLE_64_sys_inotify_init
 TRACE_SYSCALL_TABLE(syscalls_noargs, sys_inotify_init, 253, 0)
 #endif
-#ifndef OVERRIDE_sys_close
+#ifndef OVERRIDE_TABLE_64_sys_close
 TRACE_SYSCALL_TABLE(sys_close, sys_close, 3, 1)
 #endif
-#ifndef OVERRIDE_sys_lseek
+#ifndef OVERRIDE_TABLE_64_sys_lseek
 TRACE_SYSCALL_TABLE(sys_lseek, sys_lseek, 8, 3)
 #endif
-#ifndef OVERRIDE_sys_mmap
+#ifndef OVERRIDE_TABLE_64_sys_mmap
 TRACE_SYSCALL_TABLE(sys_mmap, sys_mmap, 9, 6)
 #endif
-#ifndef OVERRIDE_sys_mprotect
+#ifndef OVERRIDE_TABLE_64_sys_mprotect
 TRACE_SYSCALL_TABLE(sys_mprotect, sys_mprotect, 10, 3)
 #endif
-#ifndef OVERRIDE_sys_munmap
+#ifndef OVERRIDE_TABLE_64_sys_munmap
 TRACE_SYSCALL_TABLE(sys_munmap, sys_munmap, 11, 2)
 #endif
-#ifndef OVERRIDE_sys_brk
+#ifndef OVERRIDE_TABLE_64_sys_brk
 TRACE_SYSCALL_TABLE(sys_brk, sys_brk, 12, 1)
 #endif
-#ifndef OVERRIDE_sys_ioctl
+#ifndef OVERRIDE_TABLE_64_sys_ioctl
 TRACE_SYSCALL_TABLE(sys_ioctl, sys_ioctl, 16, 3)
 #endif
-#ifndef OVERRIDE_sys_mremap
+#ifndef OVERRIDE_TABLE_64_sys_mremap
 TRACE_SYSCALL_TABLE(sys_mremap, sys_mremap, 25, 5)
 #endif
-#ifndef OVERRIDE_sys_msync
+#ifndef OVERRIDE_TABLE_64_sys_msync
 TRACE_SYSCALL_TABLE(sys_msync, sys_msync, 26, 3)
 #endif
-#ifndef OVERRIDE_sys_madvise
+#ifndef OVERRIDE_TABLE_64_sys_madvise
 TRACE_SYSCALL_TABLE(sys_madvise, sys_madvise, 28, 3)
 #endif
-#ifndef OVERRIDE_sys_shmget
+#ifndef OVERRIDE_TABLE_64_sys_shmget
 TRACE_SYSCALL_TABLE(sys_shmget, sys_shmget, 29, 3)
 #endif
-#ifndef OVERRIDE_sys_dup
+#ifndef OVERRIDE_TABLE_64_sys_dup
 TRACE_SYSCALL_TABLE(sys_dup, sys_dup, 32, 1)
 #endif
-#ifndef OVERRIDE_sys_dup2
+#ifndef OVERRIDE_TABLE_64_sys_dup2
 TRACE_SYSCALL_TABLE(sys_dup2, sys_dup2, 33, 2)
 #endif
-#ifndef OVERRIDE_sys_alarm
+#ifndef OVERRIDE_TABLE_64_sys_alarm
 TRACE_SYSCALL_TABLE(sys_alarm, sys_alarm, 37, 1)
 #endif
-#ifndef OVERRIDE_sys_socket
+#ifndef OVERRIDE_TABLE_64_sys_socket
 TRACE_SYSCALL_TABLE(sys_socket, sys_socket, 41, 3)
 #endif
-#ifndef OVERRIDE_sys_shutdown
+#ifndef OVERRIDE_TABLE_64_sys_shutdown
 TRACE_SYSCALL_TABLE(sys_shutdown, sys_shutdown, 48, 2)
 #endif
-#ifndef OVERRIDE_sys_listen
+#ifndef OVERRIDE_TABLE_64_sys_listen
 TRACE_SYSCALL_TABLE(sys_listen, sys_listen, 50, 2)
 #endif
-#ifndef OVERRIDE_sys_exit
+#ifndef OVERRIDE_TABLE_64_sys_exit
 TRACE_SYSCALL_TABLE(sys_exit, sys_exit, 60, 1)
 #endif
-#ifndef OVERRIDE_sys_kill
+#ifndef OVERRIDE_TABLE_64_sys_kill
 TRACE_SYSCALL_TABLE(sys_kill, sys_kill, 62, 2)
 #endif
-#ifndef OVERRIDE_sys_semget
+#ifndef OVERRIDE_TABLE_64_sys_semget
 TRACE_SYSCALL_TABLE(sys_semget, sys_semget, 64, 3)
 #endif
-#ifndef OVERRIDE_sys_msgget
+#ifndef OVERRIDE_TABLE_64_sys_msgget
 TRACE_SYSCALL_TABLE(sys_msgget, sys_msgget, 68, 2)
 #endif
-#ifndef OVERRIDE_sys_fcntl
+#ifndef OVERRIDE_TABLE_64_sys_fcntl
 TRACE_SYSCALL_TABLE(sys_fcntl, sys_fcntl, 72, 3)
 #endif
-#ifndef OVERRIDE_sys_flock
+#ifndef OVERRIDE_TABLE_64_sys_flock
 TRACE_SYSCALL_TABLE(sys_flock, sys_flock, 73, 2)
 #endif
-#ifndef OVERRIDE_sys_fsync
+#ifndef OVERRIDE_TABLE_64_sys_fsync
 TRACE_SYSCALL_TABLE(sys_fsync, sys_fsync, 74, 1)
 #endif
-#ifndef OVERRIDE_sys_fdatasync
+#ifndef OVERRIDE_TABLE_64_sys_fdatasync
 TRACE_SYSCALL_TABLE(sys_fdatasync, sys_fdatasync, 75, 1)
 #endif
-#ifndef OVERRIDE_sys_ftruncate
+#ifndef OVERRIDE_TABLE_64_sys_ftruncate
 TRACE_SYSCALL_TABLE(sys_ftruncate, sys_ftruncate, 77, 2)
 #endif
-#ifndef OVERRIDE_sys_fchdir
+#ifndef OVERRIDE_TABLE_64_sys_fchdir
 TRACE_SYSCALL_TABLE(sys_fchdir, sys_fchdir, 81, 1)
 #endif
-#ifndef OVERRIDE_sys_fchmod
+#ifndef OVERRIDE_TABLE_64_sys_fchmod
 TRACE_SYSCALL_TABLE(sys_fchmod, sys_fchmod, 91, 2)
 #endif
-#ifndef OVERRIDE_sys_fchown
+#ifndef OVERRIDE_TABLE_64_sys_fchown
 TRACE_SYSCALL_TABLE(sys_fchown, sys_fchown, 93, 3)
 #endif
-#ifndef OVERRIDE_sys_umask
+#ifndef OVERRIDE_TABLE_64_sys_umask
 TRACE_SYSCALL_TABLE(sys_umask, sys_umask, 95, 1)
 #endif
-#ifndef OVERRIDE_sys_ptrace
+#ifndef OVERRIDE_TABLE_64_sys_ptrace
 TRACE_SYSCALL_TABLE(sys_ptrace, sys_ptrace, 101, 4)
 #endif
-#ifndef OVERRIDE_sys_setuid
+#ifndef OVERRIDE_TABLE_64_sys_setuid
 TRACE_SYSCALL_TABLE(sys_setuid, sys_setuid, 105, 1)
 #endif
-#ifndef OVERRIDE_sys_setgid
+#ifndef OVERRIDE_TABLE_64_sys_setgid
 TRACE_SYSCALL_TABLE(sys_setgid, sys_setgid, 106, 1)
 #endif
-#ifndef OVERRIDE_sys_setpgid
+#ifndef OVERRIDE_TABLE_64_sys_setpgid
 TRACE_SYSCALL_TABLE(sys_setpgid, sys_setpgid, 109, 2)
 #endif
-#ifndef OVERRIDE_sys_setreuid
+#ifndef OVERRIDE_TABLE_64_sys_setreuid
 TRACE_SYSCALL_TABLE(sys_setreuid, sys_setreuid, 113, 2)
 #endif
-#ifndef OVERRIDE_sys_setregid
+#ifndef OVERRIDE_TABLE_64_sys_setregid
 TRACE_SYSCALL_TABLE(sys_setregid, sys_setregid, 114, 2)
 #endif
-#ifndef OVERRIDE_sys_setresuid
+#ifndef OVERRIDE_TABLE_64_sys_setresuid
 TRACE_SYSCALL_TABLE(sys_setresuid, sys_setresuid, 117, 3)
 #endif
-#ifndef OVERRIDE_sys_setresgid
+#ifndef OVERRIDE_TABLE_64_sys_setresgid
 TRACE_SYSCALL_TABLE(sys_setresgid, sys_setresgid, 119, 3)
 #endif
-#ifndef OVERRIDE_sys_getpgid
+#ifndef OVERRIDE_TABLE_64_sys_getpgid
 TRACE_SYSCALL_TABLE(sys_getpgid, sys_getpgid, 121, 1)
 #endif
-#ifndef OVERRIDE_sys_setfsuid
+#ifndef OVERRIDE_TABLE_64_sys_setfsuid
 TRACE_SYSCALL_TABLE(sys_setfsuid, sys_setfsuid, 122, 1)
 #endif
-#ifndef OVERRIDE_sys_setfsgid
+#ifndef OVERRIDE_TABLE_64_sys_setfsgid
 TRACE_SYSCALL_TABLE(sys_setfsgid, sys_setfsgid, 123, 1)
 #endif
-#ifndef OVERRIDE_sys_getsid
+#ifndef OVERRIDE_TABLE_64_sys_getsid
 TRACE_SYSCALL_TABLE(sys_getsid, sys_getsid, 124, 1)
 #endif
-#ifndef OVERRIDE_sys_personality
+#ifndef OVERRIDE_TABLE_64_sys_personality
 TRACE_SYSCALL_TABLE(sys_personality, sys_personality, 135, 1)
 #endif
-#ifndef OVERRIDE_sys_sysfs
+#ifndef OVERRIDE_TABLE_64_sys_sysfs
 TRACE_SYSCALL_TABLE(sys_sysfs, sys_sysfs, 139, 3)
 #endif
-#ifndef OVERRIDE_sys_getpriority
+#ifndef OVERRIDE_TABLE_64_sys_getpriority
 TRACE_SYSCALL_TABLE(sys_getpriority, sys_getpriority, 140, 2)
 #endif
-#ifndef OVERRIDE_sys_setpriority
+#ifndef OVERRIDE_TABLE_64_sys_setpriority
 TRACE_SYSCALL_TABLE(sys_setpriority, sys_setpriority, 141, 3)
 #endif
-#ifndef OVERRIDE_sys_sched_getscheduler
+#ifndef OVERRIDE_TABLE_64_sys_sched_getscheduler
 TRACE_SYSCALL_TABLE(sys_sched_getscheduler, sys_sched_getscheduler, 145, 1)
 #endif
-#ifndef OVERRIDE_sys_sched_get_priority_max
+#ifndef OVERRIDE_TABLE_64_sys_sched_get_priority_max
 TRACE_SYSCALL_TABLE(sys_sched_get_priority_max, sys_sched_get_priority_max, 146, 1)
 #endif
-#ifndef OVERRIDE_sys_sched_get_priority_min
+#ifndef OVERRIDE_TABLE_64_sys_sched_get_priority_min
 TRACE_SYSCALL_TABLE(sys_sched_get_priority_min, sys_sched_get_priority_min, 147, 1)
 #endif
-#ifndef OVERRIDE_sys_mlock
+#ifndef OVERRIDE_TABLE_64_sys_mlock
 TRACE_SYSCALL_TABLE(sys_mlock, sys_mlock, 149, 2)
 #endif
-#ifndef OVERRIDE_sys_munlock
+#ifndef OVERRIDE_TABLE_64_sys_munlock
 TRACE_SYSCALL_TABLE(sys_munlock, sys_munlock, 150, 2)
 #endif
-#ifndef OVERRIDE_sys_mlockall
+#ifndef OVERRIDE_TABLE_64_sys_mlockall
 TRACE_SYSCALL_TABLE(sys_mlockall, sys_mlockall, 151, 1)
 #endif
-#ifndef OVERRIDE_sys_prctl
+#ifndef OVERRIDE_TABLE_64_sys_prctl
 TRACE_SYSCALL_TABLE(sys_prctl, sys_prctl, 157, 5)
 #endif
-#ifndef OVERRIDE_sys_tkill
+#ifndef OVERRIDE_TABLE_64_sys_tkill
 TRACE_SYSCALL_TABLE(sys_tkill, sys_tkill, 200, 2)
 #endif
-#ifndef OVERRIDE_sys_io_destroy
+#ifndef OVERRIDE_TABLE_64_sys_io_destroy
 TRACE_SYSCALL_TABLE(sys_io_destroy, sys_io_destroy, 207, 1)
 #endif
-#ifndef OVERRIDE_sys_epoll_create
+#ifndef OVERRIDE_TABLE_64_sys_epoll_create
 TRACE_SYSCALL_TABLE(sys_epoll_create, sys_epoll_create, 213, 1)
 #endif
-#ifndef OVERRIDE_sys_remap_file_pages
+#ifndef OVERRIDE_TABLE_64_sys_remap_file_pages
 TRACE_SYSCALL_TABLE(sys_remap_file_pages, sys_remap_file_pages, 216, 5)
 #endif
-#ifndef OVERRIDE_sys_timer_getoverrun
+#ifndef OVERRIDE_TABLE_64_sys_timer_getoverrun
 TRACE_SYSCALL_TABLE(sys_timer_getoverrun, sys_timer_getoverrun, 225, 1)
 #endif
-#ifndef OVERRIDE_sys_timer_delete
+#ifndef OVERRIDE_TABLE_64_sys_timer_delete
 TRACE_SYSCALL_TABLE(sys_timer_delete, sys_timer_delete, 226, 1)
 #endif
-#ifndef OVERRIDE_sys_exit_group
+#ifndef OVERRIDE_TABLE_64_sys_exit_group
 TRACE_SYSCALL_TABLE(sys_exit_group, sys_exit_group, 231, 1)
 #endif
-#ifndef OVERRIDE_sys_tgkill
+#ifndef OVERRIDE_TABLE_64_sys_tgkill
 TRACE_SYSCALL_TABLE(sys_tgkill, sys_tgkill, 234, 3)
 #endif
-#ifndef OVERRIDE_sys_ioprio_set
+#ifndef OVERRIDE_TABLE_64_sys_ioprio_set
 TRACE_SYSCALL_TABLE(sys_ioprio_set, sys_ioprio_set, 251, 3)
 #endif
-#ifndef OVERRIDE_sys_ioprio_get
+#ifndef OVERRIDE_TABLE_64_sys_ioprio_get
 TRACE_SYSCALL_TABLE(sys_ioprio_get, sys_ioprio_get, 252, 2)
 #endif
-#ifndef OVERRIDE_sys_inotify_rm_watch
+#ifndef OVERRIDE_TABLE_64_sys_inotify_rm_watch
 TRACE_SYSCALL_TABLE(sys_inotify_rm_watch, sys_inotify_rm_watch, 255, 2)
 #endif
-#ifndef OVERRIDE_sys_unshare
+#ifndef OVERRIDE_TABLE_64_sys_unshare
 TRACE_SYSCALL_TABLE(sys_unshare, sys_unshare, 272, 1)
 #endif
-#ifndef OVERRIDE_sys_tee
+#ifndef OVERRIDE_TABLE_64_sys_tee
 TRACE_SYSCALL_TABLE(sys_tee, sys_tee, 276, 4)
 #endif
-#ifndef OVERRIDE_sys_timerfd_create
+#ifndef OVERRIDE_TABLE_64_sys_timerfd_create
 TRACE_SYSCALL_TABLE(sys_timerfd_create, sys_timerfd_create, 283, 2)
 #endif
-#ifndef OVERRIDE_sys_eventfd
+#ifndef OVERRIDE_TABLE_64_sys_eventfd
 TRACE_SYSCALL_TABLE(sys_eventfd, sys_eventfd, 284, 1)
 #endif
-#ifndef OVERRIDE_sys_eventfd2
+#ifndef OVERRIDE_TABLE_64_sys_eventfd2
 TRACE_SYSCALL_TABLE(sys_eventfd2, sys_eventfd2, 290, 2)
 #endif
-#ifndef OVERRIDE_sys_epoll_create1
+#ifndef OVERRIDE_TABLE_64_sys_epoll_create1
 TRACE_SYSCALL_TABLE(sys_epoll_create1, sys_epoll_create1, 291, 1)
 #endif
-#ifndef OVERRIDE_sys_dup3
+#ifndef OVERRIDE_TABLE_64_sys_dup3
 TRACE_SYSCALL_TABLE(sys_dup3, sys_dup3, 292, 3)
 #endif
-#ifndef OVERRIDE_sys_inotify_init1
+#ifndef OVERRIDE_TABLE_64_sys_inotify_init1
 TRACE_SYSCALL_TABLE(sys_inotify_init1, sys_inotify_init1, 294, 1)
 #endif
-#ifndef OVERRIDE_sys_syncfs
+#ifndef OVERRIDE_TABLE_64_sys_syncfs
 TRACE_SYSCALL_TABLE(sys_syncfs, sys_syncfs, 306, 1)
 #endif
-#ifndef OVERRIDE_sys_setns
+#ifndef OVERRIDE_TABLE_64_sys_setns
 TRACE_SYSCALL_TABLE(sys_setns, sys_setns, 308, 2)
 #endif