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

	* syscalls2.stp: Added compat_sys_pause to syscall.pause.

	* syscalls.stp:	Added sys_lstat64 to syscall.lstat.
	Added compat_sys_gettimeofday to syscall.gettimeofday.

	* ppc64/syscalls.stp: Remove sys_lstat64.
	* i686/syscalls.stp: Remove sys_lstat64.

5 files changed, 29 insertions, 34 deletions

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 27fc64d6..93c540d5 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,13 @@
+2007-05-09  Martin Hunt  <hunt@redhat.com>
+
+	* syscalls2.stp: Added compat_sys_pause to syscall.pause.
+
+	* syscalls.stp:	Added sys_lstat64 to syscall.lstat.
+	Added compat_sys_gettimeofday to syscall.gettimeofday.
+
+	* ppc64/syscalls.stp: Remove sys_lstat64.
+	* i686/syscalls.stp: Remove sys_lstat64.
+
 2007-04-25  David Wilder <dwilder@us.ibm.com>
 
         * syscall2.stp:syscall.pause added sys32_pause to probe list.
diff --git a/tapset/i686/syscalls.stp b/tapset/i686/syscalls.stp
index 4d3bf903..cacf2033 100644
--- a/tapset/i686/syscalls.stp
+++ b/tapset/i686/syscalls.stp
@@ -204,19 +204,6 @@ probe syscall.ipc.return = kernel.function("sys_ipc").return {
 	name = "ipc"
 	retstr = returnstr(1)
 }
-# lstat64 ____________________________________________________
-# long sys_lstat64(char __user * filename,
-#             struct stat64 __user * statbuf)
-probe syscall.lstat64 = kernel.function("sys_lstat64") {
-	name = "lstat"
-	filename = user_string($filename)
-	buf_uaddr = $statbuf
-	argstr = sprintf("\"%s\", %p", filename, $statbuf)
-}
-probe syscall.lstat64.return = kernel.function("sys_lstat64").return {
-	name = "lstat"
-	retstr = returnstr(1)
-}
 # olduname ___________________________________________________
 /*
  * asmlinkage long
diff --git a/tapset/ppc64/syscalls.stp b/tapset/ppc64/syscalls.stp
index 547ba47c..c21f13f4 100644
--- a/tapset/ppc64/syscalls.stp
+++ b/tapset/ppc64/syscalls.stp
@@ -239,20 +239,6 @@ probe syscall.compat_sys_newlstat.return =
 	name = "compat_sys_newlstat"
 	retstr = returnstr(1)
 }
-# lstat ______________________________________________________
-# long sys_lstat(char __user * filename, struct __old_kernel_stat __user * statbuf)
-probe syscall.lstat64 = 
-		kernel.function("sys_lstat64") ? {
-	name = "lstat64"
-	path = user_string($filename)
-	buf_uaddr = $statbuf
-	argstr = sprintf("%s, %p", user_string_quoted($filename), buf_uaddr)
-}
-probe syscall.lstat64.return = 
-		kernel.function("sys_lstat64").return ? {
-	name = "lstat64"
-	retstr = returnstr(1)
-}
 
 # compat_sys_ioctl ________________________________________
 #
diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp
index bffa16bf..dcbc21fd 100644
--- a/tapset/syscalls.stp
+++ b/tapset/syscalls.stp
@@ -1309,9 +1309,12 @@ probe syscall.gettid.return = kernel.function("sys_gettid").return {
 #	struct timezone __user *tz)
 # long sys32_gettimeofday(struct compat_timeval __user *tv, 
 #	struct timezone __user *tz)
+# long compat_sys_gettimeofday(struct compat_timeval __user *tv,
+#	struct timezone __user *tz)
 probe syscall.gettimeofday = 
 		kernel.function("sys_gettimeofday"),
-		kernel.function("sys32_gettimeofday") ?
+		kernel.function("sys32_gettimeofday") ?,
+		kernel.function("compat_sys_gettimeofday") ?
 {
 	name = "gettimeofday"
 	tv_uaddr = $tv
@@ -1321,7 +1324,8 @@ probe syscall.gettimeofday =
 
 probe syscall.gettimeofday.return = 
 		kernel.function("sys_gettimeofday").return,
-		kernel.function("sys32_gettimeofday").return ?
+		kernel.function("sys32_gettimeofday").return ?,
+		kernel.function("compat_sys_gettimeofday").return ?
 {
 	name = "gettimeofday"
 	retstr = returnstr(1)
@@ -1790,15 +1794,17 @@ probe syscall.lsetxattr.return = kernel.function("sys_lsetxattr").return {
 # long sys_newlstat(char __user * filename, struct stat __user * statbuf)
 # long compat_sys_newlstat(char __user * filename, struct compat_stat __user *statbuf)
 # long sys32_lstat64(char * filename, struct stat64 __user *statbuf)
+# long sys_lstat64(char __user * filename, struct stat64 __user * statbuf)
 #
 probe syscall.lstat = 
 		kernel.function("sys_lstat") ?,
 		kernel.function("sys_newlstat") ?,
 		kernel.function("compat_sys_newlstat") ?,
-		kernel.function("sys32_lstat64") ?
+		kernel.function("sys32_lstat64") ?,
+		kernel.function("sys_lstat64") ?
 {
 	name = "lstat"
-	file_name = user_string($filename)
+	path = user_string($filename)
 	buf_uaddr = $statbuf
 	argstr = sprintf("%s, %p", user_string_quoted($filename), $statbuf) 
 }
@@ -1806,7 +1812,8 @@ probe syscall.lstat.return =
 		kernel.function("sys_lstat").return ?,
 		kernel.function("sys_newlstat").return ?,
 		kernel.function("compat_sys_newlstat").return ?,
-		kernel.function("sys32_lstat64").return ?
+		kernel.function("sys32_lstat64").return ?,
+		kernel.function("sys_lstat64").return ?
 { 
 	name = "lstat"
 	retstr = returnstr(1)
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index 7ae774ef..042884d9 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -143,15 +143,20 @@ probe syscall.open.return =
 # sys_pause(void)
 #
 probe syscall.pause = kernel.function("sys_pause"),
-		      kernel.function("sys32_pause") ? {
+		      kernel.function("sys32_pause") ?,
+		      kernel.function("compat_sys_pause") ?
+{	
 	name = "pause"
 	argstr = ""
 }
 probe syscall.pause.return = kernel.function("sys_pause").return, 
-			     kernel.function("sys32_pause").return ? {
+			     kernel.function("sys32_pause").return ?,
+			     kernel.function("compat_sys_pause").return ?
+{
 	name = "pause"
 	retstr = returnstr(1)
 }
+
 # pciconfig_iobase ___________________________________________
 #
 # asmlinkage long