summaryrefslogtreecommitdiffstats
path: root/tapset
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2008-03-06 22:08:07 -0500
committerFrank Ch. Eigler <fche@elastic.org>2008-03-06 22:08:07 -0500
commitbf6c85c35a749ca8cc6bea20a7774d063c218938 (patch)
treec26fe5564d9348d8857e791ed0b8000ab8670303 /tapset
parentc108ad66d2218a1311b8891f1194d08179ae7c19 (diff)
parenta4531d21d2457f2b0f8dc44cace9195f241041e9 (diff)
downloadsystemtap-steved-bf6c85c35a749ca8cc6bea20a7774d063c218938.tar.gz
systemtap-steved-bf6c85c35a749ca8cc6bea20a7774d063c218938.tar.xz
systemtap-steved-bf6c85c35a749ca8cc6bea20a7774d063c218938.zip
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'tapset')
-rw-r--r--tapset/ChangeLog5
-rw-r--r--tapset/i686/syscalls.stp4
2 files changed, 7 insertions, 2 deletions
diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 4c65ccc0..32ac6bf2 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-06 Ananth N Mavinakayanahalli <ananth@in.ibm.com
+
+ * i686/syscalls.stp: Handle sys_sigaltstack parameter after
+ register unification
+
2008-02-28 Will Cohen <wcohen@redhat.com>
PR433780
diff --git a/tapset/i686/syscalls.stp b/tapset/i686/syscalls.stp
index 75bc960d..8e69f622 100644
--- a/tapset/i686/syscalls.stp
+++ b/tapset/i686/syscalls.stp
@@ -119,8 +119,8 @@ probe syscall.set_zone_reclaim.return =
#
probe syscall.sigaltstack = kernel.function("sys_sigaltstack") {
name = "sigaltstack"
- ebx = $ebx
- argstr = sprintf("%p", $ebx)
+ ussp = %( kernel_vr < "2.6.25" %? $ebx %: $bx %)
+ argstr = sprintf("%p", ussp)
}
probe syscall.sigaltstack.return = kernel.function("sys_sigaltstack").return {
name = "sigaltstack"