update tapset deprecation from <= "2.2" to < "2.3" to make space for minor update

diff --git a/tapset/linux/i386/syscalls.stp b/tapset/linux/i386/syscalls.stp
index 6278c395556b8eb7c2cf3d71cbca1663d9871e85..ab69d8dd86d0cdea5e0d1631d112b7b88f1ab024 100644 (file)
--- a/tapset/linux/i386/syscalls.stp
+++ b/tapset/linux/i386/syscalls.stp
@@ -142,7 +142,7 @@ probe syscall.sigaltstack = kernel.function("sys_sigaltstack")
        if (@defined($regs)) {
                uss_uaddr = @choose_defined($uss, $regs->bx)
                uoss_uaddr = @choose_defined($uoss, $regs->cx)
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
                regs = $regs
 %)
        }
@@ -150,7 +150,7 @@ probe syscall.sigaltstack = kernel.function("sys_sigaltstack")
                uss_uaddr = $bx
                # Make sure the register value didn't get sign extended.
                uoss_uaddr = __ulong(@cast(&$bx, "pt_regs", "kernel<asm/ptrace.h>")->cx)
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
                regs = &$bx
 %)
        }
@@ -158,7 +158,7 @@ probe syscall.sigaltstack = kernel.function("sys_sigaltstack")
                uss_uaddr = $ebx
                # Make sure the register value didn't get sign extended.
                uoss_uaddr = __ulong(@cast(&$ebx, "pt_regs", "kernel<asm/ptrace.h>")->ecx)
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
                regs = &$ebx
 %)
        }

diff --git a/tapset/linux/ia64/syscalls.stp b/tapset/linux/ia64/syscalls.stp
index c97bd865b9992943fdb7c2bb94adb20257370be0..2d6a98331be67c7a13adf5469866a5e41254773c 100644 (file)
--- a/tapset/linux/ia64/syscalls.stp
+++ b/tapset/linux/ia64/syscalls.stp
@@ -67,7 +67,7 @@ probe syscall.sigaltstack = kernel.function("sys_sigaltstack")
 %)
        uss_uaddr = $uss
        uoss_uaddr = $uoss
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        regs = &$regs
 %)
        argstr = sprintf("%p, %p", $uss, $uoss)

diff --git a/tapset/linux/nd_syscalls.stp b/tapset/linux/nd_syscalls.stp
index 0e68d51fb77d16b4c513dbce5a150b9d229b4680..2c0b2fb478bf20994d44f7ff6ebb6fcae1923253 100644 (file)
--- a/tapset/linux/nd_syscalls.stp
+++ b/tapset/linux/nd_syscalls.stp
@@ -1372,14 +1372,14 @@ probe nd_syscall.fork = kprobe.function("do_fork")
        clone_flags = ulong_arg(1)
        stack_start = ulong_arg(2)
 %(kernel_v >= "3.8.0" %?
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        regs = 0
 %)
        stack_size = ulong_arg(3)
        parent_tid_uaddr = pointer_arg(4)
        child_tid_uaddr = pointer_arg(5)
 %:
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        regs = pointer_arg(3)
 %)
        stack_size = ulong_arg(4)

diff --git a/tapset/linux/nd_syscalls2.stp b/tapset/linux/nd_syscalls2.stp
index 16597522ce5af3a72adf186bddd050b8d5619d50..01def262ea026a07a141b807d1ed41d98a581d39 100644 (file)
--- a/tapset/linux/nd_syscalls2.stp
+++ b/tapset/linux/nd_syscalls2.stp
@@ -2793,7 +2793,7 @@ probe nd_syscall.compat_sys_shmat = kprobe.function("compat_sys_shmat") ?
        //               _shmat_flags_str(shmflg))
        // no asmlinkage
 
-%( systemtap_v <= "2.2" %?
+%( systemtap_v < "2.3" %?
        first = int_arg(1)
        second = int_arg(2)
        third = u32_arg(3)

diff --git a/tapset/linux/nfs.stp b/tapset/linux/nfs.stp
index 718c2ef31fbccb1736493adcf871d20e2943f08e..0587bd9c4eeebe58ef7766b2d62899797349cc4f 100644 (file)
--- a/tapset/linux/nfs.stp
+++ b/tapset/linux/nfs.stp
@@ -262,7 +262,7 @@ probe nfs.fop.llseek = kernel.function ("nfs_file_llseek") !,
 
         maxbyte = __file_maxbytes($filp)
         offset = $offset
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
         origin = @choose_defined($whence, $origin)
 %)
        whence = @choose_defined($whence, $origin)

diff --git a/tapset/linux/powerpc/nd_syscalls.stp b/tapset/linux/powerpc/nd_syscalls.stp
index 62705f27ec03523d74a5635aa4789050a59dc8ae..678d87ab58c09086085df17d51d777c6ba9425ed 100644 (file)
--- a/tapset/linux/powerpc/nd_syscalls.stp
+++ b/tapset/linux/powerpc/nd_syscalls.stp
@@ -364,7 +364,7 @@ probe nd_syscall.sigaltstack = kprobe.function("sys_sigaltstack")
        asmlinkage()
        uss_uaddr = pointer_arg(1)
        uoss_uaddr = pointer_arg(2)
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        regs = pointer_arg(7)
 %)
        argstr = sprintf("%p, %p", uss_uaddr, uoss_uaddr)

diff --git a/tapset/linux/powerpc/syscalls.stp b/tapset/linux/powerpc/syscalls.stp
index 3d5ab88ba8db2b9c1587f44cedf1e68921e52228..48c15d263cb32991f044c1d035004ea9a4fc1694 100644 (file)
--- a/tapset/linux/powerpc/syscalls.stp
+++ b/tapset/linux/powerpc/syscalls.stp
@@ -309,7 +309,7 @@ probe syscall.sigaltstack = kernel.function("sys_sigaltstack")
        name = "sigaltstack"
        uss_uaddr = $uss
        uoss_uaddr = $uoss
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        regs = $regs
 %)
        argstr = sprintf("%p, %p", $uss, $uoss)

diff --git a/tapset/linux/s390/nd_syscalls.stp b/tapset/linux/s390/nd_syscalls.stp
index 24d65586a5c8eaf5ca4e1bf0f1491de1bca1f7a4..041816de3ee1964dfd19874df0e44949309755ef 100644 (file)
--- a/tapset/linux/s390/nd_syscalls.stp
+++ b/tapset/linux/s390/nd_syscalls.stp
@@ -127,7 +127,7 @@ probe nd_syscall.sigaltstack = kprobe.function("sys_sigaltstack")
        asmlinkage()
        uss_uaddr = pointer_arg(1)
        uoss_uaddr = pointer_arg(2)
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        regs = %{ _stp_current_pt_regs() %}
 %)
        argstr = sprintf("%p, %p", uss_uaddr, uoss_uaddr)

diff --git a/tapset/linux/s390/syscalls.stp b/tapset/linux/s390/syscalls.stp
index 47649b28a105283d96bb5c8ef24bde0b78498322..e39a21527bb2bbe383e1a8e0e046a9b0aeada32c 100644 (file)
--- a/tapset/linux/s390/syscalls.stp
+++ b/tapset/linux/s390/syscalls.stp
@@ -149,7 +149,7 @@ probe syscall.sigaltstack = kernel.function("sys_sigaltstack")
        name = "sigaltstack"
        uss_uaddr = $uss
        uoss_uaddr = $uoss
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        regs = %{ _stp_current_pt_regs() %}
 %)
        argstr = sprintf("%p, %p", $uss, $uoss)

diff --git a/tapset/linux/syscalls.stp b/tapset/linux/syscalls.stp
index af36d35b5c35aafbd6552784a4074d384f110022..037c694f9ea6e227af97c84143832b9c8e28ecfe 100644 (file)
--- a/tapset/linux/syscalls.stp
+++ b/tapset/linux/syscalls.stp
@@ -1035,7 +1035,7 @@ probe syscall.fork = kernel.function("do_fork").call
        child_tid_uaddr = $child_tidptr
 
        if (@defined($regs)) {
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
                regs = $regs
 %)
                if (!__is_user_regs($regs)) {
@@ -1050,7 +1050,7 @@ probe syscall.fork = kernel.function("do_fork").call
                        name = "fork"
                }
        } else {
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
                regs = 0
 %)
                if ($clone_flags & %{ CLONE_VM | CLONE_UNTRACED %}) {

diff --git a/tapset/linux/syscalls2.stp b/tapset/linux/syscalls2.stp
index f800e12058bc45f9967db86d2c1d8119923da067..e01f6194857cbf32eeac4582e9588d01a599503e 100644 (file)
--- a/tapset/linux/syscalls2.stp
+++ b/tapset/linux/syscalls2.stp
@@ -2307,7 +2307,7 @@ probe syscall.shmat.return = kernel.function("sys_shmat").return ?
 probe syscall.compat_sys_shmat = kernel.function("compat_sys_shmat").call ?
 {
        name = "compat_sys_shmat"
-%( systemtap_v <= "2.2" %?
+%( systemtap_v < "2.3" %?
        first = @choose_defined($shmid, $first)
        second = @choose_defined($shmflg, $second)
        third = @choose_defined($third, 0)

diff --git a/tapset/linux/vfs.stp b/tapset/linux/vfs.stp
index 3021106d9b2a9cd1d5a439d37cacfbaa4d15063e..f1e346f181d45db02aa383f0bf96618d9ae4c124 100644 (file)
--- a/tapset/linux/vfs.stp
+++ b/tapset/linux/vfs.stp
@@ -25,7 +25,7 @@ function __find_bdevname:string(dev:long, bdev:long)
        return bdevname(bdev)
 }
 
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
 /* deprecated */
 function ppos_pos:long (ppos:long)
 {
@@ -128,7 +128,7 @@ function _get_fopv_size:long (iovp:long, nr_segs:long)
        return -1
 }
 
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
 /* deprecated */
 function _dev_minor:long (dev:long)
 {
@@ -150,7 +150,7 @@ probe generic.fop.llseek = kernel.function("generic_file_llseek")
        file = $file
 
        offset = $offset
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        origin = @choose_defined($whence, $origin)
 %)
        whence = @choose_defined($whence, $origin)
@@ -167,7 +167,7 @@ probe generic.fop.llseek.return = kernel.function("generic_file_llseek").return
        retstr = sprintf("%d", $return)
        file = $file
        offset = $offset
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        origin = @choose_defined($whence, $origin)
 %)
        whence = @choose_defined($whence, $origin)
@@ -611,7 +611,7 @@ probe vfs.block_sync_page = kernel.function("block_sync_page") ?
        devname = __find_bdevname(dev, __page_bdev($page))
        ino = __page_ino($page)
 
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        # 'page_index' is deprecated
        page_index = __page_index($page)
 %)
@@ -635,7 +635,7 @@ probe vfs.buffer_migrate_page = kernel.function("buffer_migrate_page") ?
         ino = __page_ino($page)
        devname = __find_bdevname(dev,__page_bdev($page))
 
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        # 'page_index' is deprecated
        page_index = __page_index($page)
 %)
@@ -954,7 +954,7 @@ probe _vfs.block_prepare_write = kernel.function("__block_write_begin") !,
                _inode = __page_ino($page)
                from = $pos & (%{ PAGE_CACHE_SIZE  %} - 1)
                to = from + $len                
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
                # write_from and write_upto are deprecated
                write_from = from
                write_upto = to
@@ -962,7 +962,7 @@ probe _vfs.block_prepare_write = kernel.function("__block_write_begin") !,
        }
        else {
                _inode = $inode
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
                # write_from and write_upto are deprecated
                write_from = $from
                write_upto = $to
@@ -987,7 +987,7 @@ probe _vfs.block_prepare_write.return =
                _inode = __page_ino($page)
                from = $pos & (%{ PAGE_CACHE_SIZE  %} - 1)
                to = from + $len                
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
                # write_from and write_upto are deprecated
                write_from = from
                write_upto = to
@@ -995,7 +995,7 @@ probe _vfs.block_prepare_write.return =
        }
        else {
                _inode = $inode
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
                # write_from and write_upto are deprecated
                write_from = $from
                write_upto = $to

diff --git a/tapset/linux/x86_64/nd_syscalls.stp b/tapset/linux/x86_64/nd_syscalls.stp
index efce72981029d02850e2218fd74f0449190665cc..65becaddb942323eec25b3b4ebd5336289e6c01d 100644 (file)
--- a/tapset/linux/x86_64/nd_syscalls.stp
+++ b/tapset/linux/x86_64/nd_syscalls.stp
@@ -58,7 +58,7 @@ probe nd_syscall.sigaltstack = kprobe.function("sys_sigaltstack")
        asmlinkage()
        uss_uaddr = pointer_arg(1)
        uoss_uaddr = pointer_arg(2)
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        regs_uaddr = pointer_arg(3)
        regs = pointer_arg(3)
 %)

diff --git a/tapset/linux/x86_64/syscalls.stp b/tapset/linux/x86_64/syscalls.stp
index a32bf40260cc725f54b091656d3a812a37a02fcd..f757178400b683bc7896414b3fbca9d72affa30f 100644 (file)
--- a/tapset/linux/x86_64/syscalls.stp
+++ b/tapset/linux/x86_64/syscalls.stp
@@ -51,7 +51,7 @@ probe syscall.sigaltstack = kernel.function("sys_sigaltstack")
 %(systemtap_v <= "1.4" %?
        regs_uaddr = $regs
 %)
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        regs = $regs
 %)
        argstr = sprintf("%p, %p", $uss, $uoss)

diff --git a/testsuite/buildok/nd_syscalls-arch-detailed.stp b/testsuite/buildok/nd_syscalls-arch-detailed.stp
index 08b41e6282308942d47508dd18f11b5f7cfb8682..addf0d0635fb8f636c7ef19180e9bd934a3dda25 100755 (executable)
--- a/testsuite/buildok/nd_syscalls-arch-detailed.stp
+++ b/testsuite/buildok/nd_syscalls-arch-detailed.stp
@@ -35,7 +35,7 @@ probe nd_syscall.sigaltstack ?
 {
        printf("%s, %s\n", name, argstr)
        printf("%p, %p\n", uss_uaddr, uoss_uaddr)
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        printf("%p\n", regs)
 %)
 }

diff --git a/testsuite/buildok/nd_syscalls-detailed.stp b/testsuite/buildok/nd_syscalls-detailed.stp
index c146c379b9a9bb82262d154ff3ba38b84f2fe0d5..10c634b0173529dbe23c12cb1f2261276b5f4a9d 100755 (executable)
--- a/testsuite/buildok/nd_syscalls-detailed.stp
+++ b/testsuite/buildok/nd_syscalls-detailed.stp
@@ -441,7 +441,7 @@ probe nd_syscall.fork
        printf("%s, %s\n", name, argstr)
        printf("%d, %d, %d, %p, %p\n", clone_flags, stack_start,
               stack_size, parent_tid_uaddr, child_tid_uaddr)
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        printf("%p\n", regs)
 %)
 }

diff --git a/testsuite/buildok/nd_syscalls2-detailed.stp b/testsuite/buildok/nd_syscalls2-detailed.stp
index 0fd4e10a787a6bd8a3ba1bfc93a6143e9b7e7b51..a97fa01e98d12148727363929b2f61369e1e9505 100755 (executable)
--- a/testsuite/buildok/nd_syscalls2-detailed.stp
+++ b/testsuite/buildok/nd_syscalls2-detailed.stp
@@ -852,7 +852,7 @@ probe nd_syscall.shmat.return ?
 probe nd_syscall.compat_sys_shmat ?
 {
        printf("%s, %s\n", name, argstr)
-%( systemtap_v <= "2.2" %?
+%( systemtap_v < "2.3" %?
        printf("%d, %d, %d, %p\n", first, second, third, uptr_uaddr)
 %)
        printf("%d, %p, %d\n", shmid, shmaddr_uaddr, shmflg)

diff --git a/testsuite/buildok/nfs-detailed.stp b/testsuite/buildok/nfs-detailed.stp
index 14818020e98752389c36c393ec38bb17c25589f9..cc0b01bbedfdf6bce9bdcb2e93435259728eeb37 100755 (executable)
--- a/testsuite/buildok/nfs-detailed.stp
+++ b/testsuite/buildok/nfs-detailed.stp
@@ -7,7 +7,7 @@
 probe nfs.fop.llseek {
        printf("%s(%s)\n", name, argstr)
        printf("%d %d %d %s %d\n", dev, ino, s_id, devname, maxbyte)
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        printf("%d\n", origin)
 %)
        printf("%d %d %s\n", offset, whence, whence_str);

diff --git a/testsuite/buildok/syscalls-arch-detailed.stp b/testsuite/buildok/syscalls-arch-detailed.stp
index 76cad7761127c5f8748a5d7744d0121a84d1467e..0769a29ccd90041bb3334ca33e6c0926a99eaa2e 100755 (executable)
--- a/testsuite/buildok/syscalls-arch-detailed.stp
+++ b/testsuite/buildok/syscalls-arch-detailed.stp
@@ -35,7 +35,7 @@ probe syscall.sigaltstack
 {
        printf("%s, %s\n", name, argstr)
        printf("%p, %p\n", uss_uaddr, uoss_uaddr)
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        printf("%p\n", regs)
 %)
 }

diff --git a/testsuite/buildok/syscalls-detailed.stp b/testsuite/buildok/syscalls-detailed.stp
index a7a92df9674d3e5084b9c168ff262c8d067ef42b..e23ad50a778573aefddd1c3297ff31f74141ed54 100755 (executable)
--- a/testsuite/buildok/syscalls-detailed.stp
+++ b/testsuite/buildok/syscalls-detailed.stp
@@ -441,7 +441,7 @@ probe syscall.fork
        printf("%s, %s\n", name, argstr)
        printf("%d, %d, %d, %p, %p\n", clone_flags, stack_start,
               stack_size, parent_tid_uaddr, child_tid_uaddr)
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        printf("%p\n", regs)
 %)
 }

diff --git a/testsuite/buildok/syscalls2-detailed.stp b/testsuite/buildok/syscalls2-detailed.stp
index 2a805be34b5e23a55b3d17892a2ef7a91dcb3c14..0521ea8a27a62c5fd3d33268d95ebf0d0db6bb13 100755 (executable)
--- a/testsuite/buildok/syscalls2-detailed.stp
+++ b/testsuite/buildok/syscalls2-detailed.stp
@@ -849,7 +849,7 @@ probe syscall.shmat.return ?
 probe syscall.compat_sys_shmat ?
 {
        printf("%s, %s\n", name, argstr)
-%( systemtap_v <= "2.2" %?
+%( systemtap_v < "2.3" %?
        printf("%d, %d, %d, %p\n", first, second, third, uptr_uaddr)
 %)
        printf("%d, %p, %d\n", shmid, shmaddr_uaddr, shmflg)

diff --git a/testsuite/buildok/vfs-detailed.stp b/testsuite/buildok/vfs-detailed.stp
index 00c867217b89be1d1788e94da334cd85e5e45844..ceb448ce2c2dbe57c02e5ba62c4fe6aca3a41bb7 100755 (executable)
--- a/testsuite/buildok/vfs-detailed.stp
+++ b/testsuite/buildok/vfs-detailed.stp
@@ -5,7 +5,7 @@ probe generic.fop.llseek
        printf("%s %s\n", name, argstr)
        printf("%p %s %d %p\n", dev, devname, ino, file)
        printf("%d %d\n", offset, maxbyte)
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        printf("%d\n", origin)
 %)
        printf("%d %s\n", whence, whence_str)

diff --git a/testsuite/buildok/vfs-embedded.stp b/testsuite/buildok/vfs-embedded.stp
index 34cb2d1d9ee44dbf9bbf429a72ed93f98ea3456b..9241ef679cf2ac03f199355d7f738ef015840f85 100755 (executable)
--- a/testsuite/buildok/vfs-embedded.stp
+++ b/testsuite/buildok/vfs-embedded.stp
@@ -2,7 +2,7 @@
 
 probe begin {
   print(
-%(systemtap_v <= "2.2" %?
+%(systemtap_v < "2.3" %?
        ppos_pos (0) +
 %)
        __address_inode(0) +