diff options
| author | David Smith <dsmith@redhat.com> | 2010-03-05 11:14:46 -0600 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2010-03-05 11:14:46 -0600 |
| commit | ae34ff1086e98f986c2f62b8c4666adf57663f11 (patch) | |
| tree | cd645edc78abb702f326732da97c759c1ba19ec9 /tapset/nd_syscalls2.stp | |
| parent | ad79c8a6970b39e77ee592479a7b80de683833f6 (diff) | |
| download | systemtap-steved-ae34ff1086e98f986c2f62b8c4666adf57663f11.tar.gz systemtap-steved-ae34ff1086e98f986c2f62b8c4666adf57663f11.tar.xz systemtap-steved-ae34ff1086e98f986c2f62b8c4666adf57663f11.zip | |
PR 11338 (partial): Used '@defined()' in syscall tapsets.
* tapset/syscalls.stp: Used '@defined()' to remove kernel version checks.
* tapset/syscalls2.stp: Ditto.
* tapset/x86_64/syscalls.stp: Ditto.
* tapset/nd_syscalls.stp: Updated to match tapset/syscalls.stp.
* tapset/nd_syscalls2.stp: Updated to match tapset/syscalls2.stp.
* tapset/x86_64/nd_syscalls.stp: Updated to match
tapset/x86_64/syscalls.stp.
Diffstat (limited to 'tapset/nd_syscalls2.stp')
| -rw-r--r-- | tapset/nd_syscalls2.stp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/tapset/nd_syscalls2.stp b/tapset/nd_syscalls2.stp index 2b83e1fc..fb193324 100644 --- a/tapset/nd_syscalls2.stp +++ b/tapset/nd_syscalls2.stp @@ -1,6 +1,6 @@ // syscalls tapset part 2 [N-Z] // Copyright (C) 2005 IBM Corp. -// Copyright (C) 2005, 2006, 2007 Red Hat Inc. +// Copyright (C) 2005, 2006, 2007, 2010 Red Hat Inc. // Copyright (C) 2007 Quentin Barnes. // // This file is part of systemtap, and is free software. You can @@ -1058,11 +1058,7 @@ probe nd_syscall.remap_file_pages = kprobe.function("SyS_remap_file_pages") ?, name = "remap_file_pages" // start = $start // size = $size -// %( kernel_vr >= "2.6.24" %? - // prot = $prot -// %: - // prot = $__prot -// %) + // prot = (@defined($prot) ? $prot : $__prot) // pgoff = $pgoff // flags = $flags asmlinkage() @@ -4336,14 +4332,14 @@ probe nd_syscall.wait4 = kprobe.function("SyS_wait4") ?, kprobe.function("sys_wait4") ? { name = "wait4" - // pid = %( kernel_vr >= "2.6.25" %? $upid %: $pid%) + // pid = (@defined($upid) ? $upid : $pid) // status_uaddr = $stat_addr // options = $options // options_str = _wait4_opt_str($options) // rusage_uaddr = $ru // argstr = sprintf("%d, %p, %s, %p", - // %( kernel_vr >= "2.6.25" %? $upid %: $pid%), - // $stat_addr, _wait4_opt_str($options), $ru) + // (@defined($upid) ? $upid : $pid), + // $stat_addr, _wait4_opt_str($options), $ru) asmlinkage() pid = int_arg(1) status_uaddr = pointer_arg(2) @@ -4372,7 +4368,7 @@ probe nd_syscall.waitid = kprobe.function("SyS_waitid") ?, kprobe.function("sys_waitid") ? { name = "waitid" - // pid = %( kernel_vr >= "2.6.25" %? $upid %: $pid%) + // pid = (@defined($upid) ? $upid : $pid) // which = $which // which_str = _waitid_which_str($which) // infop_uaddr = $infop @@ -4380,7 +4376,7 @@ probe nd_syscall.waitid = kprobe.function("SyS_waitid") ?, // options_str = _waitid_opt_str($options) // rusage_uaddr = $ru // argstr = sprintf("%d, %d, %p, %s, %p", $which, - // %( kernel_vr >= "2.6.25" %? $upid %: $pid%), $infop, + // (@defined($upid) ? $upid : $pid), $infop, // _waitid_opt_str($options), $ru) asmlinkage() pid = int_arg(1) |