From 7ad82626231af2125ac35fe1776946542437c761 Mon Sep 17 00:00:00 2001 From: David Smith Date: Tue, 11 Feb 2014 12:03:58 -0600 Subject: [PATCH] Make 'signal.checkperm.return' optional, since it can be inlined. * tapset/linux/signal.stp: On some kernels, check_kill_permission() can be only inlined, so make 'signal.checkperm.return' optional. * testsuite/buildok/signal-detailed.stp: Make the 'signal.checkperm.return' test optional --- tapset/linux/signal.stp | 3 ++- testsuite/buildok/signal-detailed.stp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tapset/linux/signal.stp b/tapset/linux/signal.stp index 67bcc881d..48b7f5ff9 100644 --- a/tapset/linux/signal.stp +++ b/tapset/linux/signal.stp @@ -300,7 +300,8 @@ probe signal.checkperm = kernel.function("check_kill_permission") * @name: Name of the probe point * @retstr: Return value as a string */ -probe signal.checkperm.return = kernel.function("check_kill_permission").return +probe signal.checkperm.return = + kernel.function("check_kill_permission").return ? { name = "checkperm" retstr = return_str(1, $return) diff --git a/testsuite/buildok/signal-detailed.stp b/testsuite/buildok/signal-detailed.stp index 5a6b34da8..36b49c3a0 100755 --- a/testsuite/buildok/signal-detailed.stp +++ b/testsuite/buildok/signal-detailed.stp @@ -21,7 +21,7 @@ probe signal.checkperm printf("%s(%d(%s), %d(%s))\n", name, sig, sig_name, sig_pid, pid_name) printf("%s %p %p\n", si_code, task, sinfo) } -probe signal.checkperm.return +probe signal.checkperm.return ? { printf("%s() = %s\n", name, retstr) } -- 2.43.5