Added ? to request_key probes in x86_64/syscalls.stp to prevent

syscall.* failures on some kernels.

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index c73c5b6bdf14f45dee8447eb034799634e148e18..3184f73b3152c7e945def8040f9f9c8634768929 100644 (file)
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-12  Mike Mason <mmlnx@us.ibm.com>
+
+       * x86_64/syscalls.stp: added ? to request_key aliases
+       to prevent syscall.* failures on some kernels 
+
 2006-12-29  Li Guanglei <guanglei@cn.ibm.com>
 
        From Gui Jian <guij@cn.ibm.com>

diff --git a/tapset/x86_64/syscalls.stp b/tapset/x86_64/syscalls.stp
index 2a18aab3bcef4b32e2a4555d2f60de8f8e80cdff..d1e1fc6c8f9f1ef53da846d930a91ce4b3964ab6 100644 (file)
--- a/tapset/x86_64/syscalls.stp
+++ b/tapset/x86_64/syscalls.stp
@@ -60,7 +60,7 @@ probe syscall.quotactl.return = kernel.function("sys_quotactl").return {
 #                   const char __user *_callout_info,
 #                   key_serial_t destringid)
 #
-probe syscall.request_key = kernel.function("sys_request_key") {
+probe syscall.request_key = kernel.function("sys_request_key") ? {
        name = "request_key"
        type_uaddr = $_type
        description_uaddr = $_description
@@ -69,7 +69,7 @@ probe syscall.request_key = kernel.function("sys_request_key") {
        argstr = sprintf("%p, %p, %p, %p", type_uaddr,
                        description_uaddr, callout_info_uaddr, destringid)
 }
-probe syscall.request_key.return = kernel.function("sys_request_key").return {
+probe syscall.request_key.return = kernel.function("sys_request_key").return ? {
        name = "request_key"
        retstr = returnstr(1)
 }