2007-05-17 Martin Hunt <hunt@redhat.com>

	* syscalls.stp: Make optional sys_alarm, sys_fadvise64,
	sys_gethostname, sys_getpgrp, and sys_llseek.
	(syscall.getrlimit): Add optional calls sys_old_getrlimit,
	compat_sys_getrlimit, and compat_sys_old_getrlimit.

	* syscalls2.stp: Make optional sys_nice, sys_rt_sigreturn,
	sys_signal, sys_sigprocmask, sys_utime
	(syscall.old_getrlimit): Moved into syscall.getrlimit.

3 files changed, 54 insertions, 49 deletions

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 93017dad..efd3d892 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,14 @@
+2007-05-17  Martin Hunt  <hunt@redhat.com>
+
+	* syscalls.stp: Make optional sys_alarm, sys_fadvise64,
+	sys_gethostname, sys_getpgrp, and sys_llseek.
+	(syscall.getrlimit): Add optional calls sys_old_getrlimit,
+	compat_sys_getrlimit, and compat_sys_old_getrlimit.
+
+	* syscalls2.stp: Make optional sys_nice, sys_rt_sigreturn,
+	sys_signal, sys_sigprocmask, sys_utime
+	(syscall.old_getrlimit): Moved into syscall.getrlimit.
+	
 2007-05-16  Will Cohen  <wcohen@redhat.com>
 	PR 4471
 	* syscall2.stp: Correct sys_pipe function args for ia64.
diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp
index dcbc21fd..51117fb2 100644
--- a/tapset/syscalls.stp
+++ b/tapset/syscalls.stp
@@ -121,12 +121,12 @@ probe syscall.adjtimex.return = kernel.function("sys_adjtimex").return {
 
 # alarm ______________________________________________________
 # unsigned long sys_alarm (unsigned int seconds)
-probe syscall.alarm = kernel.function("sys_alarm") {
+probe syscall.alarm = kernel.function("sys_alarm") ? {
 	name = "alarm"
 	seconds = $seconds
 	argstr = sprint($seconds)
 }
-probe syscall.alarm.return = kernel.function("sys_alarm").return {
+probe syscall.alarm.return = kernel.function("sys_alarm").return ? {
 	name = "alarm"
 	retstr = returnstr(1)
 }
@@ -523,7 +523,7 @@ probe syscall.exit_group.return = end {}
 # fadvise64 __________________________________________________
 # long sys_fadvise64(int fd, loff_t offset, size_t len,  int advice)
 #
-probe syscall.fadvise64 = kernel.function("sys_fadvise64") {
+probe syscall.fadvise64 = kernel.function("sys_fadvise64") ? {
 	name = "fadvise64"
 	fs = $fd
 	offset = $offset
@@ -531,7 +531,7 @@ probe syscall.fadvise64 = kernel.function("sys_fadvise64") {
 	advice = $advice
 	argstr = sprintf("%d, %d, %d, %s", $fd, $offset, $len, _fadvice_advice_str($advice))
 }
-probe syscall.fadvise64.return = kernel.function("sys_fadvise64").return {
+probe syscall.fadvise64.return = kernel.function("sys_fadvise64").return ? {
 	name = "fadvise64"
 	retstr = returnstr(1)
 }
@@ -1028,13 +1028,13 @@ probe syscall.getgroups.return = kernel.function("sys_getgroups").return {
 
 # gethostname ________________________________________________
 # long sys_gethostname(char __user *name, int len)
-probe syscall.gethostname = kernel.function("sys_gethostname") {
+probe syscall.gethostname = kernel.function("sys_gethostname") ? {
 	name = "gethostname"
 	name_uaddr = $name
 	len = $len
 	argstr = sprintf ("%p, %d", name_uaddr, len)
 }
-probe syscall.gethostname.return = kernel.function("sys_gethostname").return {
+probe syscall.gethostname.return = kernel.function("sys_gethostname").return ? {
 	name = "gethostname"
 	retstr = returnstr(1)
 }
@@ -1113,10 +1113,10 @@ probe syscall.getpgid.return = kernel.function("sys_getpgid").return {
 
 # getpgrp ____________________________________________________
 # long sys_getpgrp(void)
-probe syscall.getpgrp = kernel.function("sys_getpgrp") {
+probe syscall.getpgrp = kernel.function("sys_getpgrp") ? {
 	name = "getpgrp"
 }
-probe syscall.getpgrp.return = kernel.function("sys_getpgrp").return {
+probe syscall.getpgrp.return = kernel.function("sys_getpgrp").return ? {
 	name = "getpgrp"
 	retstr = returnstr(1)
 }
@@ -1219,13 +1219,24 @@ probe syscall.getresuid16.return = kernel.function("sys_getresuid16").return ? {
 
 # getrlimit __________________________________________________
 # long sys_getrlimit(unsigned int resource, struct rlimit __user *rlim)
-probe syscall.getrlimit = kernel.function("sys_getrlimit") {
+# long sys_old_getrlimit(unsigned int resource, struct rlimit __user *rlim)
+# long compat_sys_old_getrlimit(unsigned int resource, struct compat_rlimit __user *rlim)
+# long compat_sys_getrlimit (unsigned int resource, struct compat_rlimit __user *rlim)
+probe syscall.getrlimit = kernel.function("sys_getrlimit"),
+                          kernel.function("sys_old_getrlimit") ?,
+                          kernel.function("compat_sys_getrlimit") ?,
+                          kernel.function("compat_sys_old_getrlimit") ?
+{
 	name = "getrlimit"
 	resource = $resource
 	rlim_uaddr = $rlim
 	argstr = sprintf("%s, %p", _rlimit_resource_str($resource), rlim_uaddr)
 }
-probe syscall.getrlimit.return = kernel.function("sys_getrlimit").return {
+probe syscall.getrlimit.return = kernel.function("sys_getrlimit").return,
+                                 kernel.function("sys_old_getrlimit").return ?,
+	                         kernel.function("compat_sys_getrlimit").return ?,
+                                 kernel.function("compat_sys_old_getrlimit").return ?
+{
 	name = "getrlimit"
 	retstr = returnstr(1)
 }
@@ -1701,7 +1712,7 @@ probe syscall.llistxattr.return = kernel.function("sys_llistxattr").return {
 #            unsigned long offset_low,
 #            loff_t __user * result,
 #            unsigned int origin)
-probe syscall.llseek = kernel.function("sys_llseek") {
+probe syscall.llseek = kernel.function("sys_llseek") ? {
 	name = "llseek"
 	fd = $fd
 	offset_high = $offset_high
@@ -1712,7 +1723,7 @@ probe syscall.llseek = kernel.function("sys_llseek") {
 	argstr = sprintf("%d, 0x%x, 0x%x, %p, %s", $fd, $offset_high,
 		$offset_low, $result, whence_str)
 }
-probe syscall.llseek.return = kernel.function("sys_llseek").return {
+probe syscall.llseek.return = kernel.function("sys_llseek").return ? {
 	name = "llseek"
 	retstr = returnstr(1)
 }
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index f48a0f94..5ce1b4b5 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -70,12 +70,12 @@ probe syscall.nfsservctl.return = kernel.function("sys_nfsservctl").return {
 # nice _______________________________________________________
 # long sys_nice(int increment)
 #
-probe syscall.nice = kernel.function("sys_nice") {
+probe syscall.nice = kernel.function("sys_nice") ? {
 	name = "nice"
 	inc = $increment
 	argstr = sprintf("%d", $increment)
 }
-probe syscall.nice.return = kernel.function("sys_nice").return {
+probe syscall.nice.return = kernel.function("sys_nice").return ? {
 	name = "nice"
 	retstr = returnstr(1)
 }
@@ -93,24 +93,6 @@ probe syscall.ni_syscall.return = kernel.function("sys_ni_syscall").return {
 	retstr = returnstr(1)
 }
 
-# old_getrlimit ______________________________________________
-#
-# asmlinkage long
-# sys_old_getrlimit(unsigned int resource,
-#			 struct rlimit __user *rlim)
-#
-probe syscall.old_getrlimit = kernel.function("sys_old_getrlimit") {
-	name = "old_getrlimit"
-	resource = $resource
-	resource_str = _rlimit_resource_str($resource)
-	rlim_uaddr = $rlim
-	argstr = sprintf("%s, %p", resource_str, rlim_uaddr)
-}
-probe syscall.old_getrlimit.return = kernel.function("sys_old_getrlimit").return {
-	name = "old_getrlimit"
-	retstr = returnstr(1)
-}
-
 # open _______________________________________________________
 # long sys_open(const char __user * filename, int flags, int mode)
 probe syscall.open = 
@@ -142,14 +124,14 @@ probe syscall.open.return =
 #
 # sys_pause(void)
 #
-probe syscall.pause = kernel.function("sys_pause"),
+probe syscall.pause = kernel.function("sys_pause") ?,
 		      kernel.function("sys32_pause") ?,
 		      kernel.function("compat_sys_pause") ?
 {	
 	name = "pause"
 	argstr = ""
 }
-probe syscall.pause.return = kernel.function("sys_pause").return, 
+probe syscall.pause.return = kernel.function("sys_pause").return ?, 
 			     kernel.function("sys32_pause").return ?,
 			     kernel.function("compat_sys_pause").return ?
 {
@@ -765,11 +747,11 @@ probe syscall.rt_sigqueueinfo.return =
 # rt_sigreturn _______________________________________________
 # int sys_rt_sigreturn(unsigned long __unused)
 #
-probe syscall.rt_sigreturn = kernel.function("sys_rt_sigreturn") {
+probe syscall.rt_sigreturn = kernel.function("sys_rt_sigreturn") ? {
 	name = "rt_sigreturn"
 	argstr = ""
 }
-probe syscall.rt_sigreturn.return = kernel.function("sys_rt_sigreturn").return {
+probe syscall.rt_sigreturn.return = kernel.function("sys_rt_sigreturn").return ? {
 	name = "rt_sigreturn"
 	retstr = returnstr(1)
 }
@@ -1714,13 +1696,13 @@ probe syscall.shutdown.return = kernel.function("sys_shutdown").return {
 # signal _____________________________________________________
 # unsigned long sys_signal(int sig, __sighandler_t handler)
 #
-probe syscall.signal = kernel.function("sys_signal") {
+probe syscall.signal = kernel.function("sys_signal") ? {
 	name = "signal"
 	sig = $sig
 	handler = $handler
 	argstr = sprintf("%s, %p", _signal_name($sig), $handler)
 }
-probe syscall.signal.return = kernel.function("sys_signal").return {
+probe syscall.signal.return = kernel.function("sys_signal").return ? {
 	name = "signal"
 	retstr = returnstr(1)
 }
@@ -1751,11 +1733,11 @@ probe syscall.sigpending.return = kernel.function("do_sigpending").return {
 }
 
 # sigprocmask ________________________________________________
-# long sys_sigprocmask(int how,
-#		     old_sigset_t __user *set,
-#		     old_sigset_t __user *oset)
-#
-probe syscall.sigprocmask = kernel.function("sys_sigprocmask") {
+# long sys_sigprocmask(int how, old_sigset_t __user *set, old_sigset_t __user *oset)
+# long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set, compat_old_sigset_t __user *oset)
+probe syscall.sigprocmask = kernel.function("sys_sigprocmask") ?,
+                            kernel.function("compat_sys_sigprocmask") ?
+{
 	name = "sigprocmask"
 	how  = $how
 	how_str = _sigprocmask_how_str($how)
@@ -1774,7 +1756,9 @@ probe syscall.sigprocmask = kernel.function("sys_sigprocmask") {
 	oldset_uaddr = $oset
 	argstr = sprintf("%s, %p, %p", how_str, $set, $oset)
 }
-probe syscall.sigprocmask.return = kernel.function("sys_sigprocmask").return {
+probe syscall.sigprocmask.return = kernel.function("sys_sigprocmask").return ?,
+                                   kernel.function("compat_sys_sigprocmask").return ?
+{
 	name = "sigprocmask"
 	retstr = returnstr(1)
 }
@@ -2363,7 +2347,7 @@ probe syscall.ustat.return =
 
 # utime ______________________________________________________
 # long sys_utime(char __user * filename, struct utimbuf __user * times)
-probe syscall.utime = kernel.function("sys_utime") {
+probe syscall.utime = kernel.function("sys_utime") ? {
 	name = "utime"
 	filename_uaddr = $filename
 	filename = user_string($filename)
@@ -2371,10 +2355,11 @@ probe syscall.utime = kernel.function("sys_utime") {
 	buf_str = _struct_utimbuf_u($times)
 	argstr = sprintf("%s, [%s]", user_string_quoted($filename), buf_str)
 }
-probe syscall.utime.return = kernel.function("sys_utime").return {
+probe syscall.utime.return = kernel.function("sys_utime").return ? {
 	name = "utime"
 	retstr = returnstr(1)
 }
+
 # long compat_sys_utime(char __user *filename, struct compat_utimbuf __user *t)
 probe syscall.compat_utime = kernel.function("compat_sys_utime") ? {
 	name = "utime"
@@ -2391,9 +2376,7 @@ probe syscall.compat_utime.return = kernel.function("compat_sys_utime").return ?
 
 # utimes _____________________________________________________
 #
-# asmlinkage long
-# sys_utimes(char __user * filename,
-#		struct timeval __user * utimes)
+# long sys_utimes(char __user * filename, struct timeval __user * utimes)
 #
 probe syscall.utimes = kernel.function("sys_utimes") {
 	name = "utimes"