summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormmason <mmason>2007-01-13 03:02:48 +0000
committermmason <mmason>2007-01-13 03:02:48 +0000
commit929dfe691b8285651388ebaa44e2cd233917e194 (patch)
tree0afe64603cb1742e724252ecf90054843030ba17
parent46392da3e1bfad96fd428122fa1f0ed5182dbb9a (diff)
downloadsystemtap-steved-929dfe691b8285651388ebaa44e2cd233917e194.tar.gz
systemtap-steved-929dfe691b8285651388ebaa44e2cd233917e194.tar.xz
systemtap-steved-929dfe691b8285651388ebaa44e2cd233917e194.zip
Added ? to request_key probes in x86_64/syscalls.stp to prevent
syscall.* failures on some kernels.
-rw-r--r--tapset/ChangeLog5
-rw-r--r--tapset/x86_64/syscalls.stp4
2 files changed, 7 insertions, 2 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index c73c5b6b..3184f73b 100644
--- 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 2a18aab3..d1e1fc6c 100644
--- 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)
}