diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2009-08-25 11:54:15 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2009-08-25 12:31:14 -0400 |
| commit | d27e6fd532200873fe8cc23a155360114fe26110 (patch) | |
| tree | cb3644c25555116bcf3070251cb89362ffee3d8c /tapset/nd_syscalls2.stp | |
| parent | f0a68636d44065dfd60e685924b82e95195c0f9f (diff) | |
| download | systemtap-steved-d27e6fd532200873fe8cc23a155360114fe26110.tar.gz systemtap-steved-d27e6fd532200873fe8cc23a155360114fe26110.tar.xz systemtap-steved-d27e6fd532200873fe8cc23a155360114fe26110.zip | |
PR4186 cont'd: option #2: standardize on kernel ARCH/SUBARCH throughout
* main.cxx (main): Perform equivalent sed by hand on uname()->machine.
* stap.1.in: Clarify -a ARCH slightly.
* tapsets.cxx (validate_module_elf): Accept "arm*"for EM_ARM.
* tapset/**, testsuite/**: Removed/collapsed "i386"/"i686" branches,
renamed "ppc64"->"powerpc" and "s390x"->"s390".
Diffstat (limited to 'tapset/nd_syscalls2.stp')
| -rw-r--r-- | tapset/nd_syscalls2.stp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tapset/nd_syscalls2.stp b/tapset/nd_syscalls2.stp index c93bf9f7..6e50d256 100644 --- a/tapset/nd_syscalls2.stp +++ b/tapset/nd_syscalls2.stp @@ -337,7 +337,7 @@ probe nd_syscall.pipe = kprobe.function("SyS_pipe") ?, %: // fildes_uaddr = $fildes // argstr = _fildes_u($fildes) - %( arch != "ppc64" %? asmlinkage() %) + %( arch != "powerpc" %? asmlinkage() %) fildes_uaddr = pointer_arg(1) argstr = _fildes_u(fildes_uaddr) %) @@ -663,7 +663,7 @@ probe nd_syscall.pwrite32 = kprobe.function("sys32_pwrite64") ? // buf_uaddr = $buf // count = $count // offset = ($poshi << 32) + $poslo -// %( arch == "s390x" %? +// %( arch == "s390" %? // buf_uaddr = $ubuf // argstr = sprintf("%d, %s, %d, %d", $fd, // text_strn(user_string($ubuf), syscall_string_trunc, 1), @@ -870,7 +870,7 @@ probe nd_syscall.readv = kprobe.function("compat_sys_readv") ?, // vector_uaddr = $vec // count = $vlen /* FIXME: RHEL4 U3 ppc64 can't resolve $fd */ -// %( arch != "ppc64" %? +// %( arch != "powerpc" %? // fd = $fd // argstr = sprintf("%d, %p, %d", $fd, $vec, $vlen) // %: @@ -2974,7 +2974,7 @@ probe nd_syscall.sigaction = kprobe.function("sys_sigaction") ? // act_uaddr = $act // oact_uaddr = $oact // argstr = sprintf("%s, {%s}, %p", _signal_name($sig), _struct_sigaction_u($act), $oact) - %( arch != "ppc64" %? asmlinkage() %) + %( arch != "powerpc" %? asmlinkage() %) sig = int_arg(1) act_uaddr = pointer_arg(2) oact_uaddr = pointer_arg(3) @@ -3994,7 +3994,7 @@ probe nd_syscall.uname = kprobe.function("sys_uname") ?, _func_name = probefunc() if (_func_name != "sys32_uname") { if (_func_name == "sys_uname" || _func_name == "sys_olduname") { - %( arch != "ppc64" %? asmlinkage() %) + %( arch != "powerpc" %? asmlinkage() %) } else asmlinkage() } @@ -4465,7 +4465,7 @@ probe nd_syscall.writev = kprobe.function("compat_sys_writev") ?, // vector_uaddr = $vec // count = $vlen /* FIXME: RHEL4 U3 ppc64 can't resolve $fd */ -// %( arch != "ppc64" %? +// %( arch != "powerpc" %? // fd = $fd // argstr = sprintf("%d, %p, %d", $fd, $vec, $vlen) // %: |