2006-06-19 Martin Hunt <hunt@redhat.com>

	* syscalls.stp: Make the 16-bit calls optional.
	* syscalls2.stp: Ditto.

3 files changed, 59 insertions, 58 deletions

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index c574975c..1a15f4a9 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-19  Martin Hunt  <hunt@redhat.com>
+
+	* syscalls.stp: Make the 16-bit calls optional.
+	* syscalls2.stp: Ditto.
+
 2006-06-09  Martin Hunt  <hunt@redhat.com>
 
 	* syscalls2.stp: Fix sys_sync.
diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp
index 2cac7599..cd8b110f 100644
--- a/tapset/syscalls.stp
+++ b/tapset/syscalls.stp
@@ -220,14 +220,14 @@ probe syscall.chown.return = kernel.function("sys_chown").return {
 # long sys_chown16(const char __user * filename, old_uid_t user, 
 #			old_gid_t group)
 #
-probe syscall.chown16 = kernel.function("sys_chown16") {
+probe syscall.chown16 = kernel.function("sys_chown16") ? {
 	name = "chown16"
 	path = user_string($filename)
 	owner = __short($user)
 	group = __short($group)
 	argstr = sprintf("\"%s\", %d, %d", path, owner, group)
 }
-probe syscall.chown16.return = kernel.function("sys_chown16").return {
+probe syscall.chown16.return = kernel.function("sys_chown16").return ? {
 	name = "chown16"
 	retstr = returnstr(1)
 }
@@ -552,14 +552,14 @@ probe syscall.fchown.return = kernel.function("sys_fchown").return {
 
 # fchown16 ___________________________________________________
 # long sys_fchown16(unsigned int fd, old_uid_t user, old_gid_t group)
-probe syscall.fchown16 = kernel.function("sys_fchown16") {
+probe syscall.fchown16 = kernel.function("sys_fchown16") ? {
 	name = "fchown16"
 	fd = $fd
 	owner = __short($user)
 	group = __short($group)
 	argstr = sprintf("%d, %d, %d", $fd, owner, group)
 }
-probe syscall.fchown16.return = kernel.function("sys_fchown16").return {
+probe syscall.fchown16.return = kernel.function("sys_fchown16").return ? {
 	name = "fchown16"
 	retstr = returnstr(1)
 }
@@ -907,7 +907,7 @@ probe syscall.getgid.return = kernel.function("sys_getgid").return {
 
 # getgid16 ___________________________________________________
 # long sys_getgid16(void)
-probe syscall.getgid16 = kernel.function("sys_getgid16") {
+probe syscall.getgid16 = kernel.function("sys_getgid16") ? {
 	name = "getgid16"
 }
 probe syscall.getgid16.return = kernel.function("sys_getgid16").return ? {
@@ -1045,14 +1045,14 @@ probe syscall.getresgid.return = kernel.function("sys_getresgid").return {
 # long sys_getresgid16(old_uid_t __user *rgid,
 #                 old_uid_t __user *egid,
 #                 old_uid_t __user *sgid)
-probe syscall.getresgid16 = kernel.function("sys_getresgid16") {
+probe syscall.getresgid16 = kernel.function("sys_getresgid16") ? {
 	name = "getresgid16"
 	rgid_uaddr = $rgid
 	egid_uaddr = $egid
 	sgid_uaddr = $sgid
 	argstr = sprintf("[%p], [%p], [%p]", rgid_uaddr, egid_uaddr, sgid_uaddr)
 }
-probe syscall.getresgid16.return = kernel.function("sys_getresgid16").return {
+probe syscall.getresgid16.return = kernel.function("sys_getresgid16").return ? {
 	name = "getresgid16"
 	retstr = returnstr(1)
 }
@@ -1077,14 +1077,14 @@ probe syscall.getresuid.return = kernel.function("sys_getresuid").return {
 # long sys_getresuid16(old_uid_t __user *ruid,
 #		old_uid_t __user *euid,
 #		old_uid_t __user *suid)
-probe syscall.getresuid16 = kernel.function("sys_getresuid16") {
+probe syscall.getresuid16 = kernel.function("sys_getresuid16") ? {
 	name = "getresuid16"
 	ruid_uaddr = $ruid
 	euid_uaddr = $euid
 	suid_uaddr = $suid
 	argstr = sprintf("[%p], [%p], [%p]", ruid_uaddr, euid_uaddr, suid_uaddr)
 }
-probe syscall.getresuid16.return = kernel.function("sys_getresuid16").return {
+probe syscall.getresuid16.return = kernel.function("sys_getresuid16").return ? {
 	name = "getresuid16"
 	retstr = returnstr(1)
 }
@@ -1439,14 +1439,14 @@ probe syscall.lchown.return = kernel.function("sys_lchown").return {
 # long sys_lchown16(const char __user * filename, old_uid_t user, 
 #			old_gid_t group)
 #
-probe syscall.lchown16 = kernel.function("sys_lchown16") {
+probe syscall.lchown16 = kernel.function("sys_lchown16") ? {
 	name = "lchown16"
 	path = user_string($filename)
 	owner = __short($user)
 	group = __short($group)
 	argstr = sprintf("\"%s\", %d, %d", path, owner, group)
 }
-probe syscall.lchown16.return = kernel.function("sys_lchown16").return {
+probe syscall.lchown16.return = kernel.function("sys_lchown16").return ? {
 	name = "lchown16"
 	retstr = returnstr(1)
 }
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index 76e08d86..bf42cf2e 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -20,41 +20,6 @@
 *          Set in return probes only.
 */
 
-# open _______________________________________________________
-# asmlinkage long sys_open(const char __user * filename, int flags, int mode)
-probe syscall.open = kernel.function("sys_open") {
-	name = "open"
-	filename = user_string($filename)
-	flags = $flags
-	mode = $mode
-	if (flags & 64)
-		argstr = sprintf("\"%s\", %s, %#o", filename, _sys_open_flag_str(flags), mode)
-	else
-		argstr = sprintf("\"%s\", %s", filename, _sys_open_flag_str(flags))
-}
-probe syscall.open.return = kernel.function("sys_open").return {
-	name = "open"
-	retstr = returnstr(1)
-}
-
-# read _______________________________________________________
-# ssize_t sys_read(unsigned int fd, char __user * buf, size_t count)
-probe syscall.read = kernel.function("sys_read") {
-	name = "read"
-	fd = $fd
-	buf_uaddr = $buf
-	count = $count
-	argstr = sprintf("%d, [%p], %d", $fd, $buf, $count)
-}
-probe syscall.read.return = kernel.function("sys_read").return {
-	name = "read"
-	retstr = returnstr(1)
-}
-
-#######################################################################
-################# OLD STUFF rewrite everything below here##############
-#######################################################################
-
 # nanosleep __________________________________________________
 #
 # asmlinkage long
@@ -193,6 +158,24 @@ probe syscall.old_getrlimit.return = kernel.function("sys_old_getrlimit").return
 	name = "old_getrlimit"
 	retstr = returnstr(1)
 }
+
+# open _______________________________________________________
+# asmlinkage long sys_open(const char __user * filename, int flags, int mode)
+probe syscall.open = kernel.function("sys_open") {
+	name = "open"
+	filename = user_string($filename)
+	flags = $flags
+	mode = $mode
+	if (flags & 64)
+		argstr = sprintf("\"%s\", %s, %#o", filename, _sys_open_flag_str(flags), mode)
+	else
+		argstr = sprintf("\"%s\", %s", filename, _sys_open_flag_str(flags))
+}
+probe syscall.open.return = kernel.function("sys_open").return {
+	name = "open"
+	retstr = returnstr(1)
+}
+
 # pause ______________________________________________________
 #
 # sys_pause(void)
@@ -427,6 +410,21 @@ probe syscall.pwrite64.return = kernel.function("sys_pwrite64").return {
 	name = "pwrite64"
 	retstr = returnstr(1)
 }
+
+# read _______________________________________________________
+# ssize_t sys_read(unsigned int fd, char __user * buf, size_t count)
+probe syscall.read = kernel.function("sys_read") {
+	name = "read"
+	fd = $fd
+	buf_uaddr = $buf
+	count = $count
+	argstr = sprintf("%d, [%p], %d", $fd, $buf, $count)
+}
+probe syscall.read.return = kernel.function("sys_read").return {
+	name = "read"
+	retstr = returnstr(1)
+}
+
 # readahead __________________________________________________
 #
 # asmlinkage ssize_t
@@ -1126,12 +1124,12 @@ probe syscall.setfsgid.return = kernel.function("sys_setfsgid").return {
 # setfsgid16 _________________________________________________
 # long sys_setfsgid16(old_gid_t gid)
 #
-probe syscall.setfsgid16 = kernel.function("sys_setfsgid16") {
+probe syscall.setfsgid16 = kernel.function("sys_setfsgid16") ? {
 	name = "setfsgid16"
 	gid = $gid
 	argstr = sprint($gid)
 }
-probe syscall.setfsgid16.return = kernel.function("sys_setfsgid16").return {
+probe syscall.setfsgid16.return = kernel.function("sys_setfsgid16").return ? {
 	name = "setfsgid16"
 	retstr = returnstr(1)
 }
@@ -1150,12 +1148,12 @@ probe syscall.setfsuid.return = kernel.function("sys_setfsuid").return {
 # setfsuid16 _________________________________________________
 # long sys_setfsuid16(old_uid_t uid)
 #
-probe syscall.setfsuid16 = kernel.function("sys_setfsuid16") {
+probe syscall.setfsuid16 = kernel.function("sys_setfsuid16") ? {
 	name = "setfsuid16"
 	uid = $uid
 	argstr = sprint($uid)
 }
-probe syscall.setfsuid16.return = kernel.function("sys_setfsuid16").return {
+probe syscall.setfsuid16.return = kernel.function("sys_setfsuid16").return ? {
 	name = "setfsuid16"
 	retstr = returnstr(1)
 }
@@ -1296,13 +1294,13 @@ probe syscall.setregid.return = kernel.function("sys_setregid").return {
 # setregid16 _________________________________________________
 # long sys_setregid16(old_gid_t rgid, old_gid_t egid)
 #
-probe syscall.setregid16 = kernel.function("sys_setregid16") {
+probe syscall.setregid16 = kernel.function("sys_setregid16") ? {
 	name = "setregid16"
 	rgid = __short($rgid)
 	egid = __short($egid)
 	argstr = sprintf("%d, %d",rgid, egid)
 }
-probe syscall.setregid16.return = kernel.function("sys_setregid16").return {
+probe syscall.setregid16.return = kernel.function("sys_setregid16").return ? {
 	name = "setregid16"
 	retstr = returnstr(1)
 }
@@ -1387,13 +1385,13 @@ probe syscall.setreuid.return = kernel.function("sys_setreuid").return {
 # setreuid16 _________________________________________________
 # long sys_setreuid16(old_uid_t ruid, old_uid_t euid)
 #
-probe syscall.setreuid16 = kernel.function("sys_setreuid16") {
+probe syscall.setreuid16 = kernel.function("sys_setreuid16") ? {
 	name = "setreuid16"
 	ruid = __short($ruid)
 	euid = __short($euid)
 	argstr = sprintf("%d, %d", ruid, euid)
 }
-probe syscall.setreuid16.return = kernel.function("sys_setreuid16").return {
+probe syscall.setreuid16.return = kernel.function("sys_setreuid16").return ? {
 	name = "setreuid16"
 	retstr = returnstr(1)
 }
@@ -2199,11 +2197,9 @@ probe syscall.ustat.return = kernel.function("sys_ustat").return {
 	name = "ustat"
 	retstr = returnstr(1)
 }
+
 # utime ______________________________________________________
-#
-# asmlinkage long
-# sys_utime(char __user * filename,
-#	     struct utimbuf __user * times)
+# long sys_utime(char __user * filename, struct utimbuf __user * times)
 #
 probe syscall.utime = kernel.function("sys_utime") {
 	name = "utime"