summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wielaard <mjw@redhat.com>2009-04-01 23:42:53 +0200
committerMark Wielaard <mjw@redhat.com>2009-04-01 23:42:53 +0200
commit0dbfd2a9ccad1759c58f240843cabc50d502e44a (patch)
tree12684e51a577c720055443319c0042be594a921b
parent110b061ee15d15f9195af1e265da2e5d0066f8cc (diff)
parentae65abfb3d6c807f63adb11c060b1ca56b779c02 (diff)
downloadsystemtap-steved-0dbfd2a9ccad1759c58f240843cabc50d502e44a.tar.gz
systemtap-steved-0dbfd2a9ccad1759c58f240843cabc50d502e44a.tar.xz
systemtap-steved-0dbfd2a9ccad1759c58f240843cabc50d502e44a.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
-rw-r--r--tapset/i686/syscalls.stp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tapset/i686/syscalls.stp b/tapset/i686/syscalls.stp
index 8e69f622..2a89c19d 100644
--- a/tapset/i686/syscalls.stp
+++ b/tapset/i686/syscalls.stp
@@ -119,7 +119,7 @@ probe syscall.set_zone_reclaim.return =
#
probe syscall.sigaltstack = kernel.function("sys_sigaltstack") {
name = "sigaltstack"
- ussp = %( kernel_vr < "2.6.25" %? $ebx %: $bx %)
+ ussp = %( kernel_vr < "2.6.25" %? $ebx %: %( kernel_vr < "2.6.29" %? $bx %: $regs->bx %) %)
argstr = sprintf("%p", ussp)
}
probe syscall.sigaltstack.return = kernel.function("sys_sigaltstack").return {