Fixed most syscalls testsuite failures.

1 files changed, 252 insertions, 173 deletions

diff --git a/tapset/ppc64/syscalls.stp b/tapset/ppc64/syscalls.stp
index 792ce0f8..be753dc9 100644
--- a/tapset/ppc64/syscalls.stp
+++ b/tapset/ppc64/syscalls.stp
@@ -327,13 +327,13 @@ probe syscall.compat_sys_newfstat.return =
 #		struct compat_statfs __user *buf)
 #
 probe syscall.compat_sys_statfs = kernel.function("compat_sys_statfs") {
-	name = "compat_sys_statfs"
+	name = "statfs"
 	path = user_string($path)
 	buf_uaddr = $buf
 	argstr = sprintf("%s, [%p]", path, buf_uaddr)
 }
 probe syscall.compat_sys_statfs.return =
-	kernel.function("compat_sys_statfs").return {
+	kernel.function("statfs").return {
 	name = "compat_sys_statfs"
 	retstr = returnstr(1)
 }
@@ -343,16 +343,31 @@ probe syscall.compat_sys_statfs.return =
 #		struct compat_statfs __user *buf)
 #
 probe syscall.compat_sys_fstatfs = kernel.function("compat_sys_fstatfs") {
-	name = "compat_sys_fstatfs"
+	name = "fstatfs"
 	fd = $fd
 	buf_uaddr = $buf
 	argstr = sprintf("%d, [%p]", fd, buf_uaddr)
 }
 probe syscall.compat_sys_fstatfs.return =
 	kernel.function("compat_sys_fstatfs").return {
-	name = "compat_sys_fstatfs"
+	name = "fstatfs"
+	retstr = returnstr(1)
+}
+# lstat ______________________________________________________
+# long sys_lstat(char __user * filename, struct __old_kernel_stat __user * statbuf)
+probe syscall.lstat = kernel.function("sys_lstat") ?,
+		kernel.function("sys_lstat64") ? {
+	name = "lstat"
+	file_name = user_string($filename)
+	buf_uaddr = $statbuf
+	argstr = sprintf("%s, [%p]", file_name, buf_uaddr)
+}
+probe syscall.lstat.return = kernel.function("sys_lstat").return ?,
+		kernel.function("sys_lstat64").return ? {
+	name = "lstat"
 	retstr = returnstr(1)
 }
+
 # compat_sys_ioctl ________________________________________
 #
 # asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
@@ -468,7 +483,7 @@ probe syscall.compat_sys_io_submit.return =
 #			void __user * data)
 #
 probe syscall.compat_sys_mount = kernel.function("compat_sys_mount") {
-	name = "compat_sys_mount"
+	name = "mount"
 	source = user_string($dev_name)
 	target = user_string($dir_name)
 	filesystemtype = user_string($type)
@@ -480,7 +495,7 @@ probe syscall.compat_sys_mount = kernel.function("compat_sys_mount") {
 }
 probe syscall.compat_sys_mount.return =
 	kernel.function("compat_sys_mount").return {
-	name = "compat_sys_mount"
+	name = "mount"
 	retstr = returnstr(1)
 }
 # compat_sys_getdents ________________________________________
@@ -526,16 +541,17 @@ probe syscall.compat_sys_getdents64.return =
 #				unsigned long vlen)
 #
 probe syscall.compat_sys_readv = kernel.function("compat_sys_readv") {
-	name = "compat_sys_readv"
+	name = "readv"
 /* FIXME: RHEL4 U3 ppc64 can't resolve $fd */
-#	fd = $fd
+	fd = $fd
 	vector_uaddr = $vec
 	count = $vlen
-	argstr = sprintf("unknown fd, [%p], %p", vector_uaddr, count)
+	//argstr = sprintf("unknown fd, [%p], %p", vector_uaddr, count)
+	argstr = sprintf("%d, [%p], %p", fd, vector_uaddr, count)
 }
 probe syscall.compat_sys_readv.return =
 	kernel.function("compat_sys_readv").return {
-	name = "compat_sys_readv"
+	name = "readv"
 	retstr = returnstr(1)
 }
 # compat_sys_writev ________________________________________
@@ -545,16 +561,16 @@ probe syscall.compat_sys_readv.return =
 #				unsigned long vlen)
 #
 probe syscall.compat_sys_writev = kernel.function("compat_sys_writev") {
-	name = "compat_sys_writev"
+	name = "writev"
 /* FIXME: RHEL4 U3 can't resolve $fd */
-#	fd = $fd
+	fd = $fd
 	vector_uaddr = $vec
 	count = $vlen
-	argstr = sprintf("unknown fd, [%p], %d", vector_uaddr, $vlen)
+	argstr = sprintf("%d, [%p], %d", fd, vector_uaddr, $vlen)
 }
 probe syscall.compat_sys_writev.return =
 	kernel.function("compat_sys_writev").return {
-	name = "compat_sys_writev"
+	name = "writev"
 	retstr = returnstr(1)
 }
 # compat_sys_select ________________________________________
@@ -583,6 +599,31 @@ probe syscall.compat_sys_select.return =
 	name = "compat_sys_select"
 	retstr = returnstr(1)
 }
+# compat_rt_sigaction _______________________________________________
+#
+# asmlinkage long
+# compat_sys_rt_sigaction(int sig,
+#                       const struct sigaction __user *act,
+#                       struct sigaction __user *oact,
+#                       size_t sigsetsize)
+#
+probe syscall.compat_rt_sigaction = kernel.function("compat_sys_rt_sigaction")?,
+		kernel.function("sys32_rt_sigaction") ? {
+	name = "rt_sigaction"
+	sig = $sig
+	act_uaddr = $act
+	oact_uaddr = $oact
+	sigsetsize = $sigsetsize
+	argstr = sprintf("%s, [%p], [%p], %p", _signal_name($sig),
+	act_uaddr, oact_uaddr, sigsetsize)
+}
+probe syscall.compat_rt_sigaction.return =
+	kernel.function("compat_sys_rt_sigaction").return ? ,
+	kernel.function("sys32_rt_sigaction").return ? {
+	name = "rt_sigaction"
+	retstr = returnstr(1)
+}
+
 # compat_sys_nfsservctl ________________________________________
 #
 # asmlinkage long compat_sys_nfsservctl(int cmd,
@@ -945,31 +986,111 @@ probe syscall.compat_sys_socketcall.return =
 	retstr = returnstr(1)
 }
 
-#
-# These system calls are removed in kernel version > 2.6.9-34????
-#
 
-%( kernel_vr <= "2.6.9-34" %?
 # acct _______________________________________________________
 # long sys_acct(const char __user *name)
 
-probe syscall.acct = kernel.function("sys_acct") {
+probe syscall.acct = kernel.function("sys_acct") ? {
 	name = "acct"
         filename = user_string($name)
 	argstr = filename
 }
-probe syscall.acct.return = kernel.function("sys_acct").return {
+probe syscall.acct.return = kernel.function("sys_acct").return ? {
 	name = "acct"
 	retstr = returnstr(1)
 }
 
+#sys32_open _______________________________________________________
+# asmlinkage long sys32_open(const char * filename, int flags, int mode)
+probe syscall.sys32_open = kernel.function("sys32_open") {
+	name = "open"
+	filename_uaddr = $filename
+	filename = user_string($filename)
+	flags = $flags
+	mode = $mode
+	if (flags & 64)
+	argstr = sprintf("[0x%x]:\"%s\", %s, %#o", filename_uaddr, filename, _sys_open_flag_str(flags), mode)
+	else
+	argstr = sprintf("[0x%x]:\"%s\", %s", filename_uaddr, filename, _sys_open_flag_str(flags))
+}
+probe syscall.sys32_open.return = kernel.function("sys32_open").return {
+	name = "open"
+	retstr = returnstr(1)
+}
+# old32_readdir ________________________________________
+#
+# asmlinkage int old32_readdir(unsigned int fd,
+#	struct old_linux_dirent32 __user *dirent,
+#	unsigned int count)
+#
+probe syscall.old32_readdir = kernel.function("old32_readdir") {
+	name = "old32_readdir"
+	fd = $fd
+	dirp_uaddr = $dirent
+	count = $count
+	argstr = sprintf("%d, [%p], %d", fd, dirp_uaddr, count)
+}
+probe syscall.old32_readdir.return =
+	kernel.function("old32_readdir").return {
+	name = "old32_readdir"
+	retstr = returnstr(1)
+}
+# sys64_time ________________________________________
+#
+# time_t sys64_time(time_t __user * tloc)
+#
+%( kernel_v <= "2.6.15" %?
+
+probe syscall.sys64_time = kernel.function("sys64_time") {
+	name = "sys64_time"
+	/* FIXME */
+	t_uaddr = $tloc
+	argstr = sprintf("[%p]", t_uaddr)
+}
+probe syscall.sys64_time.return = kernel.function("sys64_time").return {
+	name = "sys64_time"
+	retstr = returnstr(1)
+}
+%)
+# ppc64_personality ________________________________________
+#
+# long ppc64_personality(unsigned long personality)
+#
+probe syscall.ppc64_personality = kernel.function("ppc64_personality") {
+	name = "ppc64_personality"
+	persona = $personality
+	argstr = sprint($personality)
+}
+probe syscall.ppc64_personality.return =
+	kernel.function("ppc64_personality").return {
+	name = "ppc64_personality"
+	retstr = returnstr(1)
+}
+# ppc_rtas ________________________________________
+#
+# asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
+#
+probe syscall.ppc_rtas = kernel.function("ppc_rtas") {
+	name = "ppc_rtas"
+	uargs_uaddr = $uargs
+	argstr = sprintf("[%p]", uargs_uaddr)
+}
+probe syscall.ppc_rtas.return = kernel.function("ppc_rtas").return {
+	name = "ppc_rtas"
+	retstr = returnstr(1)
+}
+
+#
+#
+# These system calls i(to eof) are removed in kernel version > 2.6.9
+#
 # add_key ____________________________________________________
 # long sys_add_key(const char __user *_type,
 #             const char __user *_description,
 #             const void __user *_payload,
 #             size_t plen,
 #             key_serial_t ringid)
-probe syscall.add_key = kernel.function("sys_add_key") {
+probe syscall.add_key = kernel.function("sys_add_key") ? {
 	name = "add_key"
 	type_uaddr = $_type
 	description_auddr = $_description
@@ -978,7 +1099,7 @@ probe syscall.add_key = kernel.function("sys_add_key") {
 	ringid = $ringid
 	argstr = "add_key"
 }
-probe syscall.add_key.return = kernel.function("sys_add_key").return {
+probe syscall.add_key.return = kernel.function("sys_add_key").return ? {
 	name = "add_key"
 	retstr = returnstr(1)
 }
@@ -991,7 +1112,7 @@ probe syscall.add_key.return = kernel.function("sys_add_key").return {
 #		  qid_t id,
 #		  void __user *addr)
 #
-probe syscall.quotactl = kernel.function("sys_quotactl") {
+probe syscall.quotactl = kernel.function("sys_quotactl") ? {
 	name = "quotactl"
 	cmd = $cmd
 	cmd_str = _quotactl_cmd_str($cmd)
@@ -1001,7 +1122,7 @@ probe syscall.quotactl = kernel.function("sys_quotactl") {
 	argstr = sprintf("%s, %s, %p, [%p]", cmd_str, special_str,
 				id, addr_uaddr)
 }
-probe syscall.quotactl.return = kernel.function("sys_quotactl").return {
+probe syscall.quotactl.return = kernel.function("sys_quotactl").return ? {
 	name = "quotactl"
 	retstr = returnstr(1)
 }
@@ -1013,7 +1134,7 @@ probe syscall.quotactl.return = kernel.function("sys_quotactl").return {
 #		     const char __user *_callout_info,
 #		     key_serial_t destringid)
 #
-probe syscall.request_key = kernel.function("sys_request_key") {
+probe syscall.request_key = kernel.function("sys_request_key") ? {
 	name = "request_key"
 	type_uaddr = $_type
 	description_uaddr = $_description
@@ -1022,10 +1143,26 @@ probe syscall.request_key = kernel.function("sys_request_key") {
 	argstr = sprintf("[%p], [%p], [%p], %p", type_uaddr,
 			description_uaddr, callout_info_uaddr, destringid)
 }
-probe syscall.request_key.return = kernel.function("sys_request_key").return {
+probe syscall.request_key.return = kernel.function("sys_request_key").return ? {
 	name = "request_key"
 	retstr = returnstr(1)
 }
+# umask ______________________________________________________
+#
+# asmlinkage long
+# sys_umask(int mask)
+# 
+probe syscall.umask = kernel.function("sys_umask") ? {
+	name = "umask"
+	mask = $mask
+	argstr = sprintf("%#o", $mask)
+}
+probe syscall.umask.return =
+	kernel.function("sys_umask").return {
+	name = "umask"
+	retstr = returnstr(3)
+}
+
 
 # sys32_execve ________________________________________
 #
@@ -1033,14 +1170,14 @@ probe syscall.request_key.return = kernel.function("sys_request_key").return {
 #                  unsigned long a3, unsigned long a4, unsigned long a5,
 #                  struct pt_regs *regs)
 #
-probe syscall.sys32_execve = kernel.function("sys32_execve") {
+probe syscall.sys32_execve = kernel.function("sys32_execve") ? {
 	name = "sys32_execve"
 	filename = user_string($a0)
 	args = __get_argv($a1) 
 	argstr = sprintf("%s %s", filename, args)
 }
 probe syscall.sys32_execve.return =
-	kernel.function("sys32_execve").return {
+	kernel.function("sys32_execve").return ? {
 	name = "sys32_execve"
 	retstr = returnstr(1)
 }
@@ -1049,13 +1186,13 @@ probe syscall.sys32_execve.return =
 #
 # asmlinkage long sys32_time(compat_time_t __user * tloc)
 # 
-probe syscall.sys32_time = kernel.function("sys32_time") {
+probe syscall.sys32_time = kernel.function("sys32_time") ? {
 	name = "sys32_time"
 	/* FIXME */
 	t_uaddr = $tloc
 	argstr = sprintf("[%p]", t_uaddr)
 }
-probe syscall.sys32_time.return = kernel.function("sys32_time").return {
+probe syscall.sys32_time.return = kernel.function("sys32_time").return ? {
 	name = "sys32_time"
 	retstr = returnstr(1)
 }
@@ -1064,14 +1201,14 @@ probe syscall.sys32_time.return = kernel.function("sys32_time").return {
 #
 # long ppc64_sys32_stime(int __user * tptr)
 #
-probe syscall.ppc64_sys32_stime = kernel.function("ppc64_sys32_stime") {
+probe syscall.ppc64_sys32_stime = kernel.function("ppc64_sys32_stime") ? {
 	name = "ppc64_sys32_stime"
 	/* FIXME */
 	t_uaddr = $tptr
 	argstr = sprintf("[%p]", t_uaddr)
 }
 probe syscall.ppc64_sys32_stime.return =
-	kernel.function("ppc64_sys32_stime").return {
+	kernel.function("ppc64_sys32_stime").return ? {
 	name = "ppc64_sys32_stime"
 	retstr = returnstr(1)
 }
@@ -1081,7 +1218,7 @@ probe syscall.ppc64_sys32_stime.return =
 # int sys32_ptrace(long request, long pid, unsigned long addr,
 #		unsigned long data)
 #
-probe syscall.sys32_ptrace = kernel.function("sys32_ptrace") {
+probe syscall.sys32_ptrace = kernel.function("sys32_ptrace") ? {
 	name = "sys32_ptrace"
 	request = $request
 	pid = $pid
@@ -1090,7 +1227,7 @@ probe syscall.sys32_ptrace = kernel.function("sys32_ptrace") {
 	argstr = sprintf("%p, %p, %p, %p", request, pid,
 				addr, data)
 }
-probe syscall.sys32_ptrace.return = kernel.function("sys32_ptrace").return {
+probe syscall.sys32_ptrace.return = kernel.function("sys32_ptrace").return ? {
 	name = "sys32_ptrace"
 	retstr = returnstr(1)
 }
@@ -1098,11 +1235,11 @@ probe syscall.sys32_ptrace.return = kernel.function("sys32_ptrace").return {
 #
 # asmlinkage long sys32_pause(void)
 #
-probe syscall.sys32_pause = kernel.function("sys32_pause") {
+probe syscall.sys32_pause = kernel.function("sys32_pause") ? {
 	name = "sys32_pause"
 	argstr = ""
 }
-probe syscall.sys32_pause.return = kernel.function("sys32_pause").return {
+probe syscall.sys32_pause.return = kernel.function("sys32_pause").return ? {
 	name = "sys32_pause"
 	retstr = returnstr(1)
 }
@@ -1110,12 +1247,12 @@ probe syscall.sys32_pause.return = kernel.function("sys32_pause").return {
 #
 # asmlinkage int sys32_olduname(struct oldold_utsname __user * name)
 #
-probe syscall.sys32_olduname = kernel.function("sys32_olduname") {
+probe syscall.sys32_olduname = kernel.function("sys32_olduname") ? {
 	name = "sys32_olduname"
 	name_uaddr = $name
 	argstr = sprintf("[%p]", name_uaddr)
 }
-probe syscall.sys32_olduname.return = kernel.function("sys32_olduname").return {
+probe syscall.sys32_olduname.return = kernel.function("sys32_olduname").return ?{
 	name = "sys32_olduname"
 	retstr = returnstr(1)
 }
@@ -1124,7 +1261,7 @@ probe syscall.sys32_olduname.return = kernel.function("sys32_olduname").return {
 # long sys32_sigaction(int sig, struct old_sigaction32 __user *act,
 #		struct old_sigaction32 __user *oact)
 #
-probe syscall.sys32_sigaction = kernel.function("sys32_sigaction") {
+probe syscall.sys32_sigaction = kernel.function("sys32_sigaction") ? {
 	name = "sys32_sigaction"
 	sig = $sig
 	act_uaddr = $act
@@ -1133,7 +1270,7 @@ probe syscall.sys32_sigaction = kernel.function("sys32_sigaction") {
 			act_uaddr, oact_uaddr)
 }
 probe syscall.sys32_sigaction.return =
-	kernel.function("sys32_sigaction").return {
+	kernel.function("sys32_sigaction").return ? {
 	name = "sys32_sigaction"
 	retstr = returnstr(1)
 }
@@ -1142,13 +1279,13 @@ probe syscall.sys32_sigaction.return =
 # long sys32_sigsuspend(old_sigset_t mask, int p2, int p3, int p4, int p6,
 #			int p7, struct pt_regs *regs)
 #
-probe syscall.sys32_sigsuspend = kernel.function("sys32_sigsuspend") {
+probe syscall.sys32_sigsuspend = kernel.function("sys32_sigsuspend") ? {
 	name = "sys32_sigsuspend"
 	mask = $mask
 	argstr = sprintf("%p", mask)
 }
 probe syscall.sys32_sigsuspend.return =
-	kernel.function("sys32_sigsuspend").return {
+	kernel.function("sys32_sigsuspend").return ? {
 	name = "sys32_sigsuspend"
 	retstr = returnstr(1)
 }
@@ -1157,14 +1294,14 @@ probe syscall.sys32_sigsuspend.return =
 # asmlinkage long sys32_gettimeofday(struct compat_timeval __user *tv,
 #		struct timezone __user *tz)
 #
-probe syscall.sys32_gettimeofday = kernel.function("sys32_gettimeofday") {
+probe syscall.sys32_gettimeofday = kernel.function("sys32_gettimeofday") ? {
 	name = "sys32_gettimeofday"
 	tv_uaddr = $tv
 	tz_uaddr = $tz
 	argstr = sprintf("[%p], [%p]", tv_uaddr, tz_uaddr)
 }
 probe syscall.sys32_gettimeofday.return =
-	kernel.function("sys32_gettimeofday").return {
+	kernel.function("sys32_gettimeofday").return ? {
 	name = "sys32_gettimeofday"
 	retstr = returnstr(1)
 }
@@ -1173,14 +1310,14 @@ probe syscall.sys32_gettimeofday.return =
 # asmlinkage long sys32_settimeofday(struct compat_timeval __user *tv,
 #		struct timezone __user *tz)
 #
-probe syscall.sys32_settimeofday = kernel.function("sys32_settimeofday") {
+probe syscall.sys32_settimeofday = kernel.function("sys32_settimeofday") ? {
 	name = "sys32_settimeofday"
 	tv_uaddr = $tv
 	tz_uaddr = $tz
 	argstr = sprintf("[%p], [%p]", tv_uaddr, tz_uaddr)
 }
 probe syscall.sys32_settimeofday.return =
-	kernel.function("sys32_settimeofday").return {
+	kernel.function("sys32_settimeofday").return ? {
 	name = "sys32_settimeofday"
 	retstr = returnstr(1)
 }
@@ -1188,13 +1325,13 @@ probe syscall.sys32_settimeofday.return =
 #
 # asmlinkage long sys32_sysinfo(struct sysinfo32 __user *info)
 #
-probe syscall.sys32_sysinfo = kernel.function("sys32_sysinfo") {
+probe syscall.sys32_sysinfo = kernel.function("sys32_sysinfo") ? {
 	name = "sys32_sysinfo"
 	info_uaddr = $info
 	argstr = sprintf("[%p]", info_uaddr)
 }
 probe syscall.sys32_sysinfo.return =
-	kernel.function("sys32_sysinfo").return {
+	kernel.function("sys32_sysinfo").return ? {
 	name = "sys32_sysinfo"
 	retstr = returnstr(1)
 }
@@ -1203,7 +1340,7 @@ probe syscall.sys32_sysinfo.return =
 # long sys32_ipc(u32 call, u32 first, u32 second, u32 third,
 #			compat_uptr_t ptr, u32 fifth)
 #
-probe syscall.sys32_ipc = kernel.function("sys32_ipc") {
+probe syscall.sys32_ipc = kernel.function("sys32_ipc") ? {
 	name = "sys32_ipc"
 	call = $call
 	first = $first
@@ -1214,7 +1351,7 @@ probe syscall.sys32_ipc = kernel.function("sys32_ipc") {
 	argstr = sprintf("%d, %d, %d, %d, [%p], %d", call, first, second,
 				third, ptr_uaddr, fifth) 
 }
-probe syscall.sys32_ipc.return = kernel.function("sys32_ipc").return {
+probe syscall.sys32_ipc.return = kernel.function("sys32_ipc").return ? {
 	name = "sys32_ipc"
 	retstr = returnstr(1)
 }
@@ -1223,7 +1360,7 @@ probe syscall.sys32_ipc.return = kernel.function("sys32_ipc").return {
 # long sys32_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
 #			struct pt_regs *regs)
 #
-probe syscall.sys32_sigreturn = kernel.function("sys32_sigreturn") {
+probe syscall.sys32_sigreturn = kernel.function("sys32_sigreturn") ? {
 	name = "sys32_sigreturn"
 	r3 = $r3
 	r4 = $r4
@@ -1235,7 +1372,7 @@ probe syscall.sys32_sigreturn = kernel.function("sys32_sigreturn") {
 				 r3, r4, r5, r6, r7, r8)
 }
 probe syscall.sys32_sigreturn.return =
-	kernel.function("sys32_sigreturn").return {
+	kernel.function("sys32_sigreturn").return ? {
 	name = "sys32_sigreturn"
 	retstr = returnstr(1)
 }
@@ -1243,12 +1380,13 @@ probe syscall.sys32_sigreturn.return =
 #
 # asmlinkage long sys32_adjtimex(struct timex32 __user *utp)
 #
-probe syscall.sys32_adjtimex = kernel.function("sys32_adjtimex") {
+probe syscall.sys32_adjtimex = kernel.function("sys32_adjtimex") ? {
 	name = "sys32_adjtimex"
 	buf_uaddr = $utp
 	argstr = sprintf("[%p]", buf_uaddr)
 }
-probe syscall.sys32_adjtimex.return = kernel.function("sys32_adjtimex").return {
+probe syscall.sys32_adjtimex.return =
+		kernel.function("sys32_adjtimex").return ?{
 	name = "sys32_adjtimex"
 	retstr = returnstr(1)
 }
@@ -1258,7 +1396,7 @@ probe syscall.sys32_adjtimex.return = kernel.function("sys32_adjtimex").return {
 #			struct linux_dirent32 __user *dirent,
 #			unsigned int count)
 #
-probe syscall.sys32_getdents = kernel.function("sys32_getdents") {
+probe syscall.sys32_getdents = kernel.function("sys32_getdents") ? {
 	name = "sys32_getdents"
 	fd = $fd
 	dirp_uaddr = $dirent
@@ -1266,7 +1404,7 @@ probe syscall.sys32_getdents = kernel.function("sys32_getdents") {
 	argstr = sprintf("%d, [%p], %d", fd, dirp_uaddr, count)
 }
 probe syscall.sys32_getdents.return =
-	kernel.function("sys32_getdents").return {
+	kernel.function("sys32_getdents").return ? {
 	name = "sys32_getdents"
 	retstr = returnstr(1)
 }
@@ -1274,13 +1412,13 @@ probe syscall.sys32_getdents.return =
 #
 # asmlinkage long sys32_sysctl(struct __sysctl_args32 __user *args)
 #
-probe syscall.sys32_sysctl = kernel.function("sys32_sysctl") {
+probe syscall.sys32_sysctl = kernel.function("sys32_sysctl") ? {
 	name = "sys32_sysctl"
 	args_uaddr = $args
 	argstr = sprintf("[%p]", args_uaddr)
 }
 probe syscall.sys32_sysctl.return =
-	kernel.function("sys32_sysctl").return {
+	kernel.function("sys32_sysctl").return ? {
 	name = "sys32_sysctl"
 	retstr = returnstr(1)
 }
@@ -1289,14 +1427,14 @@ probe syscall.sys32_sysctl.return =
 # asmlinkage long sys32_sched_setparam(u32 pid,
 #		struct sched_param __user *param)
 #
-probe syscall.sys32_sched_setparam = kernel.function("sys32_sched_setparam") {
+probe syscall.sys32_sched_setparam = kernel.function("sys32_sched_setparam") ? {
 	name = "sys32_sched_setparam"
 	pid = $pid
 	param_uaddr = $param
 	argstr = sprintf("%d, [%p]", pid, param_uaddr)
 }
 probe syscall.sys32_sched_setparam.return =
-	kernel.function("sys32_sched_setparam").return {
+	kernel.function("sys32_sched_setparam").return ? {
 	name = "sys32_sched_setparam"
 	retstr = returnstr(1)
 }
@@ -1306,14 +1444,15 @@ probe syscall.sys32_sched_setparam.return =
 # asmlinkage long sys32_sched_rr_get_interval(u32 pid,
 #		struct compat_timespec __user *interval)
 #
-probe syscall.sys32_sched_rr_get_interval = kernel.function("sys32_sched_rr_get_interval") {
+probe syscall.sys32_sched_rr_get_interval =
+		kernel.function("sys32_sched_rr_get_interval") ? {
 	name = "sys32_sched_rr_get_interval"
 	pid = $pid
 	interval_uaddr = $interval
 	argstr = sprintf("%d, [%p]", pid, interval_uaddr)  
 }
 probe syscall.sys32_sched_rr_get_interval.return =
-	kernel.function("sys32_sched_rr_get_interval").return {
+	kernel.function("sys32_sched_rr_get_interval").return ? {
 	name = "sys32_sched_rr_get_interval"
 	retstr = returnstr(1)
 }
@@ -1323,7 +1462,7 @@ probe syscall.sys32_sched_rr_get_interval.return =
 #			struct pt_regs *regs)
 #
 #
-probe syscall.sys32_rt_sigreturn = kernel.function("sys32_rt_sigreturn") {
+probe syscall.sys32_rt_sigreturn = kernel.function("sys32_rt_sigreturn") ? {
 	name = "sys32_rt_sigreturn"
 	r3 = $r3
 	r4 = $r4
@@ -1335,7 +1474,7 @@ probe syscall.sys32_rt_sigreturn = kernel.function("sys32_rt_sigreturn") {
 				r3, r4, r5, r6, r7, r8)
 }
 probe syscall.sys32_rt_sigreturn.return =
-	kernel.function("sys32_rt_sigreturn").return {
+	kernel.function("sys32_rt_sigreturn").return ? {
 	name = "sys32_rt_sigreturn"
 	retstr = returnstr(1)
 }
@@ -1344,7 +1483,7 @@ probe syscall.sys32_rt_sigreturn.return =
 # long sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,
 #		struct sigaction32 __user *oact, size_t sigsetsize)
 #
-probe syscall.sys32_rt_sigaction = kernel.function("sys32_rt_sigaction") {
+probe syscall.sys32_rt_sigaction = kernel.function("sys32_rt_sigaction") ? {
 	name = "sys32_rt_sigaction"
 	sig = $sig
 	act_uaddr = $act
@@ -1354,7 +1493,7 @@ probe syscall.sys32_rt_sigaction = kernel.function("sys32_rt_sigaction") {
 				act_uaddr, oact_uaddr, sigsetsize)
 }
 probe syscall.sys32_rt_sigaction.return =
-	kernel.function("sys32_rt_sigaction").return {
+	kernel.function("sys32_rt_sigaction").return ? {
 	name = "sys32_rt_sigaction"
 	retstr = returnstr(1)
 }
@@ -1363,7 +1502,7 @@ probe syscall.sys32_rt_sigaction.return =
 # long sys32_rt_sigprocmask(u32 how, compat_sigset_t __user *set,
 #		compat_sigset_t __user *oset, size_t sigsetsize)
 #
-probe syscall.sys32_rt_sigprocmask = kernel.function("sys32_rt_sigprocmask") {
+probe syscall.sys32_rt_sigprocmask = kernel.function("sys32_rt_sigprocmask") ? {
 	name = "sys32_rt_sigprocmask"
 	how = $how
 	how_str = _sigprocmask_how_str($how)
@@ -1374,7 +1513,7 @@ probe syscall.sys32_rt_sigprocmask = kernel.function("sys32_rt_sigprocmask") {
 				oset_uaddr, sigsetsize)
 }
 probe syscall.sys32_rt_sigprocmask.return =
-	kernel.function("sys32_rt_sigprocmask").return {
+	kernel.function("sys32_rt_sigprocmask").return ? {
 	name = "sys32_rt_sigprocmask"
 	retstr = returnstr(1)
 }
@@ -1383,14 +1522,14 @@ probe syscall.sys32_rt_sigprocmask.return =
 # long sys32_rt_sigpending(compat_sigset_t __user *set,
 #			compat_size_t sigsetsize)
 #
-probe syscall.sys32_rt_sigpending = kernel.function("sys32_rt_sigpending") {
+probe syscall.sys32_rt_sigpending = kernel.function("sys32_rt_sigpending") ? {
 	name = "sys32_rt_sigpending"
 	set_uaddr = $set
 	sigsetsize = $sigsetsize
 	argstr = sprintf("[%p], %d", set_uaddr, $sigsetsize)
 }
 probe syscall.sys32_rt_sigpending.return =
-	kernel.function("sys32_rt_sigpending").return {
+	kernel.function("sys32_rt_sigpending").return ? {
 	name = "sys32_rt_sigpending"
 	retstr = returnstr(1)
 }
@@ -1401,7 +1540,8 @@ probe syscall.sys32_rt_sigpending.return =
 #			struct compat_timespec __user *uts,
 #			compat_size_t sigsetsize)
 #
-probe syscall.sys32_rt_sigtimedwait = kernel.function("sys32_rt_sigtimedwait") {
+probe syscall.sys32_rt_sigtimedwait =
+		kernel.function("sys32_rt_sigtimedwait") ? {
 	name = "sys32_rt_sigtimedwait"
 	uthese_uaddr = $uthese
 	uinfo_uaddr = $uinfo
@@ -1411,7 +1551,7 @@ probe syscall.sys32_rt_sigtimedwait = kernel.function("sys32_rt_sigtimedwait") {
 			uinfo_uaddr, uts_uaddr, sigsetsize)
 }
 probe syscall.sys32_rt_sigtimedwait.return =
-	kernel.function("sys32_rt_sigtimedwait").return {
+	kernel.function("sys32_rt_sigtimedwait").return ? {
 	name = "sys32_rt_sigtimedwait"
 	retstr = returnstr(1)
 }
@@ -1419,7 +1559,8 @@ probe syscall.sys32_rt_sigtimedwait.return =
 #
 # long sys32_rt_sigqueueinfo(u32 pid, u32 sig, compat_siginfo_t __user *uinfo)
 #
-probe syscall.sys32_rt_sigqueueinfo = kernel.function("sys32_rt_sigqueueinfo") {
+probe syscall.sys32_rt_sigqueueinfo =
+		kernel.function("sys32_rt_sigqueueinfo") ? {
 	name = "sys32_rt_sigqueueinfo"
 	pid = $pid
 	sig = $sig
@@ -1428,7 +1569,7 @@ probe syscall.sys32_rt_sigqueueinfo = kernel.function("sys32_rt_sigqueueinfo") {
 				uinfo_uaddr)
 }
 probe syscall.sys32_rt_sigqueueinfo.return =
-	kernel.function("sys32_rt_sigqueueinfo").return {
+	kernel.function("sys32_rt_sigqueueinfo").return ? {
 	name = "sys32_rt_sigqueueinfo"
 	retstr = returnstr(1)
 }
@@ -1437,12 +1578,12 @@ probe syscall.sys32_rt_sigqueueinfo.return =
 # int sys32_sigaltstack(u32 __new, u32 __old, int r5,
 #			int r6, int r7, int r8, struct pt_regs *regs)
 #
-probe syscall.sys32_sigaltstack = kernel.function("sys32_sigaltstack") {
+probe syscall.sys32_sigaltstack = kernel.function("sys32_sigaltstack") ? {
 	name = "sys32_sigaltstack"
 	argstr = "FIXME"
 }
 probe syscall.sys32_sigaltstack.return =
-	kernel.function("sys32_sigaltstack").return {
+	kernel.function("sys32_sigaltstack").return ? {
 	name = "sys32_sigaltstack"
 	retstr = returnstr(1)
 }
@@ -1451,7 +1592,7 @@ probe syscall.sys32_sigaltstack.return =
 # asmlinkage int sys32_sendfile64(int out_fd, int in_fd,
 #		compat_loff_t __user *offset, s32 count)
 #
-probe syscall.sys32_sendfile64 = kernel.function("sys32_sendfile64") {
+probe syscall.sys32_sendfile64 = kernel.function("sys32_sendfile64") ? {
 	name = "sys32_sendfile64"
 	out_fd = $out_fd
 	in_fd = $in_fd
@@ -1461,7 +1602,7 @@ probe syscall.sys32_sendfile64 = kernel.function("sys32_sendfile64") {
 				$count)
 }
 probe syscall.sys32_sendfile64.return =
-	kernel.function("sys32_sendfile64").return {
+	kernel.function("sys32_sendfile64").return ? {
 	name = "sys32_sendfile64"
 	retstr = returnstr(1)
 }
@@ -1471,7 +1612,7 @@ probe syscall.sys32_sendfile64.return =
 #			struct compat_sigevent __user *ev32,
 #			timer_t __user *timer_id)
 #
-probe syscall.ppc32_timer_create = kernel.function("ppc32_timer_create") {
+probe syscall.ppc32_timer_create = kernel.function("ppc32_timer_create") ? {
 	name = "ppc32_timer_create"
 	which_clock = $clock
 	timer_event_spec = $ev32
@@ -1480,7 +1621,7 @@ probe syscall.ppc32_timer_create = kernel.function("ppc32_timer_create") {
 				created_timer_id)
 }
 probe syscall.ppc32_timer_create.return =
-	kernel.function("ppc32_timer_create").return {
+	kernel.function("ppc32_timer_create").return ? {
 	name = "ppc32_timer_create"
 	retstr = returnstr(1)
 }
@@ -1490,7 +1631,7 @@ probe syscall.ppc32_timer_create.return =
 #			struct compat_itimerspec __user *new,
 #			struct compat_itimerspec __user *old)
 #
-probe syscall.compat_timer_settime = kernel.function("compat_timer_settime") {
+probe syscall.compat_timer_settime = kernel.function("compat_timer_settime") ? {
 	name = "compat_timer_settime"
 	timer_id = $timer_id
 	flags = $flags
@@ -1500,7 +1641,7 @@ probe syscall.compat_timer_settime = kernel.function("compat_timer_settime") {
 				new_setting_uaddr, old_setting_uaddr)
 }
 probe syscall.compat_timer_settime.return =
-	kernel.function("compat_timer_settime").return {
+	kernel.function("compat_timer_settime").return ? {
 	name = "compat_timer_settime"
 	retstr = returnstr(1)
 }
@@ -1509,14 +1650,14 @@ probe syscall.compat_timer_settime.return =
 # long compat_timer_gettime(timer_t timer_id,
 #		struct compat_itimerspec __user *setting)
 #
-probe syscall.compat_timer_gettime = kernel.function("compat_timer_gettime") {
+probe syscall.compat_timer_gettime = kernel.function("compat_timer_gettime") ? {
 	name = "compat_timer_gettime"
 	timer_id = $timer_id
 	setting_uaddr = $setting
 	argstr = sprintf("%d, [%p]", timer_id, setting_uaddr)
 }
 probe syscall.compat_timer_gettime.return =
-	kernel.function("compat_timer_gettime").return {
+	kernel.function("compat_timer_gettime").return ? {
 	name = "compat_timer_gettime"
 	retstr = returnstr(1)
 }
@@ -1525,14 +1666,14 @@ probe syscall.compat_timer_gettime.return =
 # long compat_clock_settime(clockid_t which_clock,
 #			struct compat_timespec __user *tp)
 #
-probe syscall.compat_clock_settime = kernel.function("compat_clock_settime") {
+probe syscall.compat_clock_settime = kernel.function("compat_clock_settime") ? {
 	name = "compat_clock_settime"
 	which_clock = $which_clock
 	tp_uaddr = $tp
 	argstr = sprintf("%d, [%p]", which_clock, tp_uaddr)
 }
 probe syscall.compat_clock_settime.return =
-	kernel.function("compat_clock_settime").return {
+	kernel.function("compat_clock_settime").return ? {
 	name = "compat_clock_settime"
 	retstr = returnstr(1)
 }
@@ -1541,14 +1682,14 @@ probe syscall.compat_clock_settime.return =
 # long compat_clock_gettime(clockid_t which_clock,
 #			struct compat_timespec __user *tp)
 #
-probe syscall.compat_clock_gettime = kernel.function("compat_clock_gettime") {
+probe syscall.compat_clock_gettime = kernel.function("compat_clock_gettime") ? {
 	name = "compat_clock_gettime"
 	which_clock = $which_clock
 	tp_uaddr = $tp
 	argstr = sprintf("%d, [%p]", which_clock, tp_uaddr)
 }
 probe syscall.compat_clock_gettime.return =
-	kernel.function("compat_clock_gettime").return {
+	kernel.function("compat_clock_gettime").return ? {
 	name = "compat_clock_gettime"
 	retstr = returnstr(1)
 }
@@ -1557,14 +1698,14 @@ probe syscall.compat_clock_gettime.return =
 # long compat_clock_getres(clockid_t which_clock,
 #			struct compat_timespec __user *tp)
 #
-probe syscall.compat_clock_getres = kernel.function("compat_clock_getres") {
+probe syscall.compat_clock_getres = kernel.function("compat_clock_getres") ? {
 	name = "compat_clock_getres"
 	which_clock = $which_clock
 	tp_uaddr = $tp
 	argstr = sprintf("%d, [%p]", which_clock, tp_uaddr)
 }
 probe syscall.compat_clock_getres.return =
-	kernel.function("compat_clock_getres").return {
+	kernel.function("compat_clock_getres").return ? {
 	name = "compat_clock_getres"
 	retstr = returnstr(1)
 }
@@ -1574,7 +1715,7 @@ probe syscall.compat_clock_getres.return =
 #			struct compat_timespec __user *rqtp,
 #			struct compat_timespec __user *rmtp)
 #
-probe syscall.compat_clock_nanosleep = kernel.function("compat_clock_nanosleep") {
+probe syscall.compat_clock_nanosleep = kernel.function("compat_clock_nanosleep") ? {
 	name = "compat_clock_nanosleep"
 	clock_id = $which_clock
 	clock_id_str = _get_wc_str($which_clock)
@@ -1586,7 +1727,7 @@ probe syscall.compat_clock_nanosleep = kernel.function("compat_clock_nanosleep")
 				flag_str, rqtp_uaddr, rmtp_uaddr)
 }
 probe syscall.compat_clock_nanosleep.return =
-	kernel.function("compat_clock_nanosleep").return {
+	kernel.function("compat_clock_nanosleep").return ? {
 	name = "compat_clock_nanosleep"
 	retstr = returnstr(1)
 }
@@ -1597,7 +1738,7 @@ probe syscall.compat_clock_nanosleep.return =
 #			int ctx_size, int r6, int r7, int r8,
 #			struct pt_regs *regs)
 #
-probe syscall.sys32_swapcontext = kernel.function("sys32_swapcontext") {
+probe syscall.sys32_swapcontext = kernel.function("sys32_swapcontext") ? {
 	name = "sys32_swapcontext"
 	old_ctx_uaddr = $old_ctx
 	new_ctx_uaddr = $new_ctx
@@ -1610,7 +1751,7 @@ probe syscall.sys32_swapcontext = kernel.function("sys32_swapcontext") {
 			old_ctx_uaddr, new_ctx_uaddr, r5, r6, r7, r8, regs)
 }
 probe syscall.sys32_swapcontext.return =
-	kernel.function("sys32_swapcontext").return {
+	kernel.function("sys32_swapcontext").return ? {
 	name = "sys32_swapcontext"
 	retstr = returnstr(1)
 }
@@ -1619,14 +1760,14 @@ probe syscall.sys32_swapcontext.return =
 # asmlinkage long sys32_utimes(char __user *filename,
 #			struct compat_timeval __user *tvs)
 #
-probe syscall.sys32_utimes = kernel.function("sys32_utimes") {
+probe syscall.sys32_utimes = kernel.function("sys32_utimes") ? {
 	name = "sys32_utimes"
 	filename_uaddr = $filename
 	filename = user_string($filename)
 	tvp_uaddr = $tvs
 	argstr = sprintf("%s, [%p]", filename, tvp_uaddr)
 }
-probe syscall.sys32_utimes.return = kernel.function("sys32_utimes").return {
+probe syscall.sys32_utimes.return = kernel.function("sys32_utimes").return ? {
 	name = "sys32_utimes"
 	retstr = returnstr(1)
 }
@@ -1635,7 +1776,7 @@ probe syscall.sys32_utimes.return = kernel.function("sys32_utimes").return {
 # asmlinkage long compat_statfs64(const char __user *path, compat_size_t sz,
 #		struct compat_statfs64 __user *buf)
 #
-probe syscall.compat_statfs64 = kernel.function("compat_statfs64") {
+probe syscall.compat_statfs64 = kernel.function("compat_statfs64") ? {
 	name = "compat_statfs64"
 	path_uaddr = $path
 	path = user_string($path)
@@ -1644,7 +1785,7 @@ probe syscall.compat_statfs64 = kernel.function("compat_statfs64") {
 	argstr = sprintf("%s, %d, [%p]", path, sz, buf_uaddr)
 }
 probe syscall.compat_statfs64.return =
-	kernel.function("compat_statfs64").return {
+	kernel.function("compat_statfs64").return ? {
 	name = "compat_statfs64"
 	retstr = returnstr(1)
 }
@@ -1653,7 +1794,7 @@ probe syscall.compat_statfs64.return =
 # asmlinkage long compat_fstatfs64(unsigned int fd, compat_size_t sz,
 #		struct compat_statfs64 __user *buf)
 #
-probe syscall.compat_fstatfs64 = kernel.function("compat_fstatfs64") {
+probe syscall.compat_fstatfs64 = kernel.function("compat_fstatfs64") ? {
 	name = "compat_fstatfs64"
 	fd = $fd
 	sz = $sz
@@ -1661,7 +1802,7 @@ probe syscall.compat_fstatfs64 = kernel.function("compat_fstatfs64") {
 	argstr = sprintf("%d, %d, [%p]", fd, sz, buf_uaddr)
 }
 probe syscall.compat_fstatfs64.return =
-	kernel.function("compat_fstatfs64").return {
+	kernel.function("compat_fstatfs64").return ? {
 	name = "compat_fstatfs64"
 	retstr = returnstr(1)
 }
@@ -1671,7 +1812,7 @@ probe syscall.compat_fstatfs64.return =
 #			compat_ulong_t mode, compat_ulong_t __user *nmask,
 #			compat_ulong_t maxnode, compat_ulong_t flags)
 #
-probe syscall.compat_mbind = kernel.function("compat_mbind") {
+probe syscall.compat_mbind = kernel.function("compat_mbind") ? {
 	name = "compat_mbind"
 	start_uaddr = $start
 	len = $len
@@ -1682,7 +1823,7 @@ probe syscall.compat_mbind = kernel.function("compat_mbind") {
 	argstr = sprintf("[%p], %d, %d, [%p], %d, %d", start_uaddr, len,
 			policy, nodemask_uaddr, maxnode, flags)
 }
-probe syscall.compat_mbind.return = kernel.function("compat_mbind").return {
+probe syscall.compat_mbind.return = kernel.function("compat_mbind").return ? {
 	name = "compat_mbind"
 	retstr = returnstr(1)
 }
@@ -1693,7 +1834,7 @@ probe syscall.compat_mbind.return = kernel.function("compat_mbind").return {
 #				compat_ulong_t maxnode,
 #				compat_ulong_t addr, compat_ulong_t flags)
 #
-probe syscall.compat_get_mempolicy = kernel.function("compat_get_mempolicy") {
+probe syscall.compat_get_mempolicy = kernel.function("compat_get_mempolicy") ? {
 	name = "compat_get_mempolicy"
 	policy_uaddr = $policy
 	nmask_uaddr = $nmask
@@ -1704,7 +1845,7 @@ probe syscall.compat_get_mempolicy = kernel.function("compat_get_mempolicy") {
 				maxnode, addr)
 }
 probe syscall.compat_get_mempolicy.return =
-	kernel.function("compat_get_mempolicy").return {
+	kernel.function("compat_get_mempolicy").return ? {
 	name = "compat_get_mempolicy"
 	retstr = returnstr(1)
 }
@@ -1713,7 +1854,7 @@ probe syscall.compat_get_mempolicy.return =
 # asmlinkage long compat_set_mempolicy(int mode, compat_ulong_t __user *nmask,
 #				compat_ulong_t maxnode)
 #
-probe syscall.compat_set_mempolicy = kernel.function("compat_set_mempolicy") {
+probe syscall.compat_set_mempolicy = kernel.function("compat_set_mempolicy") ? {
 	name = "compat_set_mempolicy"
 	policy = $mode
 	nodemask_uaddr = $nmask
@@ -1721,7 +1862,7 @@ probe syscall.compat_set_mempolicy = kernel.function("compat_set_mempolicy") {
 	argstr = sprintf("%d, [%p], %d", policy, nodemask_uaddr, maxnode)
 }
 probe syscall.compat_set_mempolicy.return =
-	kernel.function("compat_set_mempolicy").return {
+	kernel.function("compat_set_mempolicy").return ? {
 	name = "compat_set_mempolicy"
 	retstr = returnstr(1)
 }
@@ -1729,14 +1870,14 @@ probe syscall.compat_set_mempolicy.return =
 #
 # long ppc64_sys_stime(long __user * tptr)
 #
-probe syscall.ppc64_sys_stime = kernel.function("ppc64_sys_stime") {
+probe syscall.ppc64_sys_stime = kernel.function("ppc64_sys_stime") ? {
 	name = "ppc64_sys_stime"
 	/* FIXME */
 	t_uaddr = $tptr
 	argstr = sprintf("[%p]", t_uaddr)
 }
 probe syscall.ppc64_sys_stime.return =
-	kernel.function("ppc64_sys_stime").return {
+	kernel.function("ppc64_sys_stime").return ? {
 	name = "ppc64_sys_stime"
 	retstr = returnstr(1)
 }
@@ -1744,78 +1885,16 @@ probe syscall.ppc64_sys_stime.return =
 #
 # asmlinkage int ppc64_newuname(struct new_utsname __user * name)
 #
-probe syscall.ppc64_newuname = kernel.function("ppc64_newuname") {
+probe syscall.ppc64_newuname = kernel.function("ppc64_newuname") ? {
 	name = "ppc64_newuname"
 	name_uaddr = $name
 	argstr = sprintf("[%p]", name_uaddr)
 }
-probe syscall.ppc64_newuname.return = kernel.function("ppc64_newuname").return {
+probe syscall.ppc64_newuname.return = kernel.function("ppc64_newuname").return ? {
 	name = "ppc64_newuname"
 	retstr = returnstr(1)
 }
-%)
-#
-# 
 
-# old32_readdir ________________________________________
-#
-# asmlinkage int old32_readdir(unsigned int fd,
-#	struct old_linux_dirent32 __user *dirent,
-#	unsigned int count)
-#
-probe syscall.old32_readdir = kernel.function("old32_readdir") {
-	name = "old32_readdir"
-	fd = $fd
-	dirp_uaddr = $dirent
-	count = $count
-	argstr = sprintf("%d, [%p], %d", fd, dirp_uaddr, count)
-}
-probe syscall.old32_readdir.return =
-	kernel.function("old32_readdir").return {
-	name = "old32_readdir"
-	retstr = returnstr(1)
-}
-# sys64_time ________________________________________
 #
-# time_t sys64_time(time_t __user * tloc)
-#
-%( kernel_v <= "2.6.15" %?
+#  
 
-probe syscall.sys64_time = kernel.function("sys64_time") {
-	name = "sys64_time"
-	/* FIXME */
-	t_uaddr = $tloc
-	argstr = sprintf("[%p]", t_uaddr)
-}
-probe syscall.sys64_time.return = kernel.function("sys64_time").return {
-	name = "sys64_time"
-	retstr = returnstr(1)
-}
-%)
-# ppc64_personality ________________________________________
-#
-# long ppc64_personality(unsigned long personality)
-#
-probe syscall.ppc64_personality = kernel.function("ppc64_personality") {
-	name = "ppc64_personality"
-	persona = $personality
-	argstr = sprint($personality)
-}
-probe syscall.ppc64_personality.return =
-	kernel.function("ppc64_personality").return {
-	name = "ppc64_personality"
-	retstr = returnstr(1)
-}
-# ppc_rtas ________________________________________
-#
-# asmlinkage int ppc_rtas(struct rtas_args __user *uargs)
-#
-probe syscall.ppc_rtas = kernel.function("ppc_rtas") {
-	name = "ppc_rtas"
-	uargs_uaddr = $uargs
-	argstr = sprintf("[%p]", uargs_uaddr)
-}
-probe syscall.ppc_rtas.return = kernel.function("ppc_rtas").return {
-	name = "ppc_rtas"
-	retstr = returnstr(1)
-}