2007-12-12 Martin Hunt <hunt@redhat.com>

	* syscalls2.stp (compat_sys_ptrace): Remove for now.
	Utrace-patched kernels have a different compat_sys_ptrace().

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 8c9a28d8f1d426b99a0d1ceb9d2cbdff11fdc806..936d984739731f9c8c0b9e47c0996d4a453c1c77 100644 (file)
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-12  Martin Hunt  <hunt@redhat.com>
+
+       * syscalls2.stp (compat_sys_ptrace): Remove for now.
+       Utrace-patched kernels have a different compat_sys_ptrace().
+
 2007-12-7  Zhaolei  <zhaolei@cn.fujitsu.com>
 
        From Yang Zhiguo <yzgcsu@cn.fujitsu.com>

diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index 40410728a76720e13072fa4232857da8fdf24611..e49a9224f3b29ff1a0510dfe26abb462d77caa42 100644 (file)
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -455,28 +455,20 @@ probe syscall.compat_pselect7.return = kernel.function("compat_sys_pselect7").re
 
 # ptrace _____________________________________________________
 #
-# asmlinkage int
-# sys_ptrace(long request,
+# int sys_ptrace(long request,
 #              long pid,
 #              long addr,
 #              long data)
 #
-probe syscall.ptrace =
-               kernel.function("sys_ptrace") ?,
-               kernel.function("compat_sys_ptrace") ?
-{
-       name = "ptrace"
+probe syscall.ptrace = kernel.function("sys_ptrace") ? {
+       name = "ptrace" 
        request = $request
        pid = $pid
        addr = $addr
        data = $data
-       argstr = sprintf("%p, %p, %p, %p", request, pid,
-                               addr, data)
+       argstr = sprintf("%d, %d, %p, %p", request, pid, addr, data)
 }
-probe syscall.ptrace.return =
-               kernel.function("sys_ptrace").return ?,
-               kernel.function("compat_sys_ptrace").return ?
-{
+probe syscall.ptrace.return = kernel.function("sys_ptrace").return ? {
        name = "ptrace"
        retstr = returnstr(1)
 }