From: David Smith <dsmith@redhat.com>
Date: Tue, 12 Jan 2010 22:48:33 +0000 (-0600)
Subject: Fixed PR 11163 so that syscall.readv/syscall.writev puts fd in argstr for ppc.
X-Git-Tag: release-1.1~22
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=0effa39a119a901ad1304b1dc6ef9ba0c4735afe;p=systemtap.git

Fixed PR 11163 so that syscall.readv/syscall.writev puts fd in argstr for ppc.

* tapset/syscalls2.stp (syscall.readv): Removed old ppc hack.
  (syscall.writev): Ditto.
* tapset/nd_syscalls2.stp (nd_syscall.readv): Removed mention of old ppc
  hack.
  (nd_syscall.writev): Ditto.
---

diff --git a/tapset/nd_syscalls2.stp b/tapset/nd_syscalls2.stp
index 8b604f941..2b83e1fc6 100644
--- a/tapset/nd_syscalls2.stp
+++ b/tapset/nd_syscalls2.stp
@@ -869,13 +869,8 @@ probe nd_syscall.readv = kprobe.function("compat_sys_readv") ?,
 	name = "readv"
 	// vector_uaddr = $vec
 	// count = $vlen
-/* FIXME: RHEL4 U3 ppc64 can't resolve $fd */
-// %( arch != "powerpc" %?
 	// fd = $fd
 	// argstr = sprintf("%d, %p, %d", $fd, $vec, $vlen)
-// %:
-	// argstr = sprintf("unknown fd, %p, %d", $vec, $vlen)
-// %)
 	asmlinkage()
 	vector_uaddr = pointer_arg(2)
 	count = ulong_arg(3)
@@ -4477,13 +4472,8 @@ probe nd_syscall.writev = kprobe.function("compat_sys_writev") ?,
 	name = "writev"
 	// vector_uaddr = $vec
 	// count = $vlen
-/* FIXME: RHEL4 U3 ppc64 can't resolve $fd */
-// %( arch != "powerpc" %?
-    // fd = $fd
+	// fd = $fd
 	// argstr = sprintf("%d, %p, %d", $fd, $vec, $vlen)
-// %:
-	// argstr = sprintf("unknown fd, %p, %d", $vec, $vlen)
-// %)
 	asmlinkage()
 	vector_uaddr = pointer_arg(2)
 	count = ulong_arg(3)
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index c5384103d..37f07afb4 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -746,13 +746,8 @@ probe syscall.readv = kernel.function("compat_sys_readv").call ?,
 	name = "readv"
 	vector_uaddr = $vec
 	count = $vlen
-/* FIXME: RHEL4 U3 ppc64 can't resolve $fd */
-%( arch != "powerpc" %?
 	fd = $fd
 	argstr = sprintf("%d, %p, %d", $fd, $vec, $vlen)
-%:
-	argstr = sprintf("unknown fd, %p, %d", $vec, $vlen)
-%)
 }
 probe syscall.readv.return = kernel.function("compat_sys_readv").return ?,
                              kernel.function("SyS_readv").return !,
@@ -3712,13 +3707,8 @@ probe syscall.writev = kernel.function("compat_sys_writev").call ?,
 	name = "writev"
 	vector_uaddr = $vec
 	count = $vlen
-/* FIXME: RHEL4 U3 ppc64 can't resolve $fd */
-%( arch != "powerpc" %?
 	fd = $fd
 	argstr = sprintf("%d, %p, %d", $fd, $vec, $vlen)
-%:
-	argstr = sprintf("unknown fd, %p, %d", $vec, $vlen)
-%)
 }
 probe syscall.writev.return = kernel.function("compat_sys_writev").return ?,
                               kernel.function("SyS_writev").return !,