Remove sys_ prefix from syscall names

[lttng-modules.git] / instrumentation / syscalls / headers / x86-64-syscalls-3.10.0-rc7_pointers.h

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 a3a1b8231fe24e17db7fd289bc76ec501ae52068..830146f98b6e300fd7c6773e0b02928ef9144222 100644 (file)
--- 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
@@ -9,8 +9,8 @@
 #include "x86-64-syscalls-3.10.0-rc7_pointers_override.h"
 #include "syscalls_pointers_override.h"
 
-#ifndef OVERRIDE_64_sys_pipe
-SC_TRACE_EVENT(sys_pipe,
+#ifndef OVERRIDE_64_pipe
+SC_TRACE_EVENT(pipe,
        TP_PROTO(sc_exit(long ret,) int * fildes),
        TP_ARGS(sc_exit(ret,) fildes),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(int *, fildes))),
@@ -18,8 +18,8 @@ SC_TRACE_EVENT(sys_pipe,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_newuname
-SC_TRACE_EVENT(sys_newuname,
+#ifndef OVERRIDE_64_newuname
+SC_TRACE_EVENT(newuname,
        TP_PROTO(sc_exit(long ret,) struct new_utsname * name),
        TP_ARGS(sc_exit(ret,) name),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct new_utsname *, name))),
@@ -27,8 +27,8 @@ SC_TRACE_EVENT(sys_newuname,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_shmdt
-SC_TRACE_EVENT(sys_shmdt,
+#ifndef OVERRIDE_64_shmdt
+SC_TRACE_EVENT(shmdt,
        TP_PROTO(sc_exit(long ret,) char * shmaddr),
        TP_ARGS(sc_exit(ret,) shmaddr),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(char *, shmaddr))),
@@ -36,8 +36,8 @@ SC_TRACE_EVENT(sys_shmdt,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_chdir
-SC_TRACE_EVENT(sys_chdir,
+#ifndef OVERRIDE_64_chdir
+SC_TRACE_EVENT(chdir,
        TP_PROTO(sc_exit(long ret,) const char * filename),
        TP_ARGS(sc_exit(ret,) filename),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename))),
@@ -45,8 +45,8 @@ SC_TRACE_EVENT(sys_chdir,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_rmdir
-SC_TRACE_EVENT(sys_rmdir,
+#ifndef OVERRIDE_64_rmdir
+SC_TRACE_EVENT(rmdir,
        TP_PROTO(sc_exit(long ret,) const char * pathname),
        TP_ARGS(sc_exit(ret,) pathname),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname))),
@@ -54,8 +54,8 @@ SC_TRACE_EVENT(sys_rmdir,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_unlink
-SC_TRACE_EVENT(sys_unlink,
+#ifndef OVERRIDE_64_unlink
+SC_TRACE_EVENT(unlink,
        TP_PROTO(sc_exit(long ret,) const char * pathname),
        TP_ARGS(sc_exit(ret,) pathname),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname))),
@@ -63,8 +63,8 @@ SC_TRACE_EVENT(sys_unlink,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_sysinfo
-SC_TRACE_EVENT(sys_sysinfo,
+#ifndef OVERRIDE_64_sysinfo
+SC_TRACE_EVENT(sysinfo,
        TP_PROTO(sc_exit(long ret,) struct sysinfo * info),
        TP_ARGS(sc_exit(ret,) info),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct sysinfo *, info))),
@@ -72,8 +72,8 @@ SC_TRACE_EVENT(sys_sysinfo,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_times
-SC_TRACE_EVENT(sys_times,
+#ifndef OVERRIDE_64_times
+SC_TRACE_EVENT(times,
        TP_PROTO(sc_exit(long ret,) struct tms * tbuf),
        TP_ARGS(sc_exit(ret,) tbuf),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct tms *, tbuf))),
@@ -81,8 +81,8 @@ SC_TRACE_EVENT(sys_times,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_sysctl
-SC_TRACE_EVENT(sys_sysctl,
+#ifndef OVERRIDE_64_sysctl
+SC_TRACE_EVENT(sysctl,
        TP_PROTO(sc_exit(long ret,) struct __sysctl_args * args),
        TP_ARGS(sc_exit(ret,) args),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct __sysctl_args *, args))),
@@ -90,8 +90,8 @@ SC_TRACE_EVENT(sys_sysctl,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_adjtimex
-SC_TRACE_EVENT(sys_adjtimex,
+#ifndef OVERRIDE_64_adjtimex
+SC_TRACE_EVENT(adjtimex,
        TP_PROTO(sc_exit(long ret,) struct timex * txc_p),
        TP_ARGS(sc_exit(ret,) txc_p),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct timex *, txc_p))),
@@ -99,8 +99,8 @@ SC_TRACE_EVENT(sys_adjtimex,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_chroot
-SC_TRACE_EVENT(sys_chroot,
+#ifndef OVERRIDE_64_chroot
+SC_TRACE_EVENT(chroot,
        TP_PROTO(sc_exit(long ret,) const char * filename),
        TP_ARGS(sc_exit(ret,) filename),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename))),
@@ -108,8 +108,8 @@ SC_TRACE_EVENT(sys_chroot,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_acct
-SC_TRACE_EVENT(sys_acct,
+#ifndef OVERRIDE_64_acct
+SC_TRACE_EVENT(acct,
        TP_PROTO(sc_exit(long ret,) const char * name),
        TP_ARGS(sc_exit(ret,) name),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name))),
@@ -117,8 +117,8 @@ SC_TRACE_EVENT(sys_acct,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_swapoff
-SC_TRACE_EVENT(sys_swapoff,
+#ifndef OVERRIDE_64_swapoff
+SC_TRACE_EVENT(swapoff,
        TP_PROTO(sc_exit(long ret,) const char * specialfile),
        TP_ARGS(sc_exit(ret,) specialfile),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(specialfile, specialfile))),
@@ -126,8 +126,8 @@ SC_TRACE_EVENT(sys_swapoff,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_time
-SC_TRACE_EVENT(sys_time,
+#ifndef OVERRIDE_64_time
+SC_TRACE_EVENT(time,
        TP_PROTO(sc_exit(long ret,) time_t * tloc),
        TP_ARGS(sc_exit(ret,) tloc),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(time_t *, tloc))),
@@ -135,8 +135,8 @@ SC_TRACE_EVENT(sys_time,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_set_tid_address
-SC_TRACE_EVENT(sys_set_tid_address,
+#ifndef OVERRIDE_64_set_tid_address
+SC_TRACE_EVENT(set_tid_address,
        TP_PROTO(sc_exit(long ret,) int * tidptr),
        TP_ARGS(sc_exit(ret,) tidptr),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(int *, tidptr))),
@@ -144,8 +144,8 @@ SC_TRACE_EVENT(sys_set_tid_address,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_mq_unlink
-SC_TRACE_EVENT(sys_mq_unlink,
+#ifndef OVERRIDE_64_mq_unlink
+SC_TRACE_EVENT(mq_unlink,
        TP_PROTO(sc_exit(long ret,) const char * u_name),
        TP_ARGS(sc_exit(ret,) u_name),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(u_name, u_name))),
@@ -153,8 +153,8 @@ SC_TRACE_EVENT(sys_mq_unlink,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_newstat
-SC_TRACE_EVENT(sys_newstat,
+#ifndef OVERRIDE_64_newstat
+SC_TRACE_EVENT(newstat,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_out(__field_hex(struct stat *, statbuf))),
@@ -162,8 +162,8 @@ SC_TRACE_EVENT(sys_newstat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_newfstat
-SC_TRACE_EVENT(sys_newfstat,
+#ifndef OVERRIDE_64_newfstat
+SC_TRACE_EVENT(newfstat,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct stat * statbuf),
        TP_ARGS(sc_exit(ret,) fd, statbuf),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct stat *, statbuf))),
@@ -171,8 +171,8 @@ SC_TRACE_EVENT(sys_newfstat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_newlstat
-SC_TRACE_EVENT(sys_newlstat,
+#ifndef OVERRIDE_64_newlstat
+SC_TRACE_EVENT(newlstat,
        TP_PROTO(sc_exit(long ret,) const char * filename, struct stat * statbuf),
        TP_ARGS(sc_exit(ret,) filename, statbuf),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_out(__field_hex(struct stat *, statbuf))),
@@ -180,8 +180,8 @@ SC_TRACE_EVENT(sys_newlstat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_access
-SC_TRACE_EVENT(sys_access,
+#ifndef OVERRIDE_64_access
+SC_TRACE_EVENT(access,
        TP_PROTO(sc_exit(long ret,) const char * filename, int mode),
        TP_ARGS(sc_exit(ret,) filename, mode),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, mode))),
@@ -189,8 +189,8 @@ SC_TRACE_EVENT(sys_access,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_nanosleep
-SC_TRACE_EVENT(sys_nanosleep,
+#ifndef OVERRIDE_64_nanosleep
+SC_TRACE_EVENT(nanosleep,
        TP_PROTO(sc_exit(long ret,) struct timespec * rqtp, struct timespec * rmtp),
        TP_ARGS(sc_exit(ret,) rqtp, rmtp),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct timespec *, rqtp)) sc_out(__field_hex(struct timespec *, rmtp))),
@@ -198,8 +198,8 @@ SC_TRACE_EVENT(sys_nanosleep,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_getitimer
-SC_TRACE_EVENT(sys_getitimer,
+#ifndef OVERRIDE_64_getitimer
+SC_TRACE_EVENT(getitimer,
        TP_PROTO(sc_exit(long ret,) int which, struct itimerval * value),
        TP_ARGS(sc_exit(ret,) which, value),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_out(__field_hex(struct itimerval *, value))),
@@ -207,8 +207,8 @@ SC_TRACE_EVENT(sys_getitimer,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_truncate
-SC_TRACE_EVENT(sys_truncate,
+#ifndef OVERRIDE_64_truncate
+SC_TRACE_EVENT(truncate,
        TP_PROTO(sc_exit(long ret,) const char * path, long length),
        TP_ARGS(sc_exit(ret,) path, length),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(path, path)) sc_in(__field(long, length))),
@@ -216,8 +216,8 @@ SC_TRACE_EVENT(sys_truncate,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_getcwd
-SC_TRACE_EVENT(sys_getcwd,
+#ifndef OVERRIDE_64_getcwd
+SC_TRACE_EVENT(getcwd,
        TP_PROTO(sc_exit(long ret,) char * buf, unsigned long size),
        TP_ARGS(sc_exit(ret,) buf, size),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(char *, buf)) sc_in(__field(unsigned long, size))),
@@ -225,8 +225,8 @@ SC_TRACE_EVENT(sys_getcwd,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_rename
-SC_TRACE_EVENT(sys_rename,
+#ifndef OVERRIDE_64_rename
+SC_TRACE_EVENT(rename,
        TP_PROTO(sc_exit(long ret,) const char * oldname, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newname),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__string_from_user(newname, newname))),
@@ -234,8 +234,8 @@ SC_TRACE_EVENT(sys_rename,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_mkdir
-SC_TRACE_EVENT(sys_mkdir,
+#ifndef OVERRIDE_64_mkdir
+SC_TRACE_EVENT(mkdir,
        TP_PROTO(sc_exit(long ret,) const char * pathname, umode_t mode),
        TP_ARGS(sc_exit(ret,) pathname, mode),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(umode_t, mode))),
@@ -243,8 +243,8 @@ SC_TRACE_EVENT(sys_mkdir,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_creat
-SC_TRACE_EVENT(sys_creat,
+#ifndef OVERRIDE_64_creat
+SC_TRACE_EVENT(creat,
        TP_PROTO(sc_exit(long ret,) const char * pathname, umode_t mode),
        TP_ARGS(sc_exit(ret,) pathname, mode),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(umode_t, mode))),
@@ -252,8 +252,8 @@ SC_TRACE_EVENT(sys_creat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_link
-SC_TRACE_EVENT(sys_link,
+#ifndef OVERRIDE_64_link
+SC_TRACE_EVENT(link,
        TP_PROTO(sc_exit(long ret,) const char * oldname, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newname),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__string_from_user(newname, newname))),
@@ -261,8 +261,8 @@ SC_TRACE_EVENT(sys_link,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_symlink
-SC_TRACE_EVENT(sys_symlink,
+#ifndef OVERRIDE_64_symlink
+SC_TRACE_EVENT(symlink,
        TP_PROTO(sc_exit(long ret,) const char * oldname, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newname),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__string_from_user(newname, newname))),
@@ -270,8 +270,8 @@ SC_TRACE_EVENT(sys_symlink,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_chmod
-SC_TRACE_EVENT(sys_chmod,
+#ifndef OVERRIDE_64_chmod
+SC_TRACE_EVENT(chmod,
        TP_PROTO(sc_exit(long ret,) const char * filename, umode_t mode),
        TP_ARGS(sc_exit(ret,) filename, mode),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode))),
@@ -279,8 +279,8 @@ SC_TRACE_EVENT(sys_chmod,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_gettimeofday
-SC_TRACE_EVENT(sys_gettimeofday,
+#ifndef OVERRIDE_64_gettimeofday
+SC_TRACE_EVENT(gettimeofday,
        TP_PROTO(sc_exit(long ret,) struct timeval * tv, struct timezone * tz),
        TP_ARGS(sc_exit(ret,) tv, tz),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(struct timeval *, tv)) sc_out(__field_hex(struct timezone *, tz))),
@@ -288,8 +288,8 @@ SC_TRACE_EVENT(sys_gettimeofday,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_getrlimit
-SC_TRACE_EVENT(sys_getrlimit,
+#ifndef OVERRIDE_64_getrlimit
+SC_TRACE_EVENT(getrlimit,
        TP_PROTO(sc_exit(long ret,) unsigned int resource, struct rlimit * rlim),
        TP_ARGS(sc_exit(ret,) resource, rlim),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, resource)) sc_out(__field_hex(struct rlimit *, rlim))),
@@ -297,8 +297,8 @@ SC_TRACE_EVENT(sys_getrlimit,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_getrusage
-SC_TRACE_EVENT(sys_getrusage,
+#ifndef OVERRIDE_64_getrusage
+SC_TRACE_EVENT(getrusage,
        TP_PROTO(sc_exit(long ret,) int who, struct rusage * ru),
        TP_ARGS(sc_exit(ret,) who, ru),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, who)) sc_out(__field_hex(struct rusage *, ru))),
@@ -306,8 +306,8 @@ SC_TRACE_EVENT(sys_getrusage,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_getgroups
-SC_TRACE_EVENT(sys_getgroups,
+#ifndef OVERRIDE_64_getgroups
+SC_TRACE_EVENT(getgroups,
        TP_PROTO(sc_exit(long ret,) int gidsetsize, gid_t * grouplist),
        TP_ARGS(sc_exit(ret,) gidsetsize, grouplist),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, gidsetsize)) sc_out(__field_hex(gid_t *, grouplist))),
@@ -315,8 +315,8 @@ SC_TRACE_EVENT(sys_getgroups,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_setgroups
-SC_TRACE_EVENT(sys_setgroups,
+#ifndef OVERRIDE_64_setgroups
+SC_TRACE_EVENT(setgroups,
        TP_PROTO(sc_exit(long ret,) int gidsetsize, gid_t * grouplist),
        TP_ARGS(sc_exit(ret,) gidsetsize, grouplist),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, gidsetsize)) sc_in(__field_hex(gid_t *, grouplist))),
@@ -324,8 +324,8 @@ SC_TRACE_EVENT(sys_setgroups,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_rt_sigpending
-SC_TRACE_EVENT(sys_rt_sigpending,
+#ifndef OVERRIDE_64_rt_sigpending
+SC_TRACE_EVENT(rt_sigpending,
        TP_PROTO(sc_exit(long ret,) sigset_t * uset, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) uset, sigsetsize),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(sigset_t *, uset)) sc_in(__field(size_t, sigsetsize))),
@@ -333,8 +333,8 @@ SC_TRACE_EVENT(sys_rt_sigpending,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_rt_sigsuspend
-SC_TRACE_EVENT(sys_rt_sigsuspend,
+#ifndef OVERRIDE_64_rt_sigsuspend
+SC_TRACE_EVENT(rt_sigsuspend,
        TP_PROTO(sc_exit(long ret,) sigset_t * unewset, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) unewset, sigsetsize),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(sigset_t *, unewset)) sc_in(__field(size_t, sigsetsize))),
@@ -342,8 +342,8 @@ SC_TRACE_EVENT(sys_rt_sigsuspend,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_sigaltstack
-SC_TRACE_EVENT(sys_sigaltstack,
+#ifndef OVERRIDE_64_sigaltstack
+SC_TRACE_EVENT(sigaltstack,
        TP_PROTO(sc_exit(long ret,) const stack_t * uss, stack_t * uoss),
        TP_ARGS(sc_exit(ret,) uss, uoss),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(const stack_t *, uss)) sc_inout(__field_hex(stack_t *, uoss))),
@@ -351,8 +351,8 @@ SC_TRACE_EVENT(sys_sigaltstack,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_utime
-SC_TRACE_EVENT(sys_utime,
+#ifndef OVERRIDE_64_utime
+SC_TRACE_EVENT(utime,
        TP_PROTO(sc_exit(long ret,) char * filename, struct utimbuf * times),
        TP_ARGS(sc_exit(ret,) filename, times),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct utimbuf *, times))),
@@ -360,8 +360,8 @@ SC_TRACE_EVENT(sys_utime,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_ustat
-SC_TRACE_EVENT(sys_ustat,
+#ifndef OVERRIDE_64_ustat
+SC_TRACE_EVENT(ustat,
        TP_PROTO(sc_exit(long ret,) unsigned dev, struct ustat * ubuf),
        TP_ARGS(sc_exit(ret,) dev, ubuf),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned, dev)) sc_out(__field_hex(struct ustat *, ubuf))),
@@ -369,8 +369,8 @@ SC_TRACE_EVENT(sys_ustat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_statfs
-SC_TRACE_EVENT(sys_statfs,
+#ifndef OVERRIDE_64_statfs
+SC_TRACE_EVENT(statfs,
        TP_PROTO(sc_exit(long ret,) const char * pathname, struct statfs * buf),
        TP_ARGS(sc_exit(ret,) pathname, buf),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(struct statfs *, buf))),
@@ -378,8 +378,8 @@ SC_TRACE_EVENT(sys_statfs,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_fstatfs
-SC_TRACE_EVENT(sys_fstatfs,
+#ifndef OVERRIDE_64_fstatfs
+SC_TRACE_EVENT(fstatfs,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct statfs * buf),
        TP_ARGS(sc_exit(ret,) fd, buf),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct statfs *, buf))),
@@ -387,8 +387,8 @@ SC_TRACE_EVENT(sys_fstatfs,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_sched_setparam
-SC_TRACE_EVENT(sys_sched_setparam,
+#ifndef OVERRIDE_64_sched_setparam
+SC_TRACE_EVENT(sched_setparam,
        TP_PROTO(sc_exit(long ret,) pid_t pid, struct sched_param * param),
        TP_ARGS(sc_exit(ret,) pid, param),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field_hex(struct sched_param *, param))),
@@ -396,8 +396,8 @@ SC_TRACE_EVENT(sys_sched_setparam,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_sched_getparam
-SC_TRACE_EVENT(sys_sched_getparam,
+#ifndef OVERRIDE_64_sched_getparam
+SC_TRACE_EVENT(sched_getparam,
        TP_PROTO(sc_exit(long ret,) pid_t pid, struct sched_param * param),
        TP_ARGS(sc_exit(ret,) pid, param),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_out(__field_hex(struct sched_param *, param))),
@@ -405,8 +405,8 @@ SC_TRACE_EVENT(sys_sched_getparam,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_sched_rr_get_interval
-SC_TRACE_EVENT(sys_sched_rr_get_interval,
+#ifndef OVERRIDE_64_sched_rr_get_interval
+SC_TRACE_EVENT(sched_rr_get_interval,
        TP_PROTO(sc_exit(long ret,) pid_t pid, struct timespec * interval),
        TP_ARGS(sc_exit(ret,) pid, interval),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_out(__field_hex(struct timespec *, interval))),
@@ -414,8 +414,8 @@ SC_TRACE_EVENT(sys_sched_rr_get_interval,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_pivot_root
-SC_TRACE_EVENT(sys_pivot_root,
+#ifndef OVERRIDE_64_pivot_root
+SC_TRACE_EVENT(pivot_root,
        TP_PROTO(sc_exit(long ret,) const char * new_root, const char * put_old),
        TP_ARGS(sc_exit(ret,) new_root, put_old),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(new_root, new_root)) sc_in(__string_from_user(put_old, put_old))),
@@ -423,8 +423,8 @@ SC_TRACE_EVENT(sys_pivot_root,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_setrlimit
-SC_TRACE_EVENT(sys_setrlimit,
+#ifndef OVERRIDE_64_setrlimit
+SC_TRACE_EVENT(setrlimit,
        TP_PROTO(sc_exit(long ret,) unsigned int resource, struct rlimit * rlim),
        TP_ARGS(sc_exit(ret,) resource, rlim),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, resource)) sc_in(__field_hex(struct rlimit *, rlim))),
@@ -432,8 +432,8 @@ SC_TRACE_EVENT(sys_setrlimit,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_settimeofday
-SC_TRACE_EVENT(sys_settimeofday,
+#ifndef OVERRIDE_64_settimeofday
+SC_TRACE_EVENT(settimeofday,
        TP_PROTO(sc_exit(long ret,) struct timeval * tv, struct timezone * tz),
        TP_ARGS(sc_exit(ret,) tv, tz),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct timeval *, tv)) sc_in(__field_hex(struct timezone *, tz))),
@@ -441,8 +441,8 @@ SC_TRACE_EVENT(sys_settimeofday,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_umount
-SC_TRACE_EVENT(sys_umount,
+#ifndef OVERRIDE_64_umount
+SC_TRACE_EVENT(umount,
        TP_PROTO(sc_exit(long ret,) char * name, int flags),
        TP_ARGS(sc_exit(ret,) name, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name)) sc_in(__field(int, flags))),
@@ -450,8 +450,8 @@ SC_TRACE_EVENT(sys_umount,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_swapon
-SC_TRACE_EVENT(sys_swapon,
+#ifndef OVERRIDE_64_swapon
+SC_TRACE_EVENT(swapon,
        TP_PROTO(sc_exit(long ret,) const char * specialfile, int swap_flags),
        TP_ARGS(sc_exit(ret,) specialfile, swap_flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(specialfile, specialfile)) sc_in(__field(int, swap_flags))),
@@ -459,8 +459,8 @@ SC_TRACE_EVENT(sys_swapon,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_sethostname
-SC_TRACE_EVENT(sys_sethostname,
+#ifndef OVERRIDE_64_sethostname
+SC_TRACE_EVENT(sethostname,
        TP_PROTO(sc_exit(long ret,) char * name, int len),
        TP_ARGS(sc_exit(ret,) name, len),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name)) sc_in(__field(int, len))),
@@ -468,8 +468,8 @@ SC_TRACE_EVENT(sys_sethostname,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_setdomainname
-SC_TRACE_EVENT(sys_setdomainname,
+#ifndef OVERRIDE_64_setdomainname
+SC_TRACE_EVENT(setdomainname,
        TP_PROTO(sc_exit(long ret,) char * name, int len),
        TP_ARGS(sc_exit(ret,) name, len),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name, name)) sc_in(__field(int, len))),
@@ -477,8 +477,8 @@ SC_TRACE_EVENT(sys_setdomainname,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_delete_module
-SC_TRACE_EVENT(sys_delete_module,
+#ifndef OVERRIDE_64_delete_module
+SC_TRACE_EVENT(delete_module,
        TP_PROTO(sc_exit(long ret,) const char * name_user, unsigned int flags),
        TP_ARGS(sc_exit(ret,) name_user, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(name_user, name_user)) sc_in(__field(unsigned int, flags))),
@@ -486,8 +486,8 @@ SC_TRACE_EVENT(sys_delete_module,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_removexattr
-SC_TRACE_EVENT(sys_removexattr,
+#ifndef OVERRIDE_64_removexattr
+SC_TRACE_EVENT(removexattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name),
        TP_ARGS(sc_exit(ret,) pathname, name),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name))),
@@ -495,8 +495,8 @@ SC_TRACE_EVENT(sys_removexattr,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_lremovexattr
-SC_TRACE_EVENT(sys_lremovexattr,
+#ifndef OVERRIDE_64_lremovexattr
+SC_TRACE_EVENT(lremovexattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name),
        TP_ARGS(sc_exit(ret,) pathname, name),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name))),
@@ -504,8 +504,8 @@ SC_TRACE_EVENT(sys_lremovexattr,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_fremovexattr
-SC_TRACE_EVENT(sys_fremovexattr,
+#ifndef OVERRIDE_64_fremovexattr
+SC_TRACE_EVENT(fremovexattr,
        TP_PROTO(sc_exit(long ret,) int fd, const char * name),
        TP_ARGS(sc_exit(ret,) fd, name),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(name, name))),
@@ -513,8 +513,8 @@ SC_TRACE_EVENT(sys_fremovexattr,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_io_setup
-SC_TRACE_EVENT(sys_io_setup,
+#ifndef OVERRIDE_64_io_setup
+SC_TRACE_EVENT(io_setup,
        TP_PROTO(sc_exit(long ret,) unsigned nr_events, aio_context_t * ctxp),
        TP_ARGS(sc_exit(ret,) nr_events, ctxp),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned, nr_events)) sc_in(__field_hex(aio_context_t *, ctxp))),
@@ -522,8 +522,8 @@ SC_TRACE_EVENT(sys_io_setup,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_timer_gettime
-SC_TRACE_EVENT(sys_timer_gettime,
+#ifndef OVERRIDE_64_timer_gettime
+SC_TRACE_EVENT(timer_gettime,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id, struct itimerspec * setting),
        TP_ARGS(sc_exit(ret,) timer_id, setting),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id)) sc_out(__field_hex(struct itimerspec *, setting))),
@@ -531,8 +531,8 @@ SC_TRACE_EVENT(sys_timer_gettime,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_clock_settime
-SC_TRACE_EVENT(sys_clock_settime,
+#ifndef OVERRIDE_64_clock_settime
+SC_TRACE_EVENT(clock_settime,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, const struct timespec * tp),
        TP_ARGS(sc_exit(ret,) which_clock, tp),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_in(__field_hex(const struct timespec *, tp))),
@@ -540,8 +540,8 @@ SC_TRACE_EVENT(sys_clock_settime,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_clock_gettime
-SC_TRACE_EVENT(sys_clock_gettime,
+#ifndef OVERRIDE_64_clock_gettime
+SC_TRACE_EVENT(clock_gettime,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct timespec * tp),
        TP_ARGS(sc_exit(ret,) which_clock, tp),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_out(__field_hex(struct timespec *, tp))),
@@ -549,8 +549,8 @@ SC_TRACE_EVENT(sys_clock_gettime,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_clock_getres
-SC_TRACE_EVENT(sys_clock_getres,
+#ifndef OVERRIDE_64_clock_getres
+SC_TRACE_EVENT(clock_getres,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct timespec * tp),
        TP_ARGS(sc_exit(ret,) which_clock, tp),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_out(__field_hex(struct timespec *, tp))),
@@ -558,8 +558,8 @@ SC_TRACE_EVENT(sys_clock_getres,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_utimes
-SC_TRACE_EVENT(sys_utimes,
+#ifndef OVERRIDE_64_utimes
+SC_TRACE_EVENT(utimes,
        TP_PROTO(sc_exit(long ret,) char * filename, struct timeval * utimes),
        TP_ARGS(sc_exit(ret,) filename, utimes),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct timeval *, utimes))),
@@ -567,8 +567,8 @@ SC_TRACE_EVENT(sys_utimes,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_mq_notify
-SC_TRACE_EVENT(sys_mq_notify,
+#ifndef OVERRIDE_64_mq_notify
+SC_TRACE_EVENT(mq_notify,
        TP_PROTO(sc_exit(long ret,) mqd_t mqdes, const struct sigevent * u_notification),
        TP_ARGS(sc_exit(ret,) mqdes, u_notification),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(mqd_t, mqdes)) sc_in(__field_hex(const struct sigevent *, u_notification))),
@@ -576,8 +576,8 @@ SC_TRACE_EVENT(sys_mq_notify,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_set_robust_list
-SC_TRACE_EVENT(sys_set_robust_list,
+#ifndef OVERRIDE_64_set_robust_list
+SC_TRACE_EVENT(set_robust_list,
        TP_PROTO(sc_exit(long ret,) struct robust_list_head * head, size_t len),
        TP_ARGS(sc_exit(ret,) head, len),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct robust_list_head *, head)) sc_in(__field(size_t, len))),
@@ -585,8 +585,8 @@ SC_TRACE_EVENT(sys_set_robust_list,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_timerfd_gettime
-SC_TRACE_EVENT(sys_timerfd_gettime,
+#ifndef OVERRIDE_64_timerfd_gettime
+SC_TRACE_EVENT(timerfd_gettime,
        TP_PROTO(sc_exit(long ret,) int ufd, struct itimerspec * otmr),
        TP_ARGS(sc_exit(ret,) ufd, otmr),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_out(__field_hex(struct itimerspec *, otmr))),
@@ -594,8 +594,8 @@ SC_TRACE_EVENT(sys_timerfd_gettime,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_pipe2
-SC_TRACE_EVENT(sys_pipe2,
+#ifndef OVERRIDE_64_pipe2
+SC_TRACE_EVENT(pipe2,
        TP_PROTO(sc_exit(long ret,) int * fildes, int flags),
        TP_ARGS(sc_exit(ret,) fildes, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(int *, fildes)) sc_in(__field(int, flags))),
@@ -603,8 +603,8 @@ SC_TRACE_EVENT(sys_pipe2,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_clock_adjtime
-SC_TRACE_EVENT(sys_clock_adjtime,
+#ifndef OVERRIDE_64_clock_adjtime
+SC_TRACE_EVENT(clock_adjtime,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct timex * utx),
        TP_ARGS(sc_exit(ret,) which_clock, utx),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_inout(__field_hex(struct timex *, utx))),
@@ -612,8 +612,8 @@ SC_TRACE_EVENT(sys_clock_adjtime,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_read
-SC_TRACE_EVENT(sys_read,
+#ifndef OVERRIDE_64_read
+SC_TRACE_EVENT(read,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, char * buf, size_t count),
        TP_ARGS(sc_exit(ret,) fd, buf, count),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(char *, buf)) sc_in(__field(size_t, count))),
@@ -621,8 +621,8 @@ SC_TRACE_EVENT(sys_read,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_write
-SC_TRACE_EVENT(sys_write,
+#ifndef OVERRIDE_64_write
+SC_TRACE_EVENT(write,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, const char * buf, size_t count),
        TP_ARGS(sc_exit(ret,) fd, buf, count),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field_hex(const char *, buf)) sc_in(__field(size_t, count))),
@@ -630,8 +630,8 @@ SC_TRACE_EVENT(sys_write,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_open
-SC_TRACE_EVENT(sys_open,
+#ifndef OVERRIDE_64_open
+SC_TRACE_EVENT(open,
        TP_PROTO(sc_exit(long ret,) const char * filename, int flags, umode_t mode),
        TP_ARGS(sc_exit(ret,) filename, flags, mode),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, flags)) sc_in(__field(umode_t, mode))),
@@ -639,8 +639,8 @@ SC_TRACE_EVENT(sys_open,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_poll
-SC_TRACE_EVENT(sys_poll,
+#ifndef OVERRIDE_64_poll
+SC_TRACE_EVENT(poll,
        TP_PROTO(sc_exit(long ret,) struct pollfd * ufds, unsigned int nfds, int timeout_msecs),
        TP_ARGS(sc_exit(ret,) ufds, nfds, timeout_msecs),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct pollfd *, ufds)) sc_in(__field(unsigned int, nfds)) sc_in(__field(int, timeout_msecs))),
@@ -648,8 +648,8 @@ SC_TRACE_EVENT(sys_poll,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_readv
-SC_TRACE_EVENT(sys_readv,
+#ifndef OVERRIDE_64_readv
+SC_TRACE_EVENT(readv,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_inout(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen))),
@@ -657,8 +657,8 @@ SC_TRACE_EVENT(sys_readv,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_writev
-SC_TRACE_EVENT(sys_writev,
+#ifndef OVERRIDE_64_writev
+SC_TRACE_EVENT(writev,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_inout(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen))),
@@ -666,8 +666,8 @@ SC_TRACE_EVENT(sys_writev,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_mincore
-SC_TRACE_EVENT(sys_mincore,
+#ifndef OVERRIDE_64_mincore
+SC_TRACE_EVENT(mincore,
        TP_PROTO(sc_exit(long ret,) unsigned long start, size_t len, unsigned char * vec),
        TP_ARGS(sc_exit(ret,) start, len, vec),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(size_t, len)) sc_out(__field_hex(unsigned char *, vec))),
@@ -675,8 +675,8 @@ SC_TRACE_EVENT(sys_mincore,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_shmat
-SC_TRACE_EVENT(sys_shmat,
+#ifndef OVERRIDE_64_shmat
+SC_TRACE_EVENT(shmat,
        TP_PROTO(sc_exit(long ret,) int shmid, char * shmaddr, int shmflg),
        TP_ARGS(sc_exit(ret,) shmid, shmaddr, shmflg),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, shmid)) sc_in(__field_hex(char *, shmaddr)) sc_in(__field(int, shmflg))),
@@ -684,8 +684,8 @@ SC_TRACE_EVENT(sys_shmat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_shmctl
-SC_TRACE_EVENT(sys_shmctl,
+#ifndef OVERRIDE_64_shmctl
+SC_TRACE_EVENT(shmctl,
        TP_PROTO(sc_exit(long ret,) int shmid, int cmd, struct shmid_ds * buf),
        TP_ARGS(sc_exit(ret,) shmid, cmd, buf),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, shmid)) sc_in(__field(int, cmd)) sc_inout(__field_hex(struct shmid_ds *, buf))),
@@ -693,8 +693,8 @@ SC_TRACE_EVENT(sys_shmctl,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_setitimer
-SC_TRACE_EVENT(sys_setitimer,
+#ifndef OVERRIDE_64_setitimer
+SC_TRACE_EVENT(setitimer,
        TP_PROTO(sc_exit(long ret,) int which, struct itimerval * value, struct itimerval * ovalue),
        TP_ARGS(sc_exit(ret,) which, value, ovalue),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field_hex(struct itimerval *, value)) sc_out(__field_hex(struct itimerval *, ovalue))),
@@ -702,8 +702,8 @@ SC_TRACE_EVENT(sys_setitimer,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_connect
-SC_TRACE_EVENT(sys_connect,
+#ifndef OVERRIDE_64_connect
+SC_TRACE_EVENT(connect,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * uservaddr, int addrlen),
        TP_ARGS(sc_exit(ret,) fd, uservaddr, addrlen),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct sockaddr *, uservaddr)) sc_in(__field_hex(int, addrlen))),
@@ -711,8 +711,8 @@ SC_TRACE_EVENT(sys_connect,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_accept
-SC_TRACE_EVENT(sys_accept,
+#ifndef OVERRIDE_64_accept
+SC_TRACE_EVENT(accept,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * upeer_sockaddr, int * upeer_addrlen),
        TP_ARGS(sc_exit(ret,) fd, upeer_sockaddr, upeer_addrlen),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, upeer_sockaddr)) sc_inout(__field_hex(int *, upeer_addrlen))),
@@ -720,8 +720,8 @@ SC_TRACE_EVENT(sys_accept,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_sendmsg
-SC_TRACE_EVENT(sys_sendmsg,
+#ifndef OVERRIDE_64_sendmsg
+SC_TRACE_EVENT(sendmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct msghdr * msg, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, msg, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct msghdr *, msg)) sc_in(__field(unsigned int, flags))),
@@ -729,8 +729,8 @@ SC_TRACE_EVENT(sys_sendmsg,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_recvmsg
-SC_TRACE_EVENT(sys_recvmsg,
+#ifndef OVERRIDE_64_recvmsg
+SC_TRACE_EVENT(recvmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct msghdr * msg, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, msg, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_inout(__field_hex(struct msghdr *, msg)) sc_in(__field(unsigned int, flags))),
@@ -738,8 +738,8 @@ SC_TRACE_EVENT(sys_recvmsg,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_bind
-SC_TRACE_EVENT(sys_bind,
+#ifndef OVERRIDE_64_bind
+SC_TRACE_EVENT(bind,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * umyaddr, int addrlen),
        TP_ARGS(sc_exit(ret,) fd, umyaddr, addrlen),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct sockaddr *, umyaddr)) sc_in(__field_hex(int, addrlen))),
@@ -747,8 +747,8 @@ SC_TRACE_EVENT(sys_bind,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_getsockname
-SC_TRACE_EVENT(sys_getsockname,
+#ifndef OVERRIDE_64_getsockname
+SC_TRACE_EVENT(getsockname,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * usockaddr, int * usockaddr_len),
        TP_ARGS(sc_exit(ret,) fd, usockaddr, usockaddr_len),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, usockaddr)) sc_inout(__field_hex(int *, usockaddr_len))),
@@ -756,8 +756,8 @@ SC_TRACE_EVENT(sys_getsockname,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_getpeername
-SC_TRACE_EVENT(sys_getpeername,
+#ifndef OVERRIDE_64_getpeername
+SC_TRACE_EVENT(getpeername,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * usockaddr, int * usockaddr_len),
        TP_ARGS(sc_exit(ret,) fd, usockaddr, usockaddr_len),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, usockaddr)) sc_inout(__field_hex(int *, usockaddr_len))),
@@ -765,8 +765,8 @@ SC_TRACE_EVENT(sys_getpeername,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_semop
-SC_TRACE_EVENT(sys_semop,
+#ifndef OVERRIDE_64_semop
+SC_TRACE_EVENT(semop,
        TP_PROTO(sc_exit(long ret,) int semid, struct sembuf * tsops, unsigned nsops),
        TP_ARGS(sc_exit(ret,) semid, tsops, nsops),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, semid)) sc_in(__field_hex(struct sembuf *, tsops)) sc_in(__field(unsigned, nsops))),
@@ -774,8 +774,8 @@ SC_TRACE_EVENT(sys_semop,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_msgctl
-SC_TRACE_EVENT(sys_msgctl,
+#ifndef OVERRIDE_64_msgctl
+SC_TRACE_EVENT(msgctl,
        TP_PROTO(sc_exit(long ret,) int msqid, int cmd, struct msqid_ds * buf),
        TP_ARGS(sc_exit(ret,) msqid, cmd, buf),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, msqid)) sc_in(__field(int, cmd)) sc_inout(__field_hex(struct msqid_ds *, buf))),
@@ -783,8 +783,8 @@ SC_TRACE_EVENT(sys_msgctl,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_getdents
-SC_TRACE_EVENT(sys_getdents,
+#ifndef OVERRIDE_64_getdents
+SC_TRACE_EVENT(getdents,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct linux_dirent * dirent, unsigned int count),
        TP_ARGS(sc_exit(ret,) fd, dirent, count),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct linux_dirent *, dirent)) sc_in(__field(unsigned int, count))),
@@ -792,8 +792,8 @@ SC_TRACE_EVENT(sys_getdents,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_readlink
-SC_TRACE_EVENT(sys_readlink,
+#ifndef OVERRIDE_64_readlink
+SC_TRACE_EVENT(readlink,
        TP_PROTO(sc_exit(long ret,) const char * path, char * buf, int bufsiz),
        TP_ARGS(sc_exit(ret,) path, buf, bufsiz),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(path, path)) sc_out(__field_hex(char *, buf)) sc_in(__field(int, bufsiz))),
@@ -801,8 +801,8 @@ SC_TRACE_EVENT(sys_readlink,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_chown
-SC_TRACE_EVENT(sys_chown,
+#ifndef OVERRIDE_64_chown
+SC_TRACE_EVENT(chown,
        TP_PROTO(sc_exit(long ret,) const char * filename, uid_t user, gid_t group),
        TP_ARGS(sc_exit(ret,) filename, user, group),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group))),
@@ -810,8 +810,8 @@ SC_TRACE_EVENT(sys_chown,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_lchown
-SC_TRACE_EVENT(sys_lchown,
+#ifndef OVERRIDE_64_lchown
+SC_TRACE_EVENT(lchown,
        TP_PROTO(sc_exit(long ret,) const char * filename, uid_t user, gid_t group),
        TP_ARGS(sc_exit(ret,) filename, user, group),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group))),
@@ -819,8 +819,8 @@ SC_TRACE_EVENT(sys_lchown,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_syslog
-SC_TRACE_EVENT(sys_syslog,
+#ifndef OVERRIDE_64_syslog
+SC_TRACE_EVENT(syslog,
        TP_PROTO(sc_exit(long ret,) int type, char * buf, int len),
        TP_ARGS(sc_exit(ret,) type, buf, len),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, type)) sc_out(__field_hex(char *, buf)) sc_in(__field(int, len))),
@@ -828,8 +828,8 @@ SC_TRACE_EVENT(sys_syslog,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_getresuid
-SC_TRACE_EVENT(sys_getresuid,
+#ifndef OVERRIDE_64_getresuid
+SC_TRACE_EVENT(getresuid,
        TP_PROTO(sc_exit(long ret,) uid_t * ruidp, uid_t * euidp, uid_t * suidp),
        TP_ARGS(sc_exit(ret,) ruidp, euidp, suidp),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(uid_t *, ruidp)) sc_out(__field_hex(uid_t *, euidp)) sc_out(__field_hex(uid_t *, suidp))),
@@ -837,8 +837,8 @@ SC_TRACE_EVENT(sys_getresuid,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_getresgid
-SC_TRACE_EVENT(sys_getresgid,
+#ifndef OVERRIDE_64_getresgid
+SC_TRACE_EVENT(getresgid,
        TP_PROTO(sc_exit(long ret,) gid_t * rgidp, gid_t * egidp, gid_t * sgidp),
        TP_ARGS(sc_exit(ret,) rgidp, egidp, sgidp),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(gid_t *, rgidp)) sc_out(__field_hex(gid_t *, egidp)) sc_out(__field_hex(gid_t *, sgidp))),
@@ -846,8 +846,8 @@ SC_TRACE_EVENT(sys_getresgid,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_rt_sigqueueinfo
-SC_TRACE_EVENT(sys_rt_sigqueueinfo,
+#ifndef OVERRIDE_64_rt_sigqueueinfo
+SC_TRACE_EVENT(rt_sigqueueinfo,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int sig, siginfo_t * uinfo),
        TP_ARGS(sc_exit(ret,) pid, sig, uinfo),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig)) sc_in(__field_hex(siginfo_t *, uinfo))),
@@ -855,8 +855,8 @@ SC_TRACE_EVENT(sys_rt_sigqueueinfo,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_mknod
-SC_TRACE_EVENT(sys_mknod,
+#ifndef OVERRIDE_64_mknod
+SC_TRACE_EVENT(mknod,
        TP_PROTO(sc_exit(long ret,) const char * filename, umode_t mode, unsigned dev),
        TP_ARGS(sc_exit(ret,) filename, mode, dev),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode)) sc_in(__field(unsigned, dev))),
@@ -864,8 +864,8 @@ SC_TRACE_EVENT(sys_mknod,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_sched_setscheduler
-SC_TRACE_EVENT(sys_sched_setscheduler,
+#ifndef OVERRIDE_64_sched_setscheduler
+SC_TRACE_EVENT(sched_setscheduler,
        TP_PROTO(sc_exit(long ret,) pid_t pid, int policy, struct sched_param * param),
        TP_ARGS(sc_exit(ret,) pid, policy, param),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(int, policy)) sc_in(__field_hex(struct sched_param *, param))),
@@ -873,8 +873,8 @@ SC_TRACE_EVENT(sys_sched_setscheduler,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_init_module
-SC_TRACE_EVENT(sys_init_module,
+#ifndef OVERRIDE_64_init_module
+SC_TRACE_EVENT(init_module,
        TP_PROTO(sc_exit(long ret,) void * umod, unsigned long len, const char * uargs),
        TP_ARGS(sc_exit(ret,) umod, len, uargs),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(void *, umod)) sc_in(__field(unsigned long, len)) sc_in(__field_hex(const char *, uargs))),
@@ -882,8 +882,8 @@ SC_TRACE_EVENT(sys_init_module,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_listxattr
-SC_TRACE_EVENT(sys_listxattr,
+#ifndef OVERRIDE_64_listxattr
+SC_TRACE_EVENT(listxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, char * list, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, list, size),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(char *, list)) sc_in(__field(size_t, size))),
@@ -891,8 +891,8 @@ SC_TRACE_EVENT(sys_listxattr,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_llistxattr
-SC_TRACE_EVENT(sys_llistxattr,
+#ifndef OVERRIDE_64_llistxattr
+SC_TRACE_EVENT(llistxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, char * list, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, list, size),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(char *, list)) sc_in(__field(size_t, size))),
@@ -900,8 +900,8 @@ SC_TRACE_EVENT(sys_llistxattr,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_flistxattr
-SC_TRACE_EVENT(sys_flistxattr,
+#ifndef OVERRIDE_64_flistxattr
+SC_TRACE_EVENT(flistxattr,
        TP_PROTO(sc_exit(long ret,) int fd, char * list, size_t size),
        TP_ARGS(sc_exit(ret,) fd, list, size),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(char *, list)) sc_in(__field(size_t, size))),
@@ -909,8 +909,8 @@ SC_TRACE_EVENT(sys_flistxattr,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_sched_setaffinity
-SC_TRACE_EVENT(sys_sched_setaffinity,
+#ifndef OVERRIDE_64_sched_setaffinity
+SC_TRACE_EVENT(sched_setaffinity,
        TP_PROTO(sc_exit(long ret,) pid_t pid, unsigned int len, unsigned long * user_mask_ptr),
        TP_ARGS(sc_exit(ret,) pid, len, user_mask_ptr),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(unsigned int, len)) sc_in(__field_hex(unsigned long *, user_mask_ptr))),
@@ -918,8 +918,8 @@ SC_TRACE_EVENT(sys_sched_setaffinity,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_sched_getaffinity
-SC_TRACE_EVENT(sys_sched_getaffinity,
+#ifndef OVERRIDE_64_sched_getaffinity
+SC_TRACE_EVENT(sched_getaffinity,
        TP_PROTO(sc_exit(long ret,) pid_t pid, unsigned int len, unsigned long * user_mask_ptr),
        TP_ARGS(sc_exit(ret,) pid, len, user_mask_ptr),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(unsigned int, len)) sc_out(__field_hex(unsigned long *, user_mask_ptr))),
@@ -927,8 +927,8 @@ SC_TRACE_EVENT(sys_sched_getaffinity,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_io_submit
-SC_TRACE_EVENT(sys_io_submit,
+#ifndef OVERRIDE_64_io_submit
+SC_TRACE_EVENT(io_submit,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx_id, long nr, struct iocb * * iocbpp),
        TP_ARGS(sc_exit(ret,) ctx_id, nr, iocbpp),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx_id)) sc_in(__field(long, nr)) sc_in(__field_hex(struct iocb * *, iocbpp))),
@@ -936,8 +936,8 @@ SC_TRACE_EVENT(sys_io_submit,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_io_cancel
-SC_TRACE_EVENT(sys_io_cancel,
+#ifndef OVERRIDE_64_io_cancel
+SC_TRACE_EVENT(io_cancel,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx_id, struct iocb * iocb, struct io_event * result),
        TP_ARGS(sc_exit(ret,) ctx_id, iocb, result),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx_id)) sc_in(__field_hex(struct iocb *, iocb)) sc_out(__field_hex(struct io_event *, result))),
@@ -945,8 +945,8 @@ SC_TRACE_EVENT(sys_io_cancel,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_lookup_dcookie
-SC_TRACE_EVENT(sys_lookup_dcookie,
+#ifndef OVERRIDE_64_lookup_dcookie
+SC_TRACE_EVENT(lookup_dcookie,
        TP_PROTO(sc_exit(long ret,) u64 cookie64, char * buf, size_t len),
        TP_ARGS(sc_exit(ret,) cookie64, buf, len),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(u64, cookie64)) sc_out(__field_hex(char *, buf)) sc_in(__field(size_t, len))),
@@ -954,8 +954,8 @@ SC_TRACE_EVENT(sys_lookup_dcookie,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_getdents64
-SC_TRACE_EVENT(sys_getdents64,
+#ifndef OVERRIDE_64_getdents64
+SC_TRACE_EVENT(getdents64,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, struct linux_dirent64 * dirent, unsigned int count),
        TP_ARGS(sc_exit(ret,) fd, dirent, count),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(struct linux_dirent64 *, dirent)) sc_in(__field(unsigned int, count))),
@@ -963,8 +963,8 @@ SC_TRACE_EVENT(sys_getdents64,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_timer_create
-SC_TRACE_EVENT(sys_timer_create,
+#ifndef OVERRIDE_64_timer_create
+SC_TRACE_EVENT(timer_create,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, struct sigevent * timer_event_spec, timer_t * created_timer_id),
        TP_ARGS(sc_exit(ret,) which_clock, timer_event_spec, created_timer_id),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_in(__field_hex(struct sigevent *, timer_event_spec)) sc_out(__field_hex(timer_t *, created_timer_id))),
@@ -972,8 +972,8 @@ SC_TRACE_EVENT(sys_timer_create,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_set_mempolicy
-SC_TRACE_EVENT(sys_set_mempolicy,
+#ifndef OVERRIDE_64_set_mempolicy
+SC_TRACE_EVENT(set_mempolicy,
        TP_PROTO(sc_exit(long ret,) int mode, unsigned long * nmask, unsigned long maxnode),
        TP_ARGS(sc_exit(ret,) mode, nmask, maxnode),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, mode)) sc_in(__field_hex(unsigned long *, nmask)) sc_in(__field(unsigned long, maxnode))),
@@ -981,8 +981,8 @@ SC_TRACE_EVENT(sys_set_mempolicy,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_mq_getsetattr
-SC_TRACE_EVENT(sys_mq_getsetattr,
+#ifndef OVERRIDE_64_mq_getsetattr
+SC_TRACE_EVENT(mq_getsetattr,
        TP_PROTO(sc_exit(long ret,) mqd_t mqdes, const struct mq_attr * u_mqstat, struct mq_attr * u_omqstat),
        TP_ARGS(sc_exit(ret,) mqdes, u_mqstat, u_omqstat),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(mqd_t, mqdes)) sc_in(__field_hex(const struct mq_attr *, u_mqstat)) sc_out(__field_hex(struct mq_attr *, u_omqstat))),
@@ -990,8 +990,8 @@ SC_TRACE_EVENT(sys_mq_getsetattr,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_inotify_add_watch
-SC_TRACE_EVENT(sys_inotify_add_watch,
+#ifndef OVERRIDE_64_inotify_add_watch
+SC_TRACE_EVENT(inotify_add_watch,
        TP_PROTO(sc_exit(long ret,) int fd, const char * pathname, u32 mask),
        TP_ARGS(sc_exit(ret,) fd, pathname, mask),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(u32, mask))),
@@ -999,8 +999,8 @@ SC_TRACE_EVENT(sys_inotify_add_watch,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_mkdirat
-SC_TRACE_EVENT(sys_mkdirat,
+#ifndef OVERRIDE_64_mkdirat
+SC_TRACE_EVENT(mkdirat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * pathname, umode_t mode),
        TP_ARGS(sc_exit(ret,) dfd, pathname, mode),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(umode_t, mode))),
@@ -1008,8 +1008,8 @@ SC_TRACE_EVENT(sys_mkdirat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_futimesat
-SC_TRACE_EVENT(sys_futimesat,
+#ifndef OVERRIDE_64_futimesat
+SC_TRACE_EVENT(futimesat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, struct timeval * utimes),
        TP_ARGS(sc_exit(ret,) dfd, filename, utimes),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct timeval *, utimes))),
@@ -1017,8 +1017,8 @@ SC_TRACE_EVENT(sys_futimesat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_unlinkat
-SC_TRACE_EVENT(sys_unlinkat,
+#ifndef OVERRIDE_64_unlinkat
+SC_TRACE_EVENT(unlinkat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * pathname, int flag),
        TP_ARGS(sc_exit(ret,) dfd, pathname, flag),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname)) sc_in(__field(int, flag))),
@@ -1026,8 +1026,8 @@ SC_TRACE_EVENT(sys_unlinkat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_symlinkat
-SC_TRACE_EVENT(sys_symlinkat,
+#ifndef OVERRIDE_64_symlinkat
+SC_TRACE_EVENT(symlinkat,
        TP_PROTO(sc_exit(long ret,) const char * oldname, int newdfd, const char * newname),
        TP_ARGS(sc_exit(ret,) oldname, newdfd, newname),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(oldname, oldname)) sc_in(__field(int, newdfd)) sc_in(__string_from_user(newname, newname))),
@@ -1035,8 +1035,8 @@ SC_TRACE_EVENT(sys_symlinkat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_fchmodat
-SC_TRACE_EVENT(sys_fchmodat,
+#ifndef OVERRIDE_64_fchmodat
+SC_TRACE_EVENT(fchmodat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, umode_t mode),
        TP_ARGS(sc_exit(ret,) dfd, filename, mode),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode))),
@@ -1044,8 +1044,8 @@ SC_TRACE_EVENT(sys_fchmodat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_faccessat
-SC_TRACE_EVENT(sys_faccessat,
+#ifndef OVERRIDE_64_faccessat
+SC_TRACE_EVENT(faccessat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, int mode),
        TP_ARGS(sc_exit(ret,) dfd, filename, mode),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, mode))),
@@ -1053,8 +1053,8 @@ SC_TRACE_EVENT(sys_faccessat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_get_robust_list
-SC_TRACE_EVENT(sys_get_robust_list,
+#ifndef OVERRIDE_64_get_robust_list
+SC_TRACE_EVENT(get_robust_list,
        TP_PROTO(sc_exit(long ret,) int pid, struct robust_list_head * * head_ptr, size_t * len_ptr),
        TP_ARGS(sc_exit(ret,) pid, head_ptr, len_ptr),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, pid)) sc_out(__field_hex(struct robust_list_head * *, head_ptr)) sc_out(__field_hex(size_t *, len_ptr))),
@@ -1062,8 +1062,8 @@ SC_TRACE_EVENT(sys_get_robust_list,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_signalfd
-SC_TRACE_EVENT(sys_signalfd,
+#ifndef OVERRIDE_64_signalfd
+SC_TRACE_EVENT(signalfd,
        TP_PROTO(sc_exit(long ret,) int ufd, sigset_t * user_mask, size_t sizemask),
        TP_ARGS(sc_exit(ret,) ufd, user_mask, sizemask),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_in(__field_hex(sigset_t *, user_mask)) sc_in(__field(size_t, sizemask))),
@@ -1071,8 +1071,8 @@ SC_TRACE_EVENT(sys_signalfd,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_open_by_handle_at
-SC_TRACE_EVENT(sys_open_by_handle_at,
+#ifndef OVERRIDE_64_open_by_handle_at
+SC_TRACE_EVENT(open_by_handle_at,
        TP_PROTO(sc_exit(long ret,) int mountdirfd, struct file_handle * handle, int flags),
        TP_ARGS(sc_exit(ret,) mountdirfd, handle, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, mountdirfd)) sc_in(__field_hex(struct file_handle *, handle)) sc_in(__field(int, flags))),
@@ -1080,8 +1080,8 @@ SC_TRACE_EVENT(sys_open_by_handle_at,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_getcpu
-SC_TRACE_EVENT(sys_getcpu,
+#ifndef OVERRIDE_64_getcpu
+SC_TRACE_EVENT(getcpu,
        TP_PROTO(sc_exit(long ret,) unsigned * cpup, unsigned * nodep, struct getcpu_cache * unused),
        TP_ARGS(sc_exit(ret,) cpup, nodep, unused),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(unsigned *, cpup)) sc_out(__field_hex(unsigned *, nodep)) sc_inout(__field_hex(struct getcpu_cache *, unused))),
@@ -1089,8 +1089,8 @@ SC_TRACE_EVENT(sys_getcpu,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_finit_module
-SC_TRACE_EVENT(sys_finit_module,
+#ifndef OVERRIDE_64_finit_module
+SC_TRACE_EVENT(finit_module,
        TP_PROTO(sc_exit(long ret,) int fd, const char * uargs, int flags),
        TP_ARGS(sc_exit(ret,) fd, uargs, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(const char *, uargs)) sc_in(__field(int, flags))),
@@ -1098,8 +1098,8 @@ SC_TRACE_EVENT(sys_finit_module,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_rt_sigaction
-SC_TRACE_EVENT(sys_rt_sigaction,
+#ifndef OVERRIDE_64_rt_sigaction
+SC_TRACE_EVENT(rt_sigaction,
        TP_PROTO(sc_exit(long ret,) int sig, const struct sigaction * act, struct sigaction * oact, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) sig, act, oact, sigsetsize),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, sig)) sc_in(__field_hex(const struct sigaction *, act)) sc_out(__field_hex(struct sigaction *, oact)) sc_in(__field(size_t, sigsetsize))),
@@ -1107,8 +1107,8 @@ SC_TRACE_EVENT(sys_rt_sigaction,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_rt_sigprocmask
-SC_TRACE_EVENT(sys_rt_sigprocmask,
+#ifndef OVERRIDE_64_rt_sigprocmask
+SC_TRACE_EVENT(rt_sigprocmask,
        TP_PROTO(sc_exit(long ret,) int how, sigset_t * nset, sigset_t * oset, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) how, nset, oset, sigsetsize),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, how)) sc_in(__field_hex(sigset_t *, nset)) sc_out(__field_hex(sigset_t *, oset)) sc_in(__field(size_t, sigsetsize))),
@@ -1116,8 +1116,8 @@ SC_TRACE_EVENT(sys_rt_sigprocmask,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_pread64
-SC_TRACE_EVENT(sys_pread64,
+#ifndef OVERRIDE_64_pread64
+SC_TRACE_EVENT(pread64,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, char * buf, size_t count, loff_t pos),
        TP_ARGS(sc_exit(ret,) fd, buf, count, pos),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_out(__field_hex(char *, buf)) sc_in(__field(size_t, count)) sc_in(__field(loff_t, pos))),
@@ -1125,8 +1125,8 @@ SC_TRACE_EVENT(sys_pread64,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_pwrite64
-SC_TRACE_EVENT(sys_pwrite64,
+#ifndef OVERRIDE_64_pwrite64
+SC_TRACE_EVENT(pwrite64,
        TP_PROTO(sc_exit(long ret,) unsigned int fd, const char * buf, size_t count, loff_t pos),
        TP_ARGS(sc_exit(ret,) fd, buf, count, pos),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, fd)) sc_in(__field_hex(const char *, buf)) sc_in(__field(size_t, count)) sc_in(__field(loff_t, pos))),
@@ -1134,8 +1134,8 @@ SC_TRACE_EVENT(sys_pwrite64,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_sendfile64
-SC_TRACE_EVENT(sys_sendfile64,
+#ifndef OVERRIDE_64_sendfile64
+SC_TRACE_EVENT(sendfile64,
        TP_PROTO(sc_exit(long ret,) int out_fd, int in_fd, loff_t * offset, size_t count),
        TP_ARGS(sc_exit(ret,) out_fd, in_fd, offset, count),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, out_fd)) sc_in(__field(int, in_fd)) sc_inout(__field_hex(loff_t *, offset)) sc_in(__field(size_t, count))),
@@ -1143,8 +1143,8 @@ SC_TRACE_EVENT(sys_sendfile64,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_socketpair
-SC_TRACE_EVENT(sys_socketpair,
+#ifndef OVERRIDE_64_socketpair
+SC_TRACE_EVENT(socketpair,
        TP_PROTO(sc_exit(long ret,) int family, int type, int protocol, int * usockvec),
        TP_ARGS(sc_exit(ret,) family, type, protocol, usockvec),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, family)) sc_in(__field(int, type)) sc_in(__field(int, protocol)) sc_out(__field_hex(int *, usockvec))),
@@ -1152,8 +1152,8 @@ SC_TRACE_EVENT(sys_socketpair,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_wait4
-SC_TRACE_EVENT(sys_wait4,
+#ifndef OVERRIDE_64_wait4
+SC_TRACE_EVENT(wait4,
        TP_PROTO(sc_exit(long ret,) pid_t upid, int * stat_addr, int options, struct rusage * ru),
        TP_ARGS(sc_exit(ret,) upid, stat_addr, options, ru),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, upid)) sc_out(__field_hex(int *, stat_addr)) sc_in(__field(int, options)) sc_out(__field_hex(struct rusage *, ru))),
@@ -1161,8 +1161,8 @@ SC_TRACE_EVENT(sys_wait4,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_msgsnd
-SC_TRACE_EVENT(sys_msgsnd,
+#ifndef OVERRIDE_64_msgsnd
+SC_TRACE_EVENT(msgsnd,
        TP_PROTO(sc_exit(long ret,) int msqid, struct msgbuf * msgp, size_t msgsz, int msgflg),
        TP_ARGS(sc_exit(ret,) msqid, msgp, msgsz, msgflg),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, msqid)) sc_in(__field_hex(struct msgbuf *, msgp)) sc_in(__field(size_t, msgsz)) sc_in(__field(int, msgflg))),
@@ -1170,8 +1170,8 @@ SC_TRACE_EVENT(sys_msgsnd,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_rt_sigtimedwait
-SC_TRACE_EVENT(sys_rt_sigtimedwait,
+#ifndef OVERRIDE_64_rt_sigtimedwait
+SC_TRACE_EVENT(rt_sigtimedwait,
        TP_PROTO(sc_exit(long ret,) const sigset_t * uthese, siginfo_t * uinfo, const struct timespec * uts, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) uthese, uinfo, uts, sigsetsize),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(const sigset_t *, uthese)) sc_out(__field_hex(siginfo_t *, uinfo)) sc_in(__field_hex(const struct timespec *, uts)) sc_in(__field(size_t, sigsetsize))),
@@ -1179,8 +1179,8 @@ SC_TRACE_EVENT(sys_rt_sigtimedwait,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_reboot
-SC_TRACE_EVENT(sys_reboot,
+#ifndef OVERRIDE_64_reboot
+SC_TRACE_EVENT(reboot,
        TP_PROTO(sc_exit(long ret,) int magic1, int magic2, unsigned int cmd, void * arg),
        TP_ARGS(sc_exit(ret,) magic1, magic2, cmd, arg),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, magic1)) sc_in(__field(int, magic2)) sc_in(__field(unsigned int, cmd)) sc_in(__field_hex(void *, arg))),
@@ -1188,8 +1188,8 @@ SC_TRACE_EVENT(sys_reboot,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_quotactl
-SC_TRACE_EVENT(sys_quotactl,
+#ifndef OVERRIDE_64_quotactl
+SC_TRACE_EVENT(quotactl,
        TP_PROTO(sc_exit(long ret,) unsigned int cmd, const char * special, qid_t id, void * addr),
        TP_ARGS(sc_exit(ret,) cmd, special, id, addr),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned int, cmd)) sc_in(__field_hex(const char *, special)) sc_in(__field(qid_t, id)) sc_inout(__field_hex(void *, addr))),
@@ -1197,8 +1197,8 @@ SC_TRACE_EVENT(sys_quotactl,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_getxattr
-SC_TRACE_EVENT(sys_getxattr,
+#ifndef OVERRIDE_64_getxattr
+SC_TRACE_EVENT(getxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, void * value, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_out(__field_hex(void *, value)) sc_in(__field(size_t, size))),
@@ -1206,8 +1206,8 @@ SC_TRACE_EVENT(sys_getxattr,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_lgetxattr
-SC_TRACE_EVENT(sys_lgetxattr,
+#ifndef OVERRIDE_64_lgetxattr
+SC_TRACE_EVENT(lgetxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, void * value, size_t size),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_out(__field_hex(void *, value)) sc_in(__field(size_t, size))),
@@ -1215,8 +1215,8 @@ SC_TRACE_EVENT(sys_lgetxattr,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_fgetxattr
-SC_TRACE_EVENT(sys_fgetxattr,
+#ifndef OVERRIDE_64_fgetxattr
+SC_TRACE_EVENT(fgetxattr,
        TP_PROTO(sc_exit(long ret,) int fd, const char * name, void * value, size_t size),
        TP_ARGS(sc_exit(ret,) fd, name, value, size),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(name, name)) sc_out(__field_hex(void *, value)) sc_in(__field(size_t, size))),
@@ -1224,8 +1224,8 @@ SC_TRACE_EVENT(sys_fgetxattr,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_semtimedop
-SC_TRACE_EVENT(sys_semtimedop,
+#ifndef OVERRIDE_64_semtimedop
+SC_TRACE_EVENT(semtimedop,
        TP_PROTO(sc_exit(long ret,) int semid, struct sembuf * tsops, unsigned nsops, const struct timespec * timeout),
        TP_ARGS(sc_exit(ret,) semid, tsops, nsops, timeout),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, semid)) sc_in(__field_hex(struct sembuf *, tsops)) sc_in(__field(unsigned, nsops)) sc_inout(__field_hex(const struct timespec *, timeout))),
@@ -1233,8 +1233,8 @@ SC_TRACE_EVENT(sys_semtimedop,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_timer_settime
-SC_TRACE_EVENT(sys_timer_settime,
+#ifndef OVERRIDE_64_timer_settime
+SC_TRACE_EVENT(timer_settime,
        TP_PROTO(sc_exit(long ret,) timer_t timer_id, int flags, const struct itimerspec * new_setting, struct itimerspec * old_setting),
        TP_ARGS(sc_exit(ret,) timer_id, flags, new_setting, old_setting),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(timer_t, timer_id)) sc_in(__field(int, flags)) sc_in(__field_hex(const struct itimerspec *, new_setting)) sc_out(__field_hex(struct itimerspec *, old_setting))),
@@ -1242,8 +1242,8 @@ SC_TRACE_EVENT(sys_timer_settime,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_clock_nanosleep
-SC_TRACE_EVENT(sys_clock_nanosleep,
+#ifndef OVERRIDE_64_clock_nanosleep
+SC_TRACE_EVENT(clock_nanosleep,
        TP_PROTO(sc_exit(long ret,) const clockid_t which_clock, int flags, const struct timespec * rqtp, struct timespec * rmtp),
        TP_ARGS(sc_exit(ret,) which_clock, flags, rqtp, rmtp),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(const clockid_t, which_clock)) sc_in(__field(int, flags)) sc_in(__field_hex(const struct timespec *, rqtp)) sc_out(__field_hex(struct timespec *, rmtp))),
@@ -1251,8 +1251,8 @@ SC_TRACE_EVENT(sys_clock_nanosleep,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_epoll_wait
-SC_TRACE_EVENT(sys_epoll_wait,
+#ifndef OVERRIDE_64_epoll_wait
+SC_TRACE_EVENT(epoll_wait,
        TP_PROTO(sc_exit(long ret,) int epfd, struct epoll_event * events, int maxevents, int timeout),
        TP_ARGS(sc_exit(ret,) epfd, events, maxevents, timeout),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, epfd)) sc_out(__field_hex(struct epoll_event *, events)) sc_in(__field(int, maxevents)) sc_in(__field(int, timeout))),
@@ -1260,8 +1260,8 @@ SC_TRACE_EVENT(sys_epoll_wait,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_epoll_ctl
-SC_TRACE_EVENT(sys_epoll_ctl,
+#ifndef OVERRIDE_64_epoll_ctl
+SC_TRACE_EVENT(epoll_ctl,
        TP_PROTO(sc_exit(long ret,) int epfd, int op, int fd, struct epoll_event * event),
        TP_ARGS(sc_exit(ret,) epfd, op, fd, event),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, epfd)) sc_in(__field(int, op)) sc_in(__field(int, fd)) sc_in(__field_hex(struct epoll_event *, event))),
@@ -1269,8 +1269,8 @@ SC_TRACE_EVENT(sys_epoll_ctl,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_mq_open
-SC_TRACE_EVENT(sys_mq_open,
+#ifndef OVERRIDE_64_mq_open
+SC_TRACE_EVENT(mq_open,
        TP_PROTO(sc_exit(long ret,) const char * u_name, int oflag, umode_t mode, struct mq_attr * u_attr),
        TP_ARGS(sc_exit(ret,) u_name, oflag, mode, u_attr),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(u_name, u_name)) sc_in(__field(int, oflag)) sc_in(__field(umode_t, mode)) sc_in(__field_hex(struct mq_attr *, u_attr))),
@@ -1278,8 +1278,8 @@ SC_TRACE_EVENT(sys_mq_open,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_kexec_load
-SC_TRACE_EVENT(sys_kexec_load,
+#ifndef OVERRIDE_64_kexec_load
+SC_TRACE_EVENT(kexec_load,
        TP_PROTO(sc_exit(long ret,) unsigned long entry, unsigned long nr_segments, struct kexec_segment * segments, unsigned long flags),
        TP_ARGS(sc_exit(ret,) entry, nr_segments, segments, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, entry)) sc_in(__field(unsigned long, nr_segments)) sc_in(__field_hex(struct kexec_segment *, segments)) sc_in(__field(unsigned long, flags))),
@@ -1287,8 +1287,8 @@ SC_TRACE_EVENT(sys_kexec_load,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_request_key
-SC_TRACE_EVENT(sys_request_key,
+#ifndef OVERRIDE_64_request_key
+SC_TRACE_EVENT(request_key,
        TP_PROTO(sc_exit(long ret,) const char * _type, const char * _description, const char * _callout_info, key_serial_t destringid),
        TP_ARGS(sc_exit(ret,) _type, _description, _callout_info, destringid),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(_type, _type)) sc_in(__field_hex(const char *, _description)) sc_in(__field_hex(const char *, _callout_info)) sc_in(__field(key_serial_t, destringid))),
@@ -1296,8 +1296,8 @@ SC_TRACE_EVENT(sys_request_key,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_migrate_pages
-SC_TRACE_EVENT(sys_migrate_pages,
+#ifndef OVERRIDE_64_migrate_pages
+SC_TRACE_EVENT(migrate_pages,
        TP_PROTO(sc_exit(long ret,) pid_t pid, unsigned long maxnode, const unsigned long * old_nodes, const unsigned long * new_nodes),
        TP_ARGS(sc_exit(ret,) pid, maxnode, old_nodes, new_nodes),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(unsigned long, maxnode)) sc_in(__field_hex(const unsigned long *, old_nodes)) sc_in(__field_hex(const unsigned long *, new_nodes))),
@@ -1305,8 +1305,8 @@ SC_TRACE_EVENT(sys_migrate_pages,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_openat
-SC_TRACE_EVENT(sys_openat,
+#ifndef OVERRIDE_64_openat
+SC_TRACE_EVENT(openat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, int flags, umode_t mode),
        TP_ARGS(sc_exit(ret,) dfd, filename, flags, mode),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(int, flags)) sc_in(__field(umode_t, mode))),
@@ -1314,8 +1314,8 @@ SC_TRACE_EVENT(sys_openat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_mknodat
-SC_TRACE_EVENT(sys_mknodat,
+#ifndef OVERRIDE_64_mknodat
+SC_TRACE_EVENT(mknodat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, umode_t mode, unsigned dev),
        TP_ARGS(sc_exit(ret,) dfd, filename, mode, dev),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(umode_t, mode)) sc_in(__field(unsigned, dev))),
@@ -1323,8 +1323,8 @@ SC_TRACE_EVENT(sys_mknodat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_newfstatat
-SC_TRACE_EVENT(sys_newfstatat,
+#ifndef OVERRIDE_64_newfstatat
+SC_TRACE_EVENT(newfstatat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, struct stat * statbuf, int flag),
        TP_ARGS(sc_exit(ret,) dfd, filename, statbuf, flag),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_out(__field_hex(struct stat *, statbuf)) sc_in(__field(int, flag))),
@@ -1332,8 +1332,8 @@ SC_TRACE_EVENT(sys_newfstatat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_renameat
-SC_TRACE_EVENT(sys_renameat,
+#ifndef OVERRIDE_64_renameat
+SC_TRACE_EVENT(renameat,
        TP_PROTO(sc_exit(long ret,) int olddfd, const char * oldname, int newdfd, const char * newname),
        TP_ARGS(sc_exit(ret,) olddfd, oldname, newdfd, newname),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, olddfd)) sc_in(__string_from_user(oldname, oldname)) sc_in(__field(int, newdfd)) sc_in(__string_from_user(newname, newname))),
@@ -1341,8 +1341,8 @@ SC_TRACE_EVENT(sys_renameat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_readlinkat
-SC_TRACE_EVENT(sys_readlinkat,
+#ifndef OVERRIDE_64_readlinkat
+SC_TRACE_EVENT(readlinkat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * pathname, char * buf, int bufsiz),
        TP_ARGS(sc_exit(ret,) dfd, pathname, buf, bufsiz),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname)) sc_out(__field_hex(char *, buf)) sc_in(__field(int, bufsiz))),
@@ -1350,8 +1350,8 @@ SC_TRACE_EVENT(sys_readlinkat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_vmsplice
-SC_TRACE_EVENT(sys_vmsplice,
+#ifndef OVERRIDE_64_vmsplice
+SC_TRACE_EVENT(vmsplice,
        TP_PROTO(sc_exit(long ret,) int fd, const struct iovec * iov, unsigned long nr_segs, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, iov, nr_segs, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(const struct iovec *, iov)) sc_in(__field(unsigned long, nr_segs)) sc_in(__field(unsigned int, flags))),
@@ -1359,8 +1359,8 @@ SC_TRACE_EVENT(sys_vmsplice,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_utimensat
-SC_TRACE_EVENT(sys_utimensat,
+#ifndef OVERRIDE_64_utimensat
+SC_TRACE_EVENT(utimensat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, struct timespec * utimes, int flags),
        TP_ARGS(sc_exit(ret,) dfd, filename, utimes, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field_hex(struct timespec *, utimes)) sc_in(__field(int, flags))),
@@ -1368,8 +1368,8 @@ SC_TRACE_EVENT(sys_utimensat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_timerfd_settime
-SC_TRACE_EVENT(sys_timerfd_settime,
+#ifndef OVERRIDE_64_timerfd_settime
+SC_TRACE_EVENT(timerfd_settime,
        TP_PROTO(sc_exit(long ret,) int ufd, int flags, const struct itimerspec * utmr, struct itimerspec * otmr),
        TP_ARGS(sc_exit(ret,) ufd, flags, utmr, otmr),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_in(__field(int, flags)) sc_in(__field_hex(const struct itimerspec *, utmr)) sc_out(__field_hex(struct itimerspec *, otmr))),
@@ -1377,8 +1377,8 @@ SC_TRACE_EVENT(sys_timerfd_settime,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_accept4
-SC_TRACE_EVENT(sys_accept4,
+#ifndef OVERRIDE_64_accept4
+SC_TRACE_EVENT(accept4,
        TP_PROTO(sc_exit(long ret,) int fd, struct sockaddr * upeer_sockaddr, int * upeer_addrlen, int flags),
        TP_ARGS(sc_exit(ret,) fd, upeer_sockaddr, upeer_addrlen, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct sockaddr *, upeer_sockaddr)) sc_inout(__field_hex(int *, upeer_addrlen)) sc_in(__field(int, flags))),
@@ -1386,8 +1386,8 @@ SC_TRACE_EVENT(sys_accept4,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_signalfd4
-SC_TRACE_EVENT(sys_signalfd4,
+#ifndef OVERRIDE_64_signalfd4
+SC_TRACE_EVENT(signalfd4,
        TP_PROTO(sc_exit(long ret,) int ufd, sigset_t * user_mask, size_t sizemask, int flags),
        TP_ARGS(sc_exit(ret,) ufd, user_mask, sizemask, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, ufd)) sc_in(__field_hex(sigset_t *, user_mask)) sc_in(__field(size_t, sizemask)) sc_in(__field(int, flags))),
@@ -1395,8 +1395,8 @@ SC_TRACE_EVENT(sys_signalfd4,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_rt_tgsigqueueinfo
-SC_TRACE_EVENT(sys_rt_tgsigqueueinfo,
+#ifndef OVERRIDE_64_rt_tgsigqueueinfo
+SC_TRACE_EVENT(rt_tgsigqueueinfo,
        TP_PROTO(sc_exit(long ret,) pid_t tgid, pid_t pid, int sig, siginfo_t * uinfo),
        TP_ARGS(sc_exit(ret,) tgid, pid, sig, uinfo),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, tgid)) sc_in(__field(pid_t, pid)) sc_in(__field(int, sig)) sc_in(__field_hex(siginfo_t *, uinfo))),
@@ -1404,8 +1404,8 @@ SC_TRACE_EVENT(sys_rt_tgsigqueueinfo,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_prlimit64
-SC_TRACE_EVENT(sys_prlimit64,
+#ifndef OVERRIDE_64_prlimit64
+SC_TRACE_EVENT(prlimit64,
        TP_PROTO(sc_exit(long ret,) pid_t pid, unsigned int resource, const struct rlimit64 * new_rlim, struct rlimit64 * old_rlim),
        TP_ARGS(sc_exit(ret,) pid, resource, new_rlim, old_rlim),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(unsigned int, resource)) sc_in(__field_hex(const struct rlimit64 *, new_rlim)) sc_out(__field_hex(struct rlimit64 *, old_rlim))),
@@ -1413,8 +1413,8 @@ SC_TRACE_EVENT(sys_prlimit64,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_sendmmsg
-SC_TRACE_EVENT(sys_sendmmsg,
+#ifndef OVERRIDE_64_sendmmsg
+SC_TRACE_EVENT(sendmmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct mmsghdr * mmsg, unsigned int vlen, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd, mmsg, vlen, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(struct mmsghdr *, mmsg)) sc_in(__field(unsigned int, vlen)) sc_in(__field(unsigned int, flags))),
@@ -1422,8 +1422,8 @@ SC_TRACE_EVENT(sys_sendmmsg,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_select
-SC_TRACE_EVENT(sys_select,
+#ifndef OVERRIDE_64_select
+SC_TRACE_EVENT(select,
        TP_PROTO(sc_exit(long ret,) int n, fd_set * inp, fd_set * outp, fd_set * exp, struct timeval * tvp),
        TP_ARGS(sc_exit(ret,) n, inp, outp, exp, tvp),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, n)) sc_inout(__field_hex(fd_set *, inp)) sc_inout(__field_hex(fd_set *, outp)) sc_inout(__field_hex(fd_set *, exp)) sc_inout(__field_hex(struct timeval *, tvp))),
@@ -1431,8 +1431,8 @@ SC_TRACE_EVENT(sys_select,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_setsockopt
-SC_TRACE_EVENT(sys_setsockopt,
+#ifndef OVERRIDE_64_setsockopt
+SC_TRACE_EVENT(setsockopt,
        TP_PROTO(sc_exit(long ret,) int fd, int level, int optname, char * optval, int optlen),
        TP_ARGS(sc_exit(ret,) fd, level, optname, optval, optlen),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, level)) sc_in(__field(int, optname)) sc_in(__field_hex(char *, optval)) sc_in(__field(int, optlen))),
@@ -1440,8 +1440,8 @@ SC_TRACE_EVENT(sys_setsockopt,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_getsockopt
-SC_TRACE_EVENT(sys_getsockopt,
+#ifndef OVERRIDE_64_getsockopt
+SC_TRACE_EVENT(getsockopt,
        TP_PROTO(sc_exit(long ret,) int fd, int level, int optname, char * optval, int * optlen),
        TP_ARGS(sc_exit(ret,) fd, level, optname, optval, optlen),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field(int, level)) sc_in(__field(int, optname)) sc_out(__field_hex(char *, optval)) sc_inout(__field_hex(int *, optlen))),
@@ -1449,8 +1449,8 @@ SC_TRACE_EVENT(sys_getsockopt,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_msgrcv
-SC_TRACE_EVENT(sys_msgrcv,
+#ifndef OVERRIDE_64_msgrcv
+SC_TRACE_EVENT(msgrcv,
        TP_PROTO(sc_exit(long ret,) int msqid, struct msgbuf * msgp, size_t msgsz, long msgtyp, int msgflg),
        TP_ARGS(sc_exit(ret,) msqid, msgp, msgsz, msgtyp, msgflg),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, msqid)) sc_out(__field_hex(struct msgbuf *, msgp)) sc_in(__field(size_t, msgsz)) sc_in(__field(long, msgtyp)) sc_in(__field(int, msgflg))),
@@ -1458,8 +1458,8 @@ SC_TRACE_EVENT(sys_msgrcv,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_mount
-SC_TRACE_EVENT(sys_mount,
+#ifndef OVERRIDE_64_mount
+SC_TRACE_EVENT(mount,
        TP_PROTO(sc_exit(long ret,) char * dev_name, char * dir_name, char * type, unsigned long flags, void * data),
        TP_ARGS(sc_exit(ret,) dev_name, dir_name, type, flags, data),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(dev_name, dev_name)) sc_in(__string_from_user(dir_name, dir_name)) sc_in(__string_from_user(type, type)) sc_in(__field(unsigned long, flags)) sc_in(__field_hex(void *, data))),
@@ -1467,8 +1467,8 @@ SC_TRACE_EVENT(sys_mount,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_setxattr
-SC_TRACE_EVENT(sys_setxattr,
+#ifndef OVERRIDE_64_setxattr
+SC_TRACE_EVENT(setxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, const void * value, size_t size, int flags),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_in(__field_hex(const void *, value)) sc_in(__field(size_t, size)) sc_in(__field(int, flags))),
@@ -1476,8 +1476,8 @@ SC_TRACE_EVENT(sys_setxattr,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_lsetxattr
-SC_TRACE_EVENT(sys_lsetxattr,
+#ifndef OVERRIDE_64_lsetxattr
+SC_TRACE_EVENT(lsetxattr,
        TP_PROTO(sc_exit(long ret,) const char * pathname, const char * name, const void * value, size_t size, int flags),
        TP_ARGS(sc_exit(ret,) pathname, name, value, size, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(pathname, pathname)) sc_in(__string_from_user(name, name)) sc_in(__field_hex(const void *, value)) sc_in(__field(size_t, size)) sc_in(__field(int, flags))),
@@ -1485,8 +1485,8 @@ SC_TRACE_EVENT(sys_lsetxattr,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_fsetxattr
-SC_TRACE_EVENT(sys_fsetxattr,
+#ifndef OVERRIDE_64_fsetxattr
+SC_TRACE_EVENT(fsetxattr,
        TP_PROTO(sc_exit(long ret,) int fd, const char * name, const void * value, size_t size, int flags),
        TP_ARGS(sc_exit(ret,) fd, name, value, size, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__string_from_user(name, name)) sc_in(__field_hex(const void *, value)) sc_in(__field(size_t, size)) sc_in(__field(int, flags))),
@@ -1494,8 +1494,8 @@ SC_TRACE_EVENT(sys_fsetxattr,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_io_getevents
-SC_TRACE_EVENT(sys_io_getevents,
+#ifndef OVERRIDE_64_io_getevents
+SC_TRACE_EVENT(io_getevents,
        TP_PROTO(sc_exit(long ret,) aio_context_t ctx_id, long min_nr, long nr, struct io_event * events, struct timespec * timeout),
        TP_ARGS(sc_exit(ret,) ctx_id, min_nr, nr, events, timeout),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(aio_context_t, ctx_id)) sc_in(__field(long, min_nr)) sc_in(__field(long, nr)) sc_out(__field_hex(struct io_event *, events)) sc_inout(__field_hex(struct timespec *, timeout))),
@@ -1503,8 +1503,8 @@ SC_TRACE_EVENT(sys_io_getevents,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_get_mempolicy
-SC_TRACE_EVENT(sys_get_mempolicy,
+#ifndef OVERRIDE_64_get_mempolicy
+SC_TRACE_EVENT(get_mempolicy,
        TP_PROTO(sc_exit(long ret,) int * policy, unsigned long * nmask, unsigned long maxnode, unsigned long addr, unsigned long flags),
        TP_ARGS(sc_exit(ret,) policy, nmask, maxnode, addr, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_out(__field_hex(int *, policy)) sc_out(__field_hex(unsigned long *, nmask)) sc_in(__field(unsigned long, maxnode)) sc_in(__field_hex(unsigned long, addr)) sc_in(__field(unsigned long, flags))),
@@ -1512,8 +1512,8 @@ SC_TRACE_EVENT(sys_get_mempolicy,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_mq_timedsend
-SC_TRACE_EVENT(sys_mq_timedsend,
+#ifndef OVERRIDE_64_mq_timedsend
+SC_TRACE_EVENT(mq_timedsend,
        TP_PROTO(sc_exit(long ret,) mqd_t mqdes, const char * u_msg_ptr, size_t msg_len, unsigned int msg_prio, const struct timespec * u_abs_timeout),
        TP_ARGS(sc_exit(ret,) mqdes, u_msg_ptr, msg_len, msg_prio, u_abs_timeout),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(mqd_t, mqdes)) sc_in(__field_hex(const char *, u_msg_ptr)) sc_in(__field(size_t, msg_len)) sc_in(__field(unsigned int, msg_prio)) sc_in(__field_hex(const struct timespec *, u_abs_timeout))),
@@ -1521,8 +1521,8 @@ SC_TRACE_EVENT(sys_mq_timedsend,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_mq_timedreceive
-SC_TRACE_EVENT(sys_mq_timedreceive,
+#ifndef OVERRIDE_64_mq_timedreceive
+SC_TRACE_EVENT(mq_timedreceive,
        TP_PROTO(sc_exit(long ret,) mqd_t mqdes, char * u_msg_ptr, size_t msg_len, unsigned int * u_msg_prio, const struct timespec * u_abs_timeout),
        TP_ARGS(sc_exit(ret,) mqdes, u_msg_ptr, msg_len, u_msg_prio, u_abs_timeout),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(mqd_t, mqdes)) sc_out(__field_hex(char *, u_msg_ptr)) sc_in(__field(size_t, msg_len)) sc_out(__field_hex(unsigned int *, u_msg_prio)) sc_in(__field_hex(const struct timespec *, u_abs_timeout))),
@@ -1530,8 +1530,8 @@ SC_TRACE_EVENT(sys_mq_timedreceive,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_waitid
-SC_TRACE_EVENT(sys_waitid,
+#ifndef OVERRIDE_64_waitid
+SC_TRACE_EVENT(waitid,
        TP_PROTO(sc_exit(long ret,) int which, pid_t upid, struct siginfo * infop, int options, struct rusage * ru),
        TP_ARGS(sc_exit(ret,) which, upid, infop, options, ru),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, which)) sc_in(__field(pid_t, upid)) sc_out(__field_hex(struct siginfo *, infop)) sc_in(__field(int, options)) sc_out(__field_hex(struct rusage *, ru))),
@@ -1539,8 +1539,8 @@ SC_TRACE_EVENT(sys_waitid,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_add_key
-SC_TRACE_EVENT(sys_add_key,
+#ifndef OVERRIDE_64_add_key
+SC_TRACE_EVENT(add_key,
        TP_PROTO(sc_exit(long ret,) const char * _type, const char * _description, const void * _payload, size_t plen, key_serial_t ringid),
        TP_ARGS(sc_exit(ret,) _type, _description, _payload, plen, ringid),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__string_from_user(_type, _type)) sc_in(__field_hex(const char *, _description)) sc_in(__field_hex(const void *, _payload)) sc_in(__field(size_t, plen)) sc_in(__field(key_serial_t, ringid))),
@@ -1548,8 +1548,8 @@ SC_TRACE_EVENT(sys_add_key,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_fchownat
-SC_TRACE_EVENT(sys_fchownat,
+#ifndef OVERRIDE_64_fchownat
+SC_TRACE_EVENT(fchownat,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * filename, uid_t user, gid_t group, int flag),
        TP_ARGS(sc_exit(ret,) dfd, filename, user, group, flag),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(filename, filename)) sc_in(__field(uid_t, user)) sc_in(__field(gid_t, group)) sc_in(__field(int, flag))),
@@ -1557,8 +1557,8 @@ SC_TRACE_EVENT(sys_fchownat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_linkat
-SC_TRACE_EVENT(sys_linkat,
+#ifndef OVERRIDE_64_linkat
+SC_TRACE_EVENT(linkat,
        TP_PROTO(sc_exit(long ret,) int olddfd, const char * oldname, int newdfd, const char * newname, int flags),
        TP_ARGS(sc_exit(ret,) olddfd, oldname, newdfd, newname, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, olddfd)) sc_in(__string_from_user(oldname, oldname)) sc_in(__field(int, newdfd)) sc_in(__string_from_user(newname, newname)) sc_in(__field(int, flags))),
@@ -1566,8 +1566,8 @@ SC_TRACE_EVENT(sys_linkat,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_ppoll
-SC_TRACE_EVENT(sys_ppoll,
+#ifndef OVERRIDE_64_ppoll
+SC_TRACE_EVENT(ppoll,
        TP_PROTO(sc_exit(long ret,) struct pollfd * ufds, unsigned int nfds, struct timespec * tsp, const sigset_t * sigmask, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) ufds, nfds, tsp, sigmask, sigsetsize),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(struct pollfd *, ufds)) sc_in(__field(unsigned int, nfds)) sc_in(__field_hex(struct timespec *, tsp)) sc_in(__field_hex(const sigset_t *, sigmask)) sc_in(__field(size_t, sigsetsize))),
@@ -1575,8 +1575,8 @@ SC_TRACE_EVENT(sys_ppoll,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_preadv
-SC_TRACE_EVENT(sys_preadv,
+#ifndef OVERRIDE_64_preadv
+SC_TRACE_EVENT(preadv,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen, unsigned long pos_l, unsigned long pos_h),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen, pos_l, pos_h),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_out(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen)) sc_in(__field(unsigned long, pos_l)) sc_in(__field(unsigned long, pos_h))),
@@ -1584,8 +1584,8 @@ SC_TRACE_EVENT(sys_preadv,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_pwritev
-SC_TRACE_EVENT(sys_pwritev,
+#ifndef OVERRIDE_64_pwritev
+SC_TRACE_EVENT(pwritev,
        TP_PROTO(sc_exit(long ret,) unsigned long fd, const struct iovec * vec, unsigned long vlen, unsigned long pos_l, unsigned long pos_h),
        TP_ARGS(sc_exit(ret,) fd, vec, vlen, pos_l, pos_h),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, fd)) sc_in(__field_hex(const struct iovec *, vec)) sc_in(__field(unsigned long, vlen)) sc_in(__field(unsigned long, pos_l)) sc_in(__field(unsigned long, pos_h))),
@@ -1593,8 +1593,8 @@ SC_TRACE_EVENT(sys_pwritev,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_perf_event_open
-SC_TRACE_EVENT(sys_perf_event_open,
+#ifndef OVERRIDE_64_perf_event_open
+SC_TRACE_EVENT(perf_event_open,
        TP_PROTO(sc_exit(long ret,) struct perf_event_attr * attr_uptr, pid_t pid, int cpu, int group_fd, unsigned long flags),
        TP_ARGS(sc_exit(ret,) attr_uptr, pid, cpu, group_fd, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field_hex(struct perf_event_attr *, attr_uptr)) sc_in(__field(pid_t, pid)) sc_in(__field(int, cpu)) sc_in(__field(int, group_fd)) sc_in(__field(unsigned long, flags))),
@@ -1602,8 +1602,8 @@ SC_TRACE_EVENT(sys_perf_event_open,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_recvmmsg
-SC_TRACE_EVENT(sys_recvmmsg,
+#ifndef OVERRIDE_64_recvmmsg
+SC_TRACE_EVENT(recvmmsg,
        TP_PROTO(sc_exit(long ret,) int fd, struct mmsghdr * mmsg, unsigned int vlen, unsigned int flags, struct timespec * timeout),
        TP_ARGS(sc_exit(ret,) fd, mmsg, vlen, flags, timeout),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(struct mmsghdr *, mmsg)) sc_in(__field(unsigned int, vlen)) sc_in(__field(unsigned int, flags)) sc_inout(__field_hex(struct timespec *, timeout))),
@@ -1611,8 +1611,8 @@ SC_TRACE_EVENT(sys_recvmmsg,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_fanotify_mark
-SC_TRACE_EVENT(sys_fanotify_mark,
+#ifndef OVERRIDE_64_fanotify_mark
+SC_TRACE_EVENT(fanotify_mark,
        TP_PROTO(sc_exit(long ret,) int fanotify_fd, unsigned int flags, __u64 mask, int dfd, const char * pathname),
        TP_ARGS(sc_exit(ret,) fanotify_fd, flags, mask, dfd, pathname),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fanotify_fd)) sc_in(__field(unsigned int, flags)) sc_in(__field(__u64, mask)) sc_in(__field(int, dfd)) sc_in(__string_from_user(pathname, pathname))),
@@ -1620,8 +1620,8 @@ SC_TRACE_EVENT(sys_fanotify_mark,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_name_to_handle_at
-SC_TRACE_EVENT(sys_name_to_handle_at,
+#ifndef OVERRIDE_64_name_to_handle_at
+SC_TRACE_EVENT(name_to_handle_at,
        TP_PROTO(sc_exit(long ret,) int dfd, const char * name, struct file_handle * handle, int * mnt_id, int flag),
        TP_ARGS(sc_exit(ret,) dfd, name, handle, mnt_id, flag),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, dfd)) sc_in(__string_from_user(name, name)) sc_inout(__field_hex(struct file_handle *, handle)) sc_out(__field_hex(int *, mnt_id)) sc_in(__field(int, flag))),
@@ -1629,8 +1629,8 @@ SC_TRACE_EVENT(sys_name_to_handle_at,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_sendto
-SC_TRACE_EVENT(sys_sendto,
+#ifndef OVERRIDE_64_sendto
+SC_TRACE_EVENT(sendto,
        TP_PROTO(sc_exit(long ret,) int fd, void * buff, size_t len, unsigned int flags, struct sockaddr * addr, int addr_len),
        TP_ARGS(sc_exit(ret,) fd, buff, len, flags, addr, addr_len),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_in(__field_hex(void *, buff)) sc_in(__field(size_t, len)) sc_in(__field(unsigned int, flags)) sc_in(__field_hex(struct sockaddr *, addr)) sc_in(__field_hex(int, addr_len))),
@@ -1638,8 +1638,8 @@ SC_TRACE_EVENT(sys_sendto,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_recvfrom
-SC_TRACE_EVENT(sys_recvfrom,
+#ifndef OVERRIDE_64_recvfrom
+SC_TRACE_EVENT(recvfrom,
        TP_PROTO(sc_exit(long ret,) int fd, void * ubuf, size_t size, unsigned int flags, struct sockaddr * addr, int * addr_len),
        TP_ARGS(sc_exit(ret,) fd, ubuf, size, flags, addr, addr_len),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd)) sc_out(__field_hex(void *, ubuf)) sc_in(__field(size_t, size)) sc_in(__field(unsigned int, flags)) sc_out(__field_hex(struct sockaddr *, addr)) sc_inout(__field_hex(int *, addr_len))),
@@ -1647,8 +1647,8 @@ SC_TRACE_EVENT(sys_recvfrom,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_futex
-SC_TRACE_EVENT(sys_futex,
+#ifndef OVERRIDE_64_futex
+SC_TRACE_EVENT(futex,
        TP_PROTO(sc_exit(long ret,) u32 * uaddr, int op, u32 val, struct timespec * utime, u32 * uaddr2, u32 val3),
        TP_ARGS(sc_exit(ret,) uaddr, op, val, utime, uaddr2, val3),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_inout(__field_hex(u32 *, uaddr)) sc_in(__field(int, op)) sc_in(__field(u32, val)) sc_in(__field_hex(struct timespec *, utime)) sc_inout(__field_hex(u32 *, uaddr2)) sc_in(__field(u32, val3))),
@@ -1656,8 +1656,8 @@ SC_TRACE_EVENT(sys_futex,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_mbind
-SC_TRACE_EVENT(sys_mbind,
+#ifndef OVERRIDE_64_mbind
+SC_TRACE_EVENT(mbind,
        TP_PROTO(sc_exit(long ret,) unsigned long start, unsigned long len, unsigned long mode, unsigned long * nmask, unsigned long maxnode, unsigned flags),
        TP_ARGS(sc_exit(ret,) start, len, mode, nmask, maxnode, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(unsigned long, start)) sc_in(__field(unsigned long, len)) sc_in(__field(unsigned long, mode)) sc_in(__field_hex(unsigned long *, nmask)) sc_in(__field(unsigned long, maxnode)) sc_in(__field(unsigned, flags))),
@@ -1665,8 +1665,8 @@ SC_TRACE_EVENT(sys_mbind,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_pselect6
-SC_TRACE_EVENT(sys_pselect6,
+#ifndef OVERRIDE_64_pselect6
+SC_TRACE_EVENT(pselect6,
        TP_PROTO(sc_exit(long ret,) int n, fd_set * inp, fd_set * outp, fd_set * exp, struct timespec * tsp, void * sig),
        TP_ARGS(sc_exit(ret,) n, inp, outp, exp, tsp, sig),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, n)) sc_inout(__field_hex(fd_set *, inp)) sc_inout(__field_hex(fd_set *, outp)) sc_inout(__field_hex(fd_set *, exp)) sc_inout(__field_hex(struct timespec *, tsp)) sc_in(__field_hex(void *, sig))),
@@ -1674,8 +1674,8 @@ SC_TRACE_EVENT(sys_pselect6,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_splice
-SC_TRACE_EVENT(sys_splice,
+#ifndef OVERRIDE_64_splice
+SC_TRACE_EVENT(splice,
        TP_PROTO(sc_exit(long ret,) int fd_in, loff_t * off_in, int fd_out, loff_t * off_out, size_t len, unsigned int flags),
        TP_ARGS(sc_exit(ret,) fd_in, off_in, fd_out, off_out, len, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, fd_in)) sc_in(__field_hex(loff_t *, off_in)) sc_in(__field(int, fd_out)) sc_in(__field_hex(loff_t *, off_out)) sc_in(__field(size_t, len)) sc_in(__field(unsigned int, flags))),
@@ -1683,8 +1683,8 @@ SC_TRACE_EVENT(sys_splice,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_move_pages
-SC_TRACE_EVENT(sys_move_pages,
+#ifndef OVERRIDE_64_move_pages
+SC_TRACE_EVENT(move_pages,
        TP_PROTO(sc_exit(long ret,) pid_t pid, unsigned long nr_pages, const void * * pages, const int * nodes, int * status, int flags),
        TP_ARGS(sc_exit(ret,) pid, nr_pages, pages, nodes, status, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field(unsigned long, nr_pages)) sc_in(__field_hex(const void * *, pages)) sc_in(__field_hex(const int *, nodes)) sc_out(__field_hex(int *, status)) sc_in(__field(int, flags))),
@@ -1692,8 +1692,8 @@ SC_TRACE_EVENT(sys_move_pages,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_epoll_pwait
-SC_TRACE_EVENT(sys_epoll_pwait,
+#ifndef OVERRIDE_64_epoll_pwait
+SC_TRACE_EVENT(epoll_pwait,
        TP_PROTO(sc_exit(long ret,) int epfd, struct epoll_event * events, int maxevents, int timeout, const sigset_t * sigmask, size_t sigsetsize),
        TP_ARGS(sc_exit(ret,) epfd, events, maxevents, timeout, sigmask, sigsetsize),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(int, epfd)) sc_out(__field_hex(struct epoll_event *, events)) sc_in(__field(int, maxevents)) sc_in(__field(int, timeout)) sc_in(__field_hex(const sigset_t *, sigmask)) sc_in(__field(size_t, sigsetsize))),
@@ -1701,8 +1701,8 @@ SC_TRACE_EVENT(sys_epoll_pwait,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_process_vm_readv
-SC_TRACE_EVENT(sys_process_vm_readv,
+#ifndef OVERRIDE_64_process_vm_readv
+SC_TRACE_EVENT(process_vm_readv,
        TP_PROTO(sc_exit(long ret,) pid_t pid, const struct iovec * lvec, unsigned long liovcnt, const struct iovec * rvec, unsigned long riovcnt, unsigned long flags),
        TP_ARGS(sc_exit(ret,) pid, lvec, liovcnt, rvec, riovcnt, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_out(__field_hex(const struct iovec *, lvec)) sc_in(__field(unsigned long, liovcnt)) sc_in(__field_hex(const struct iovec *, rvec)) sc_in(__field(unsigned long, riovcnt)) sc_in(__field(unsigned long, flags))),
@@ -1710,8 +1710,8 @@ SC_TRACE_EVENT(sys_process_vm_readv,
        TP_printk()
 )
 #endif
-#ifndef OVERRIDE_64_sys_process_vm_writev
-SC_TRACE_EVENT(sys_process_vm_writev,
+#ifndef OVERRIDE_64_process_vm_writev
+SC_TRACE_EVENT(process_vm_writev,
        TP_PROTO(sc_exit(long ret,) pid_t pid, const struct iovec * lvec, unsigned long liovcnt, const struct iovec * rvec, unsigned long riovcnt, unsigned long flags),
        TP_ARGS(sc_exit(ret,) pid, lvec, liovcnt, rvec, riovcnt, flags),
        TP_STRUCT__entry(sc_exit(__field(long, ret)) sc_in(__field(pid_t, pid)) sc_in(__field_hex(const struct iovec *, lvec)) sc_in(__field(unsigned long, liovcnt)) sc_in(__field_hex(const struct iovec *, rvec)) sc_in(__field(unsigned long, riovcnt)) sc_in(__field(unsigned long, flags))),
@@ -1730,575 +1730,575 @@ SC_TRACE_EVENT(sys_process_vm_writev,
 #include "x86-64-syscalls-3.10.0-rc7_pointers_override.h"
 #include "syscalls_pointers_override.h"
 
-#ifndef OVERRIDE_TABLE_64_sys_read
-TRACE_SYSCALL_TABLE(sys_read, sys_read, 0, 3)
+#ifndef OVERRIDE_TABLE_64_read
+TRACE_SYSCALL_TABLE(read, read, 0, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_write
-TRACE_SYSCALL_TABLE(sys_write, sys_write, 1, 3)
+#ifndef OVERRIDE_TABLE_64_write
+TRACE_SYSCALL_TABLE(write, write, 1, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_open
-TRACE_SYSCALL_TABLE(sys_open, sys_open, 2, 3)
+#ifndef OVERRIDE_TABLE_64_open
+TRACE_SYSCALL_TABLE(open, open, 2, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_newstat
-TRACE_SYSCALL_TABLE(sys_newstat, sys_newstat, 4, 2)
+#ifndef OVERRIDE_TABLE_64_newstat
+TRACE_SYSCALL_TABLE(newstat, newstat, 4, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_newfstat
-TRACE_SYSCALL_TABLE(sys_newfstat, sys_newfstat, 5, 2)
+#ifndef OVERRIDE_TABLE_64_newfstat
+TRACE_SYSCALL_TABLE(newfstat, newfstat, 5, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_newlstat
-TRACE_SYSCALL_TABLE(sys_newlstat, sys_newlstat, 6, 2)
+#ifndef OVERRIDE_TABLE_64_newlstat
+TRACE_SYSCALL_TABLE(newlstat, newlstat, 6, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_poll
-TRACE_SYSCALL_TABLE(sys_poll, sys_poll, 7, 3)
+#ifndef OVERRIDE_TABLE_64_poll
+TRACE_SYSCALL_TABLE(poll, poll, 7, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_rt_sigaction
-TRACE_SYSCALL_TABLE(sys_rt_sigaction, sys_rt_sigaction, 13, 4)
+#ifndef OVERRIDE_TABLE_64_rt_sigaction
+TRACE_SYSCALL_TABLE(rt_sigaction, rt_sigaction, 13, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_rt_sigprocmask
-TRACE_SYSCALL_TABLE(sys_rt_sigprocmask, sys_rt_sigprocmask, 14, 4)
+#ifndef OVERRIDE_TABLE_64_rt_sigprocmask
+TRACE_SYSCALL_TABLE(rt_sigprocmask, rt_sigprocmask, 14, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_pread64
-TRACE_SYSCALL_TABLE(sys_pread64, sys_pread64, 17, 4)
+#ifndef OVERRIDE_TABLE_64_pread64
+TRACE_SYSCALL_TABLE(pread64, pread64, 17, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_pwrite64
-TRACE_SYSCALL_TABLE(sys_pwrite64, sys_pwrite64, 18, 4)
+#ifndef OVERRIDE_TABLE_64_pwrite64
+TRACE_SYSCALL_TABLE(pwrite64, pwrite64, 18, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_readv
-TRACE_SYSCALL_TABLE(sys_readv, sys_readv, 19, 3)
+#ifndef OVERRIDE_TABLE_64_readv
+TRACE_SYSCALL_TABLE(readv, readv, 19, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_writev
-TRACE_SYSCALL_TABLE(sys_writev, sys_writev, 20, 3)
+#ifndef OVERRIDE_TABLE_64_writev
+TRACE_SYSCALL_TABLE(writev, writev, 20, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_access
-TRACE_SYSCALL_TABLE(sys_access, sys_access, 21, 2)
+#ifndef OVERRIDE_TABLE_64_access
+TRACE_SYSCALL_TABLE(access, access, 21, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_pipe
-TRACE_SYSCALL_TABLE(sys_pipe, sys_pipe, 22, 1)
+#ifndef OVERRIDE_TABLE_64_pipe
+TRACE_SYSCALL_TABLE(pipe, pipe, 22, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_select
-TRACE_SYSCALL_TABLE(sys_select, sys_select, 23, 5)
+#ifndef OVERRIDE_TABLE_64_select
+TRACE_SYSCALL_TABLE(select, select, 23, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_mincore
-TRACE_SYSCALL_TABLE(sys_mincore, sys_mincore, 27, 3)
+#ifndef OVERRIDE_TABLE_64_mincore
+TRACE_SYSCALL_TABLE(mincore, mincore, 27, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_shmat
-TRACE_SYSCALL_TABLE(sys_shmat, sys_shmat, 30, 3)
+#ifndef OVERRIDE_TABLE_64_shmat
+TRACE_SYSCALL_TABLE(shmat, shmat, 30, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_shmctl
-TRACE_SYSCALL_TABLE(sys_shmctl, sys_shmctl, 31, 3)
+#ifndef OVERRIDE_TABLE_64_shmctl
+TRACE_SYSCALL_TABLE(shmctl, shmctl, 31, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_nanosleep
-TRACE_SYSCALL_TABLE(sys_nanosleep, sys_nanosleep, 35, 2)
+#ifndef OVERRIDE_TABLE_64_nanosleep
+TRACE_SYSCALL_TABLE(nanosleep, nanosleep, 35, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_getitimer
-TRACE_SYSCALL_TABLE(sys_getitimer, sys_getitimer, 36, 2)
+#ifndef OVERRIDE_TABLE_64_getitimer
+TRACE_SYSCALL_TABLE(getitimer, getitimer, 36, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_setitimer
-TRACE_SYSCALL_TABLE(sys_setitimer, sys_setitimer, 38, 3)
+#ifndef OVERRIDE_TABLE_64_setitimer
+TRACE_SYSCALL_TABLE(setitimer, setitimer, 38, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_sendfile64
-TRACE_SYSCALL_TABLE(sys_sendfile64, sys_sendfile64, 40, 4)
+#ifndef OVERRIDE_TABLE_64_sendfile64
+TRACE_SYSCALL_TABLE(sendfile64, sendfile64, 40, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_connect
-TRACE_SYSCALL_TABLE(sys_connect, sys_connect, 42, 3)
+#ifndef OVERRIDE_TABLE_64_connect
+TRACE_SYSCALL_TABLE(connect, connect, 42, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_accept
-TRACE_SYSCALL_TABLE(sys_accept, sys_accept, 43, 3)
+#ifndef OVERRIDE_TABLE_64_accept
+TRACE_SYSCALL_TABLE(accept, accept, 43, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_sendto
-TRACE_SYSCALL_TABLE(sys_sendto, sys_sendto, 44, 6)
+#ifndef OVERRIDE_TABLE_64_sendto
+TRACE_SYSCALL_TABLE(sendto, sendto, 44, 6)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_recvfrom
-TRACE_SYSCALL_TABLE(sys_recvfrom, sys_recvfrom, 45, 6)
+#ifndef OVERRIDE_TABLE_64_recvfrom
+TRACE_SYSCALL_TABLE(recvfrom, recvfrom, 45, 6)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_sendmsg
-TRACE_SYSCALL_TABLE(sys_sendmsg, sys_sendmsg, 46, 3)
+#ifndef OVERRIDE_TABLE_64_sendmsg
+TRACE_SYSCALL_TABLE(sendmsg, sendmsg, 46, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_recvmsg
-TRACE_SYSCALL_TABLE(sys_recvmsg, sys_recvmsg, 47, 3)
+#ifndef OVERRIDE_TABLE_64_recvmsg
+TRACE_SYSCALL_TABLE(recvmsg, recvmsg, 47, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_bind
-TRACE_SYSCALL_TABLE(sys_bind, sys_bind, 49, 3)
+#ifndef OVERRIDE_TABLE_64_bind
+TRACE_SYSCALL_TABLE(bind, bind, 49, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_getsockname
-TRACE_SYSCALL_TABLE(sys_getsockname, sys_getsockname, 51, 3)
+#ifndef OVERRIDE_TABLE_64_getsockname
+TRACE_SYSCALL_TABLE(getsockname, getsockname, 51, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_getpeername
-TRACE_SYSCALL_TABLE(sys_getpeername, sys_getpeername, 52, 3)
+#ifndef OVERRIDE_TABLE_64_getpeername
+TRACE_SYSCALL_TABLE(getpeername, getpeername, 52, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_socketpair
-TRACE_SYSCALL_TABLE(sys_socketpair, sys_socketpair, 53, 4)
+#ifndef OVERRIDE_TABLE_64_socketpair
+TRACE_SYSCALL_TABLE(socketpair, socketpair, 53, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_setsockopt
-TRACE_SYSCALL_TABLE(sys_setsockopt, sys_setsockopt, 54, 5)
+#ifndef OVERRIDE_TABLE_64_setsockopt
+TRACE_SYSCALL_TABLE(setsockopt, setsockopt, 54, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_getsockopt
-TRACE_SYSCALL_TABLE(sys_getsockopt, sys_getsockopt, 55, 5)
+#ifndef OVERRIDE_TABLE_64_getsockopt
+TRACE_SYSCALL_TABLE(getsockopt, getsockopt, 55, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_wait4
-TRACE_SYSCALL_TABLE(sys_wait4, sys_wait4, 61, 4)
+#ifndef OVERRIDE_TABLE_64_wait4
+TRACE_SYSCALL_TABLE(wait4, wait4, 61, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_newuname
-TRACE_SYSCALL_TABLE(sys_newuname, sys_newuname, 63, 1)
+#ifndef OVERRIDE_TABLE_64_newuname
+TRACE_SYSCALL_TABLE(newuname, newuname, 63, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_semop
-TRACE_SYSCALL_TABLE(sys_semop, sys_semop, 65, 3)
+#ifndef OVERRIDE_TABLE_64_semop
+TRACE_SYSCALL_TABLE(semop, semop, 65, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_shmdt
-TRACE_SYSCALL_TABLE(sys_shmdt, sys_shmdt, 67, 1)
+#ifndef OVERRIDE_TABLE_64_shmdt
+TRACE_SYSCALL_TABLE(shmdt, shmdt, 67, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_msgsnd
-TRACE_SYSCALL_TABLE(sys_msgsnd, sys_msgsnd, 69, 4)
+#ifndef OVERRIDE_TABLE_64_msgsnd
+TRACE_SYSCALL_TABLE(msgsnd, msgsnd, 69, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_msgrcv
-TRACE_SYSCALL_TABLE(sys_msgrcv, sys_msgrcv, 70, 5)
+#ifndef OVERRIDE_TABLE_64_msgrcv
+TRACE_SYSCALL_TABLE(msgrcv, msgrcv, 70, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_msgctl
-TRACE_SYSCALL_TABLE(sys_msgctl, sys_msgctl, 71, 3)
+#ifndef OVERRIDE_TABLE_64_msgctl
+TRACE_SYSCALL_TABLE(msgctl, msgctl, 71, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_truncate
-TRACE_SYSCALL_TABLE(sys_truncate, sys_truncate, 76, 2)
+#ifndef OVERRIDE_TABLE_64_truncate
+TRACE_SYSCALL_TABLE(truncate, truncate, 76, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_getdents
-TRACE_SYSCALL_TABLE(sys_getdents, sys_getdents, 78, 3)
+#ifndef OVERRIDE_TABLE_64_getdents
+TRACE_SYSCALL_TABLE(getdents, getdents, 78, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_getcwd
-TRACE_SYSCALL_TABLE(sys_getcwd, sys_getcwd, 79, 2)
+#ifndef OVERRIDE_TABLE_64_getcwd
+TRACE_SYSCALL_TABLE(getcwd, getcwd, 79, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_chdir
-TRACE_SYSCALL_TABLE(sys_chdir, sys_chdir, 80, 1)
+#ifndef OVERRIDE_TABLE_64_chdir
+TRACE_SYSCALL_TABLE(chdir, chdir, 80, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_rename
-TRACE_SYSCALL_TABLE(sys_rename, sys_rename, 82, 2)
+#ifndef OVERRIDE_TABLE_64_rename
+TRACE_SYSCALL_TABLE(rename, rename, 82, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_mkdir
-TRACE_SYSCALL_TABLE(sys_mkdir, sys_mkdir, 83, 2)
+#ifndef OVERRIDE_TABLE_64_mkdir
+TRACE_SYSCALL_TABLE(mkdir, mkdir, 83, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_rmdir
-TRACE_SYSCALL_TABLE(sys_rmdir, sys_rmdir, 84, 1)
+#ifndef OVERRIDE_TABLE_64_rmdir
+TRACE_SYSCALL_TABLE(rmdir, rmdir, 84, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_creat
-TRACE_SYSCALL_TABLE(sys_creat, sys_creat, 85, 2)
+#ifndef OVERRIDE_TABLE_64_creat
+TRACE_SYSCALL_TABLE(creat, creat, 85, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_link
-TRACE_SYSCALL_TABLE(sys_link, sys_link, 86, 2)
+#ifndef OVERRIDE_TABLE_64_link
+TRACE_SYSCALL_TABLE(link, link, 86, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_unlink
-TRACE_SYSCALL_TABLE(sys_unlink, sys_unlink, 87, 1)
+#ifndef OVERRIDE_TABLE_64_unlink
+TRACE_SYSCALL_TABLE(unlink, unlink, 87, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_symlink
-TRACE_SYSCALL_TABLE(sys_symlink, sys_symlink, 88, 2)
+#ifndef OVERRIDE_TABLE_64_symlink
+TRACE_SYSCALL_TABLE(symlink, symlink, 88, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_readlink
-TRACE_SYSCALL_TABLE(sys_readlink, sys_readlink, 89, 3)
+#ifndef OVERRIDE_TABLE_64_readlink
+TRACE_SYSCALL_TABLE(readlink, readlink, 89, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_chmod
-TRACE_SYSCALL_TABLE(sys_chmod, sys_chmod, 90, 2)
+#ifndef OVERRIDE_TABLE_64_chmod
+TRACE_SYSCALL_TABLE(chmod, chmod, 90, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_chown
-TRACE_SYSCALL_TABLE(sys_chown, sys_chown, 92, 3)
+#ifndef OVERRIDE_TABLE_64_chown
+TRACE_SYSCALL_TABLE(chown, chown, 92, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_lchown
-TRACE_SYSCALL_TABLE(sys_lchown, sys_lchown, 94, 3)
+#ifndef OVERRIDE_TABLE_64_lchown
+TRACE_SYSCALL_TABLE(lchown, lchown, 94, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_gettimeofday
-TRACE_SYSCALL_TABLE(sys_gettimeofday, sys_gettimeofday, 96, 2)
+#ifndef OVERRIDE_TABLE_64_gettimeofday
+TRACE_SYSCALL_TABLE(gettimeofday, gettimeofday, 96, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_getrlimit
-TRACE_SYSCALL_TABLE(sys_getrlimit, sys_getrlimit, 97, 2)
+#ifndef OVERRIDE_TABLE_64_getrlimit
+TRACE_SYSCALL_TABLE(getrlimit, getrlimit, 97, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_getrusage
-TRACE_SYSCALL_TABLE(sys_getrusage, sys_getrusage, 98, 2)
+#ifndef OVERRIDE_TABLE_64_getrusage
+TRACE_SYSCALL_TABLE(getrusage, getrusage, 98, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_sysinfo
-TRACE_SYSCALL_TABLE(sys_sysinfo, sys_sysinfo, 99, 1)
+#ifndef OVERRIDE_TABLE_64_sysinfo
+TRACE_SYSCALL_TABLE(sysinfo, sysinfo, 99, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_times
-TRACE_SYSCALL_TABLE(sys_times, sys_times, 100, 1)
+#ifndef OVERRIDE_TABLE_64_times
+TRACE_SYSCALL_TABLE(times, times, 100, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_syslog
-TRACE_SYSCALL_TABLE(sys_syslog, sys_syslog, 103, 3)
+#ifndef OVERRIDE_TABLE_64_syslog
+TRACE_SYSCALL_TABLE(syslog, syslog, 103, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_getgroups
-TRACE_SYSCALL_TABLE(sys_getgroups, sys_getgroups, 115, 2)
+#ifndef OVERRIDE_TABLE_64_getgroups
+TRACE_SYSCALL_TABLE(getgroups, getgroups, 115, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_setgroups
-TRACE_SYSCALL_TABLE(sys_setgroups, sys_setgroups, 116, 2)
+#ifndef OVERRIDE_TABLE_64_setgroups
+TRACE_SYSCALL_TABLE(setgroups, setgroups, 116, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_getresuid
-TRACE_SYSCALL_TABLE(sys_getresuid, sys_getresuid, 118, 3)
+#ifndef OVERRIDE_TABLE_64_getresuid
+TRACE_SYSCALL_TABLE(getresuid, getresuid, 118, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_getresgid
-TRACE_SYSCALL_TABLE(sys_getresgid, sys_getresgid, 120, 3)
+#ifndef OVERRIDE_TABLE_64_getresgid
+TRACE_SYSCALL_TABLE(getresgid, getresgid, 120, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_rt_sigpending
-TRACE_SYSCALL_TABLE(sys_rt_sigpending, sys_rt_sigpending, 127, 2)
+#ifndef OVERRIDE_TABLE_64_rt_sigpending
+TRACE_SYSCALL_TABLE(rt_sigpending, rt_sigpending, 127, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_rt_sigtimedwait
-TRACE_SYSCALL_TABLE(sys_rt_sigtimedwait, sys_rt_sigtimedwait, 128, 4)
+#ifndef OVERRIDE_TABLE_64_rt_sigtimedwait
+TRACE_SYSCALL_TABLE(rt_sigtimedwait, rt_sigtimedwait, 128, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_rt_sigqueueinfo
-TRACE_SYSCALL_TABLE(sys_rt_sigqueueinfo, sys_rt_sigqueueinfo, 129, 3)
+#ifndef OVERRIDE_TABLE_64_rt_sigqueueinfo
+TRACE_SYSCALL_TABLE(rt_sigqueueinfo, rt_sigqueueinfo, 129, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_rt_sigsuspend
-TRACE_SYSCALL_TABLE(sys_rt_sigsuspend, sys_rt_sigsuspend, 130, 2)
+#ifndef OVERRIDE_TABLE_64_rt_sigsuspend
+TRACE_SYSCALL_TABLE(rt_sigsuspend, rt_sigsuspend, 130, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_sigaltstack
-TRACE_SYSCALL_TABLE(sys_sigaltstack, sys_sigaltstack, 131, 2)
+#ifndef OVERRIDE_TABLE_64_sigaltstack
+TRACE_SYSCALL_TABLE(sigaltstack, sigaltstack, 131, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_utime
-TRACE_SYSCALL_TABLE(sys_utime, sys_utime, 132, 2)
+#ifndef OVERRIDE_TABLE_64_utime
+TRACE_SYSCALL_TABLE(utime, utime, 132, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_mknod
-TRACE_SYSCALL_TABLE(sys_mknod, sys_mknod, 133, 3)
+#ifndef OVERRIDE_TABLE_64_mknod
+TRACE_SYSCALL_TABLE(mknod, mknod, 133, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_ustat
-TRACE_SYSCALL_TABLE(sys_ustat, sys_ustat, 136, 2)
+#ifndef OVERRIDE_TABLE_64_ustat
+TRACE_SYSCALL_TABLE(ustat, ustat, 136, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_statfs
-TRACE_SYSCALL_TABLE(sys_statfs, sys_statfs, 137, 2)
+#ifndef OVERRIDE_TABLE_64_statfs
+TRACE_SYSCALL_TABLE(statfs, statfs, 137, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_fstatfs
-TRACE_SYSCALL_TABLE(sys_fstatfs, sys_fstatfs, 138, 2)
+#ifndef OVERRIDE_TABLE_64_fstatfs
+TRACE_SYSCALL_TABLE(fstatfs, fstatfs, 138, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_sched_setparam
-TRACE_SYSCALL_TABLE(sys_sched_setparam, sys_sched_setparam, 142, 2)
+#ifndef OVERRIDE_TABLE_64_sched_setparam
+TRACE_SYSCALL_TABLE(sched_setparam, sched_setparam, 142, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_sched_getparam
-TRACE_SYSCALL_TABLE(sys_sched_getparam, sys_sched_getparam, 143, 2)
+#ifndef OVERRIDE_TABLE_64_sched_getparam
+TRACE_SYSCALL_TABLE(sched_getparam, sched_getparam, 143, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_sched_setscheduler
-TRACE_SYSCALL_TABLE(sys_sched_setscheduler, sys_sched_setscheduler, 144, 3)
+#ifndef OVERRIDE_TABLE_64_sched_setscheduler
+TRACE_SYSCALL_TABLE(sched_setscheduler, sched_setscheduler, 144, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_sched_rr_get_interval
-TRACE_SYSCALL_TABLE(sys_sched_rr_get_interval, sys_sched_rr_get_interval, 148, 2)
+#ifndef OVERRIDE_TABLE_64_sched_rr_get_interval
+TRACE_SYSCALL_TABLE(sched_rr_get_interval, sched_rr_get_interval, 148, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_pivot_root
-TRACE_SYSCALL_TABLE(sys_pivot_root, sys_pivot_root, 155, 2)
+#ifndef OVERRIDE_TABLE_64_pivot_root
+TRACE_SYSCALL_TABLE(pivot_root, pivot_root, 155, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_sysctl
-TRACE_SYSCALL_TABLE(sys_sysctl, sys_sysctl, 156, 1)
+#ifndef OVERRIDE_TABLE_64_sysctl
+TRACE_SYSCALL_TABLE(sysctl, sysctl, 156, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_adjtimex
-TRACE_SYSCALL_TABLE(sys_adjtimex, sys_adjtimex, 159, 1)
+#ifndef OVERRIDE_TABLE_64_adjtimex
+TRACE_SYSCALL_TABLE(adjtimex, adjtimex, 159, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_setrlimit
-TRACE_SYSCALL_TABLE(sys_setrlimit, sys_setrlimit, 160, 2)
+#ifndef OVERRIDE_TABLE_64_setrlimit
+TRACE_SYSCALL_TABLE(setrlimit, setrlimit, 160, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_chroot
-TRACE_SYSCALL_TABLE(sys_chroot, sys_chroot, 161, 1)
+#ifndef OVERRIDE_TABLE_64_chroot
+TRACE_SYSCALL_TABLE(chroot, chroot, 161, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_acct
-TRACE_SYSCALL_TABLE(sys_acct, sys_acct, 163, 1)
+#ifndef OVERRIDE_TABLE_64_acct
+TRACE_SYSCALL_TABLE(acct, acct, 163, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_settimeofday
-TRACE_SYSCALL_TABLE(sys_settimeofday, sys_settimeofday, 164, 2)
+#ifndef OVERRIDE_TABLE_64_settimeofday
+TRACE_SYSCALL_TABLE(settimeofday, settimeofday, 164, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_mount
-TRACE_SYSCALL_TABLE(sys_mount, sys_mount, 165, 5)
+#ifndef OVERRIDE_TABLE_64_mount
+TRACE_SYSCALL_TABLE(mount, mount, 165, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_umount
-TRACE_SYSCALL_TABLE(sys_umount, sys_umount, 166, 2)
+#ifndef OVERRIDE_TABLE_64_umount
+TRACE_SYSCALL_TABLE(umount, umount, 166, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_swapon
-TRACE_SYSCALL_TABLE(sys_swapon, sys_swapon, 167, 2)
+#ifndef OVERRIDE_TABLE_64_swapon
+TRACE_SYSCALL_TABLE(swapon, swapon, 167, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_swapoff
-TRACE_SYSCALL_TABLE(sys_swapoff, sys_swapoff, 168, 1)
+#ifndef OVERRIDE_TABLE_64_swapoff
+TRACE_SYSCALL_TABLE(swapoff, swapoff, 168, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_reboot
-TRACE_SYSCALL_TABLE(sys_reboot, sys_reboot, 169, 4)
+#ifndef OVERRIDE_TABLE_64_reboot
+TRACE_SYSCALL_TABLE(reboot, reboot, 169, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_sethostname
-TRACE_SYSCALL_TABLE(sys_sethostname, sys_sethostname, 170, 2)
+#ifndef OVERRIDE_TABLE_64_sethostname
+TRACE_SYSCALL_TABLE(sethostname, sethostname, 170, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_setdomainname
-TRACE_SYSCALL_TABLE(sys_setdomainname, sys_setdomainname, 171, 2)
+#ifndef OVERRIDE_TABLE_64_setdomainname
+TRACE_SYSCALL_TABLE(setdomainname, setdomainname, 171, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_init_module
-TRACE_SYSCALL_TABLE(sys_init_module, sys_init_module, 175, 3)
+#ifndef OVERRIDE_TABLE_64_init_module
+TRACE_SYSCALL_TABLE(init_module, init_module, 175, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_delete_module
-TRACE_SYSCALL_TABLE(sys_delete_module, sys_delete_module, 176, 2)
+#ifndef OVERRIDE_TABLE_64_delete_module
+TRACE_SYSCALL_TABLE(delete_module, delete_module, 176, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_quotactl
-TRACE_SYSCALL_TABLE(sys_quotactl, sys_quotactl, 179, 4)
+#ifndef OVERRIDE_TABLE_64_quotactl
+TRACE_SYSCALL_TABLE(quotactl, quotactl, 179, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_setxattr
-TRACE_SYSCALL_TABLE(sys_setxattr, sys_setxattr, 188, 5)
+#ifndef OVERRIDE_TABLE_64_setxattr
+TRACE_SYSCALL_TABLE(setxattr, setxattr, 188, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_lsetxattr
-TRACE_SYSCALL_TABLE(sys_lsetxattr, sys_lsetxattr, 189, 5)
+#ifndef OVERRIDE_TABLE_64_lsetxattr
+TRACE_SYSCALL_TABLE(lsetxattr, lsetxattr, 189, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_fsetxattr
-TRACE_SYSCALL_TABLE(sys_fsetxattr, sys_fsetxattr, 190, 5)
+#ifndef OVERRIDE_TABLE_64_fsetxattr
+TRACE_SYSCALL_TABLE(fsetxattr, fsetxattr, 190, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_getxattr
-TRACE_SYSCALL_TABLE(sys_getxattr, sys_getxattr, 191, 4)
+#ifndef OVERRIDE_TABLE_64_getxattr
+TRACE_SYSCALL_TABLE(getxattr, getxattr, 191, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_lgetxattr
-TRACE_SYSCALL_TABLE(sys_lgetxattr, sys_lgetxattr, 192, 4)
+#ifndef OVERRIDE_TABLE_64_lgetxattr
+TRACE_SYSCALL_TABLE(lgetxattr, lgetxattr, 192, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_fgetxattr
-TRACE_SYSCALL_TABLE(sys_fgetxattr, sys_fgetxattr, 193, 4)
+#ifndef OVERRIDE_TABLE_64_fgetxattr
+TRACE_SYSCALL_TABLE(fgetxattr, fgetxattr, 193, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_listxattr
-TRACE_SYSCALL_TABLE(sys_listxattr, sys_listxattr, 194, 3)
+#ifndef OVERRIDE_TABLE_64_listxattr
+TRACE_SYSCALL_TABLE(listxattr, listxattr, 194, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_llistxattr
-TRACE_SYSCALL_TABLE(sys_llistxattr, sys_llistxattr, 195, 3)
+#ifndef OVERRIDE_TABLE_64_llistxattr
+TRACE_SYSCALL_TABLE(llistxattr, llistxattr, 195, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_flistxattr
-TRACE_SYSCALL_TABLE(sys_flistxattr, sys_flistxattr, 196, 3)
+#ifndef OVERRIDE_TABLE_64_flistxattr
+TRACE_SYSCALL_TABLE(flistxattr, flistxattr, 196, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_removexattr
-TRACE_SYSCALL_TABLE(sys_removexattr, sys_removexattr, 197, 2)
+#ifndef OVERRIDE_TABLE_64_removexattr
+TRACE_SYSCALL_TABLE(removexattr, removexattr, 197, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_lremovexattr
-TRACE_SYSCALL_TABLE(sys_lremovexattr, sys_lremovexattr, 198, 2)
+#ifndef OVERRIDE_TABLE_64_lremovexattr
+TRACE_SYSCALL_TABLE(lremovexattr, lremovexattr, 198, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_fremovexattr
-TRACE_SYSCALL_TABLE(sys_fremovexattr, sys_fremovexattr, 199, 2)
+#ifndef OVERRIDE_TABLE_64_fremovexattr
+TRACE_SYSCALL_TABLE(fremovexattr, fremovexattr, 199, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_time
-TRACE_SYSCALL_TABLE(sys_time, sys_time, 201, 1)
+#ifndef OVERRIDE_TABLE_64_time
+TRACE_SYSCALL_TABLE(time, time, 201, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_futex
-TRACE_SYSCALL_TABLE(sys_futex, sys_futex, 202, 6)
+#ifndef OVERRIDE_TABLE_64_futex
+TRACE_SYSCALL_TABLE(futex, futex, 202, 6)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_sched_setaffinity
-TRACE_SYSCALL_TABLE(sys_sched_setaffinity, sys_sched_setaffinity, 203, 3)
+#ifndef OVERRIDE_TABLE_64_sched_setaffinity
+TRACE_SYSCALL_TABLE(sched_setaffinity, sched_setaffinity, 203, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_sched_getaffinity
-TRACE_SYSCALL_TABLE(sys_sched_getaffinity, sys_sched_getaffinity, 204, 3)
+#ifndef OVERRIDE_TABLE_64_sched_getaffinity
+TRACE_SYSCALL_TABLE(sched_getaffinity, sched_getaffinity, 204, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_io_setup
-TRACE_SYSCALL_TABLE(sys_io_setup, sys_io_setup, 206, 2)
+#ifndef OVERRIDE_TABLE_64_io_setup
+TRACE_SYSCALL_TABLE(io_setup, io_setup, 206, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_io_getevents
-TRACE_SYSCALL_TABLE(sys_io_getevents, sys_io_getevents, 208, 5)
+#ifndef OVERRIDE_TABLE_64_io_getevents
+TRACE_SYSCALL_TABLE(io_getevents, io_getevents, 208, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_io_submit
-TRACE_SYSCALL_TABLE(sys_io_submit, sys_io_submit, 209, 3)
+#ifndef OVERRIDE_TABLE_64_io_submit
+TRACE_SYSCALL_TABLE(io_submit, io_submit, 209, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_io_cancel
-TRACE_SYSCALL_TABLE(sys_io_cancel, sys_io_cancel, 210, 3)
+#ifndef OVERRIDE_TABLE_64_io_cancel
+TRACE_SYSCALL_TABLE(io_cancel, io_cancel, 210, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_lookup_dcookie
-TRACE_SYSCALL_TABLE(sys_lookup_dcookie, sys_lookup_dcookie, 212, 3)
+#ifndef OVERRIDE_TABLE_64_lookup_dcookie
+TRACE_SYSCALL_TABLE(lookup_dcookie, lookup_dcookie, 212, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_getdents64
-TRACE_SYSCALL_TABLE(sys_getdents64, sys_getdents64, 217, 3)
+#ifndef OVERRIDE_TABLE_64_getdents64
+TRACE_SYSCALL_TABLE(getdents64, getdents64, 217, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_set_tid_address
-TRACE_SYSCALL_TABLE(sys_set_tid_address, sys_set_tid_address, 218, 1)
+#ifndef OVERRIDE_TABLE_64_set_tid_address
+TRACE_SYSCALL_TABLE(set_tid_address, set_tid_address, 218, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_semtimedop
-TRACE_SYSCALL_TABLE(sys_semtimedop, sys_semtimedop, 220, 4)
+#ifndef OVERRIDE_TABLE_64_semtimedop
+TRACE_SYSCALL_TABLE(semtimedop, semtimedop, 220, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_timer_create
-TRACE_SYSCALL_TABLE(sys_timer_create, sys_timer_create, 222, 3)
+#ifndef OVERRIDE_TABLE_64_timer_create
+TRACE_SYSCALL_TABLE(timer_create, timer_create, 222, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_timer_settime
-TRACE_SYSCALL_TABLE(sys_timer_settime, sys_timer_settime, 223, 4)
+#ifndef OVERRIDE_TABLE_64_timer_settime
+TRACE_SYSCALL_TABLE(timer_settime, timer_settime, 223, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_timer_gettime
-TRACE_SYSCALL_TABLE(sys_timer_gettime, sys_timer_gettime, 224, 2)
+#ifndef OVERRIDE_TABLE_64_timer_gettime
+TRACE_SYSCALL_TABLE(timer_gettime, timer_gettime, 224, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_clock_settime
-TRACE_SYSCALL_TABLE(sys_clock_settime, sys_clock_settime, 227, 2)
+#ifndef OVERRIDE_TABLE_64_clock_settime
+TRACE_SYSCALL_TABLE(clock_settime, clock_settime, 227, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_clock_gettime
-TRACE_SYSCALL_TABLE(sys_clock_gettime, sys_clock_gettime, 228, 2)
+#ifndef OVERRIDE_TABLE_64_clock_gettime
+TRACE_SYSCALL_TABLE(clock_gettime, clock_gettime, 228, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_clock_getres
-TRACE_SYSCALL_TABLE(sys_clock_getres, sys_clock_getres, 229, 2)
+#ifndef OVERRIDE_TABLE_64_clock_getres
+TRACE_SYSCALL_TABLE(clock_getres, clock_getres, 229, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_clock_nanosleep
-TRACE_SYSCALL_TABLE(sys_clock_nanosleep, sys_clock_nanosleep, 230, 4)
+#ifndef OVERRIDE_TABLE_64_clock_nanosleep
+TRACE_SYSCALL_TABLE(clock_nanosleep, clock_nanosleep, 230, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_epoll_wait
-TRACE_SYSCALL_TABLE(sys_epoll_wait, sys_epoll_wait, 232, 4)
+#ifndef OVERRIDE_TABLE_64_epoll_wait
+TRACE_SYSCALL_TABLE(epoll_wait, epoll_wait, 232, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_epoll_ctl
-TRACE_SYSCALL_TABLE(sys_epoll_ctl, sys_epoll_ctl, 233, 4)
+#ifndef OVERRIDE_TABLE_64_epoll_ctl
+TRACE_SYSCALL_TABLE(epoll_ctl, epoll_ctl, 233, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_utimes
-TRACE_SYSCALL_TABLE(sys_utimes, sys_utimes, 235, 2)
+#ifndef OVERRIDE_TABLE_64_utimes
+TRACE_SYSCALL_TABLE(utimes, utimes, 235, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_mbind
-TRACE_SYSCALL_TABLE(sys_mbind, sys_mbind, 237, 6)
+#ifndef OVERRIDE_TABLE_64_mbind
+TRACE_SYSCALL_TABLE(mbind, mbind, 237, 6)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_set_mempolicy
-TRACE_SYSCALL_TABLE(sys_set_mempolicy, sys_set_mempolicy, 238, 3)
+#ifndef OVERRIDE_TABLE_64_set_mempolicy
+TRACE_SYSCALL_TABLE(set_mempolicy, set_mempolicy, 238, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_get_mempolicy
-TRACE_SYSCALL_TABLE(sys_get_mempolicy, sys_get_mempolicy, 239, 5)
+#ifndef OVERRIDE_TABLE_64_get_mempolicy
+TRACE_SYSCALL_TABLE(get_mempolicy, get_mempolicy, 239, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_mq_open
-TRACE_SYSCALL_TABLE(sys_mq_open, sys_mq_open, 240, 4)
+#ifndef OVERRIDE_TABLE_64_mq_open
+TRACE_SYSCALL_TABLE(mq_open, mq_open, 240, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_mq_unlink
-TRACE_SYSCALL_TABLE(sys_mq_unlink, sys_mq_unlink, 241, 1)
+#ifndef OVERRIDE_TABLE_64_mq_unlink
+TRACE_SYSCALL_TABLE(mq_unlink, mq_unlink, 241, 1)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_mq_timedsend
-TRACE_SYSCALL_TABLE(sys_mq_timedsend, sys_mq_timedsend, 242, 5)
+#ifndef OVERRIDE_TABLE_64_mq_timedsend
+TRACE_SYSCALL_TABLE(mq_timedsend, mq_timedsend, 242, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_mq_timedreceive
-TRACE_SYSCALL_TABLE(sys_mq_timedreceive, sys_mq_timedreceive, 243, 5)
+#ifndef OVERRIDE_TABLE_64_mq_timedreceive
+TRACE_SYSCALL_TABLE(mq_timedreceive, mq_timedreceive, 243, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_mq_notify
-TRACE_SYSCALL_TABLE(sys_mq_notify, sys_mq_notify, 244, 2)
+#ifndef OVERRIDE_TABLE_64_mq_notify
+TRACE_SYSCALL_TABLE(mq_notify, mq_notify, 244, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_mq_getsetattr
-TRACE_SYSCALL_TABLE(sys_mq_getsetattr, sys_mq_getsetattr, 245, 3)
+#ifndef OVERRIDE_TABLE_64_mq_getsetattr
+TRACE_SYSCALL_TABLE(mq_getsetattr, mq_getsetattr, 245, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_kexec_load
-TRACE_SYSCALL_TABLE(sys_kexec_load, sys_kexec_load, 246, 4)
+#ifndef OVERRIDE_TABLE_64_kexec_load
+TRACE_SYSCALL_TABLE(kexec_load, kexec_load, 246, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_waitid
-TRACE_SYSCALL_TABLE(sys_waitid, sys_waitid, 247, 5)
+#ifndef OVERRIDE_TABLE_64_waitid
+TRACE_SYSCALL_TABLE(waitid, waitid, 247, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_add_key
-TRACE_SYSCALL_TABLE(sys_add_key, sys_add_key, 248, 5)
+#ifndef OVERRIDE_TABLE_64_add_key
+TRACE_SYSCALL_TABLE(add_key, add_key, 248, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_request_key
-TRACE_SYSCALL_TABLE(sys_request_key, sys_request_key, 249, 4)
+#ifndef OVERRIDE_TABLE_64_request_key
+TRACE_SYSCALL_TABLE(request_key, request_key, 249, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_inotify_add_watch
-TRACE_SYSCALL_TABLE(sys_inotify_add_watch, sys_inotify_add_watch, 254, 3)
+#ifndef OVERRIDE_TABLE_64_inotify_add_watch
+TRACE_SYSCALL_TABLE(inotify_add_watch, inotify_add_watch, 254, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_migrate_pages
-TRACE_SYSCALL_TABLE(sys_migrate_pages, sys_migrate_pages, 256, 4)
+#ifndef OVERRIDE_TABLE_64_migrate_pages
+TRACE_SYSCALL_TABLE(migrate_pages, migrate_pages, 256, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_openat
-TRACE_SYSCALL_TABLE(sys_openat, sys_openat, 257, 4)
+#ifndef OVERRIDE_TABLE_64_openat
+TRACE_SYSCALL_TABLE(openat, openat, 257, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_mkdirat
-TRACE_SYSCALL_TABLE(sys_mkdirat, sys_mkdirat, 258, 3)
+#ifndef OVERRIDE_TABLE_64_mkdirat
+TRACE_SYSCALL_TABLE(mkdirat, mkdirat, 258, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_mknodat
-TRACE_SYSCALL_TABLE(sys_mknodat, sys_mknodat, 259, 4)
+#ifndef OVERRIDE_TABLE_64_mknodat
+TRACE_SYSCALL_TABLE(mknodat, mknodat, 259, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_fchownat
-TRACE_SYSCALL_TABLE(sys_fchownat, sys_fchownat, 260, 5)
+#ifndef OVERRIDE_TABLE_64_fchownat
+TRACE_SYSCALL_TABLE(fchownat, fchownat, 260, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_futimesat
-TRACE_SYSCALL_TABLE(sys_futimesat, sys_futimesat, 261, 3)
+#ifndef OVERRIDE_TABLE_64_futimesat
+TRACE_SYSCALL_TABLE(futimesat, futimesat, 261, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_newfstatat
-TRACE_SYSCALL_TABLE(sys_newfstatat, sys_newfstatat, 262, 4)
+#ifndef OVERRIDE_TABLE_64_newfstatat
+TRACE_SYSCALL_TABLE(newfstatat, newfstatat, 262, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_unlinkat
-TRACE_SYSCALL_TABLE(sys_unlinkat, sys_unlinkat, 263, 3)
+#ifndef OVERRIDE_TABLE_64_unlinkat
+TRACE_SYSCALL_TABLE(unlinkat, unlinkat, 263, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_renameat
-TRACE_SYSCALL_TABLE(sys_renameat, sys_renameat, 264, 4)
+#ifndef OVERRIDE_TABLE_64_renameat
+TRACE_SYSCALL_TABLE(renameat, renameat, 264, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_linkat
-TRACE_SYSCALL_TABLE(sys_linkat, sys_linkat, 265, 5)
+#ifndef OVERRIDE_TABLE_64_linkat
+TRACE_SYSCALL_TABLE(linkat, linkat, 265, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_symlinkat
-TRACE_SYSCALL_TABLE(sys_symlinkat, sys_symlinkat, 266, 3)
+#ifndef OVERRIDE_TABLE_64_symlinkat
+TRACE_SYSCALL_TABLE(symlinkat, symlinkat, 266, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_readlinkat
-TRACE_SYSCALL_TABLE(sys_readlinkat, sys_readlinkat, 267, 4)
+#ifndef OVERRIDE_TABLE_64_readlinkat
+TRACE_SYSCALL_TABLE(readlinkat, readlinkat, 267, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_fchmodat
-TRACE_SYSCALL_TABLE(sys_fchmodat, sys_fchmodat, 268, 3)
+#ifndef OVERRIDE_TABLE_64_fchmodat
+TRACE_SYSCALL_TABLE(fchmodat, fchmodat, 268, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_faccessat
-TRACE_SYSCALL_TABLE(sys_faccessat, sys_faccessat, 269, 3)
+#ifndef OVERRIDE_TABLE_64_faccessat
+TRACE_SYSCALL_TABLE(faccessat, faccessat, 269, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_pselect6
-TRACE_SYSCALL_TABLE(sys_pselect6, sys_pselect6, 270, 6)
+#ifndef OVERRIDE_TABLE_64_pselect6
+TRACE_SYSCALL_TABLE(pselect6, pselect6, 270, 6)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_ppoll
-TRACE_SYSCALL_TABLE(sys_ppoll, sys_ppoll, 271, 5)
+#ifndef OVERRIDE_TABLE_64_ppoll
+TRACE_SYSCALL_TABLE(ppoll, ppoll, 271, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_set_robust_list
-TRACE_SYSCALL_TABLE(sys_set_robust_list, sys_set_robust_list, 273, 2)
+#ifndef OVERRIDE_TABLE_64_set_robust_list
+TRACE_SYSCALL_TABLE(set_robust_list, set_robust_list, 273, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_get_robust_list
-TRACE_SYSCALL_TABLE(sys_get_robust_list, sys_get_robust_list, 274, 3)
+#ifndef OVERRIDE_TABLE_64_get_robust_list
+TRACE_SYSCALL_TABLE(get_robust_list, get_robust_list, 274, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_splice
-TRACE_SYSCALL_TABLE(sys_splice, sys_splice, 275, 6)
+#ifndef OVERRIDE_TABLE_64_splice
+TRACE_SYSCALL_TABLE(splice, splice, 275, 6)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_vmsplice
-TRACE_SYSCALL_TABLE(sys_vmsplice, sys_vmsplice, 278, 4)
+#ifndef OVERRIDE_TABLE_64_vmsplice
+TRACE_SYSCALL_TABLE(vmsplice, vmsplice, 278, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_move_pages
-TRACE_SYSCALL_TABLE(sys_move_pages, sys_move_pages, 279, 6)
+#ifndef OVERRIDE_TABLE_64_move_pages
+TRACE_SYSCALL_TABLE(move_pages, move_pages, 279, 6)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_utimensat
-TRACE_SYSCALL_TABLE(sys_utimensat, sys_utimensat, 280, 4)
+#ifndef OVERRIDE_TABLE_64_utimensat
+TRACE_SYSCALL_TABLE(utimensat, utimensat, 280, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_epoll_pwait
-TRACE_SYSCALL_TABLE(sys_epoll_pwait, sys_epoll_pwait, 281, 6)
+#ifndef OVERRIDE_TABLE_64_epoll_pwait
+TRACE_SYSCALL_TABLE(epoll_pwait, epoll_pwait, 281, 6)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_signalfd
-TRACE_SYSCALL_TABLE(sys_signalfd, sys_signalfd, 282, 3)
+#ifndef OVERRIDE_TABLE_64_signalfd
+TRACE_SYSCALL_TABLE(signalfd, signalfd, 282, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_timerfd_settime
-TRACE_SYSCALL_TABLE(sys_timerfd_settime, sys_timerfd_settime, 286, 4)
+#ifndef OVERRIDE_TABLE_64_timerfd_settime
+TRACE_SYSCALL_TABLE(timerfd_settime, timerfd_settime, 286, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_timerfd_gettime
-TRACE_SYSCALL_TABLE(sys_timerfd_gettime, sys_timerfd_gettime, 287, 2)
+#ifndef OVERRIDE_TABLE_64_timerfd_gettime
+TRACE_SYSCALL_TABLE(timerfd_gettime, timerfd_gettime, 287, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_accept4
-TRACE_SYSCALL_TABLE(sys_accept4, sys_accept4, 288, 4)
+#ifndef OVERRIDE_TABLE_64_accept4
+TRACE_SYSCALL_TABLE(accept4, accept4, 288, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_signalfd4
-TRACE_SYSCALL_TABLE(sys_signalfd4, sys_signalfd4, 289, 4)
+#ifndef OVERRIDE_TABLE_64_signalfd4
+TRACE_SYSCALL_TABLE(signalfd4, signalfd4, 289, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_pipe2
-TRACE_SYSCALL_TABLE(sys_pipe2, sys_pipe2, 293, 2)
+#ifndef OVERRIDE_TABLE_64_pipe2
+TRACE_SYSCALL_TABLE(pipe2, pipe2, 293, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_preadv
-TRACE_SYSCALL_TABLE(sys_preadv, sys_preadv, 295, 5)
+#ifndef OVERRIDE_TABLE_64_preadv
+TRACE_SYSCALL_TABLE(preadv, preadv, 295, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_pwritev
-TRACE_SYSCALL_TABLE(sys_pwritev, sys_pwritev, 296, 5)
+#ifndef OVERRIDE_TABLE_64_pwritev
+TRACE_SYSCALL_TABLE(pwritev, pwritev, 296, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_rt_tgsigqueueinfo
-TRACE_SYSCALL_TABLE(sys_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo, 297, 4)
+#ifndef OVERRIDE_TABLE_64_rt_tgsigqueueinfo
+TRACE_SYSCALL_TABLE(rt_tgsigqueueinfo, rt_tgsigqueueinfo, 297, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_perf_event_open
-TRACE_SYSCALL_TABLE(sys_perf_event_open, sys_perf_event_open, 298, 5)
+#ifndef OVERRIDE_TABLE_64_perf_event_open
+TRACE_SYSCALL_TABLE(perf_event_open, perf_event_open, 298, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_recvmmsg
-TRACE_SYSCALL_TABLE(sys_recvmmsg, sys_recvmmsg, 299, 5)
+#ifndef OVERRIDE_TABLE_64_recvmmsg
+TRACE_SYSCALL_TABLE(recvmmsg, recvmmsg, 299, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_fanotify_mark
-TRACE_SYSCALL_TABLE(sys_fanotify_mark, sys_fanotify_mark, 301, 5)
+#ifndef OVERRIDE_TABLE_64_fanotify_mark
+TRACE_SYSCALL_TABLE(fanotify_mark, fanotify_mark, 301, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_prlimit64
-TRACE_SYSCALL_TABLE(sys_prlimit64, sys_prlimit64, 302, 4)
+#ifndef OVERRIDE_TABLE_64_prlimit64
+TRACE_SYSCALL_TABLE(prlimit64, prlimit64, 302, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_name_to_handle_at
-TRACE_SYSCALL_TABLE(sys_name_to_handle_at, sys_name_to_handle_at, 303, 5)
+#ifndef OVERRIDE_TABLE_64_name_to_handle_at
+TRACE_SYSCALL_TABLE(name_to_handle_at, name_to_handle_at, 303, 5)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_open_by_handle_at
-TRACE_SYSCALL_TABLE(sys_open_by_handle_at, sys_open_by_handle_at, 304, 3)
+#ifndef OVERRIDE_TABLE_64_open_by_handle_at
+TRACE_SYSCALL_TABLE(open_by_handle_at, open_by_handle_at, 304, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_clock_adjtime
-TRACE_SYSCALL_TABLE(sys_clock_adjtime, sys_clock_adjtime, 305, 2)
+#ifndef OVERRIDE_TABLE_64_clock_adjtime
+TRACE_SYSCALL_TABLE(clock_adjtime, clock_adjtime, 305, 2)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_sendmmsg
-TRACE_SYSCALL_TABLE(sys_sendmmsg, sys_sendmmsg, 307, 4)
+#ifndef OVERRIDE_TABLE_64_sendmmsg
+TRACE_SYSCALL_TABLE(sendmmsg, sendmmsg, 307, 4)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_getcpu
-TRACE_SYSCALL_TABLE(sys_getcpu, sys_getcpu, 309, 3)
+#ifndef OVERRIDE_TABLE_64_getcpu
+TRACE_SYSCALL_TABLE(getcpu, getcpu, 309, 3)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_process_vm_readv
-TRACE_SYSCALL_TABLE(sys_process_vm_readv, sys_process_vm_readv, 310, 6)
+#ifndef OVERRIDE_TABLE_64_process_vm_readv
+TRACE_SYSCALL_TABLE(process_vm_readv, process_vm_readv, 310, 6)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_process_vm_writev
-TRACE_SYSCALL_TABLE(sys_process_vm_writev, sys_process_vm_writev, 311, 6)
+#ifndef OVERRIDE_TABLE_64_process_vm_writev
+TRACE_SYSCALL_TABLE(process_vm_writev, process_vm_writev, 311, 6)
 #endif
-#ifndef OVERRIDE_TABLE_64_sys_finit_module
-TRACE_SYSCALL_TABLE(sys_finit_module, sys_finit_module, 313, 3)
+#ifndef OVERRIDE_TABLE_64_finit_module
+TRACE_SYSCALL_TABLE(finit_module, finit_module, 313, 3)
 #endif
 
 #endif /* CREATE_SYSCALL_TABLE */