signal.stp, memory.stp:

make do_mmap2, copy_cow_page and signal.handle.return optional since they are obsolete
or failed to probe on 2.6.18.1/ppc64

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 32aee13bfbadf3b1f0fb568e0c5f940ea5cc94c1..82a46e61edd68e1f5f8a881256a760b2a61d7040 100644 (file)
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-07  Li Guanglei <guanglei@cn.ibm.com>
+
+       From Gui Jian <guij@cn.ibm.com>
+       * signal.stp, memory.stp: make do_mmap2, copy_cow_page
+       and signal.handle.return optional since they are obsolete
+       or failed to probe on 2.6.18.1/ppc64
+
 2006-11-02  Frank Ch. Eigler  <fche@elastic.org>
 
        * README: Add a blurb against running these scripts directly.

diff --git a/tapset/memory.stp b/tapset/memory.stp
index 2c36f83e589b47b313ad3b71308a76dfd21fa3c5..b66e1eb2bb4dfee780c542dc127fad9381d49216 100644 (file)
--- a/tapset/memory.stp
+++ b/tapset/memory.stp
@@ -76,7 +76,7 @@ probe vm.write_shared = kernel.function("do_wp_page") {
  *  zero - boolean indicating whether it is a zero page
  *         (can do a clear instead of a copy).
  */
-probe vm.write_shared_copy = kernel.inline("copy_cow_page") {
+probe vm.write_shared_copy = kernel.inline("copy_cow_page")? {
     address = $address
     zero = _IS_ZERO_PAGE($from, address);
 }
@@ -93,7 +93,7 @@ probe vm.write_shared_copy = kernel.inline("copy_cow_page") {
  *  address - the requested address
  *  length - the length of the memory segment 
  */
-probe vm.mmap = kernel.inline("do_mmap"), kernel.inline("do_mmap2") {
+probe vm.mmap = kernel.inline("do_mmap"), kernel.inline("do_mmap2")? {
     address = $addr
     length = $len
 }

diff --git a/tapset/signal.stp b/tapset/signal.stp
index 5b0429914ee512c72243341b463e46ec0b696262..da220bab6464737be008acf9196f1e54e0ea86b2 100644 (file)
--- a/tapset/signal.stp
+++ b/tapset/signal.stp
@@ -390,7 +390,7 @@ probe signal.handle = kernel.function("handle_signal")?,
         sig_mode = "Kernel Mode Signal"
 }
 
-probe signal.handle.return = kernel.function("handle_signal").return
+probe signal.handle.return = kernel.function("handle_signal").return ?
 {
     retstr = returnstr(1)
 }