diff options
| author | Ananth N Mavinakayanahalli <ananth@in.ibm.com> | 2009-04-30 17:00:38 +0530 |
|---|---|---|
| committer | Ananth N Mavinakayanahalli <ananth@in.ibm.com> | 2009-04-30 17:00:38 +0530 |
| commit | ea7d087ab3866eb99c19444b237c9586e8dc9b17 (patch) | |
| tree | 9a3831d5a2ac2d5da1e69b86fff043fabc4e3a01 /tapset | |
| parent | 06cc786840951d8467553a60c0e603a5086fc488 (diff) | |
| download | systemtap-steved-ea7d087ab3866eb99c19444b237c9586e8dc9b17.tar.gz systemtap-steved-ea7d087ab3866eb99c19444b237c9586e8dc9b17.tar.xz systemtap-steved-ea7d087ab3866eb99c19444b237c9586e8dc9b17.zip | |
PR10007: Avoid probing syscall entry points in the testsuite.
While there, fix minor issues with the s390x syscall tapset.
Diffstat (limited to 'tapset')
| -rw-r--r-- | tapset/s390x/syscalls.stp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/tapset/s390x/syscalls.stp b/tapset/s390x/syscalls.stp index 07cb0577..17988ace 100644 --- a/tapset/s390x/syscalls.stp +++ b/tapset/s390x/syscalls.stp @@ -45,19 +45,21 @@ probe syscall.ipc.return = kernel.function("sys_ipc").return ? { # long old_mmap(struct mmap_arg_struct __user *arg) # long old32_mmap(struct mmap_arg_struct_emu31 __user *arg) # -probe syscall.mmap = kernel.function("old_mmap"), - kernel.function("old32_mmap") +probe syscall.mmap = kernel.function("old_mmap") ?, + kernel.function("old32_mmap") ?, + kernel.function("SyS_s390_old_mmap") ? { name = "mmap" - if (probefunc() == "old_mmap") + if ((probefunc() == "old_mmap") || (probefunc() == "SyS_s390_old_mmap")) argstr = get_mmap_args($arg) else argstr = get_32mmap_args($arg) } -probe syscall.mmap.return = kernel.function("old_mmap").return, - kernel.function("old32_mmap").return +probe syscall.mmap.return = kernel.function("old_mmap").return ?, + kernel.function("old32_mmap").return ?, + kernel.function("SyS_s390_old_mmap").return ? { name = "mmap" retstr = returnstr(2) @@ -69,19 +71,21 @@ probe syscall.mmap.return = kernel.function("old_mmap").return, # long sys_mmap2(struct mmap_arg_struct __user *arg) # long sys32_mmap2(struct mmap_arg_struct_emu31 __user *arg) # -probe syscall.mmap2 = kernel.function("sys_mmap2"), - kernel.function("sys32_mmap2") +probe syscall.mmap2 = kernel.function("sys_mmap2") ?, + kernel.function("sys32_mmap2") ?, + kernel.function("SyS_mmap2") ? { name = "mmap2" - if (probefunc() == "sys_mmap2") + if ((probefunc() == "sys_mmap2") || (probefunc() == "SyS_mmap2")) argstr = get_mmap_args($arg) else argstr = get_32mmap_args($arg) } -probe syscall.mmap2.return = kernel.function("sys_mmap2").return, - kernel.function("sys32_mmap2").return +probe syscall.mmap2.return = kernel.function("sys_mmap2").return ?, + kernel.function("sys32_mmap2").return ?, + kernel.function("SyS_mmap2").return ? { name = "mmap2" retstr = returnstr(2) |