diff options
author | Mark Wielaard <mjw@redhat.com> | 2010-02-09 12:22:37 +0100 |
---|---|---|
committer | Mark Wielaard <mjw@redhat.com> | 2010-02-09 12:22:37 +0100 |
commit | 82d819db2debd4831a11139fe81781f2c4566ef8 (patch) | |
tree | 4a9be794d4e01f63273be2c3c3ce2b42524a2420 | |
parent | 1f6cb79459e181448d6e4e37381b57325b6d0fdb (diff) | |
download | systemtap-steved-82d819db2debd4831a11139fe81781f2c4566ef8.tar.gz systemtap-steved-82d819db2debd4831a11139fe81781f2c4566ef8.tar.xz systemtap-steved-82d819db2debd4831a11139fe81781f2c4566ef8.zip |
rhbz#563114 Make syscall.pipe sys32_pipe probe alias optional on x86_64.
Some distributions might have backported the pipe fd leak patch and removed
the sys32_pipe kernel function even before 2.6.32. So make the probe alias
optional instead of relying on a version check.
* tapset/x86_64/syscalls.stp (syscall.pipe): Make alias optional.
(syscall.pipe.return): Likewise.
-rw-r--r-- | tapset/x86_64/syscalls.stp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tapset/x86_64/syscalls.stp b/tapset/x86_64/syscalls.stp index 79a5181e..5ad064a2 100644 --- a/tapset/x86_64/syscalls.stp +++ b/tapset/x86_64/syscalls.stp @@ -145,16 +145,14 @@ probe syscall.vm86_warning.return = kernel.function("sys32_vm86_warning").return # pipe _______________________________________________________ # # long sys32_pipe(int __user *fd) -# -%(kernel_v < "2.6.32" %? -probe syscall.pipe32 = kernel.function("sys32_pipe") +# Not available in newer kernels. +probe syscall.pipe32 = kernel.function("sys32_pipe")? { name = "pipe" argstr = sprintf("%p", $fd) } -probe syscall.pipe32.return = kernel.function("sys32_pipe").return +probe syscall.pipe32.return = kernel.function("sys32_pipe").return? { name = "pipe" retstr = returnstr(1) } -%) |