From 1bbc78424803a64fa0be74c61e5889a0475703f8 Mon Sep 17 00:00:00 2001 From: guanglei Date: Tue, 7 Nov 2006 09:26:24 +0000 Subject: [PATCH] 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 --- tapset/ChangeLog | 7 +++++++ tapset/memory.stp | 4 ++-- tapset/signal.stp | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tapset/ChangeLog b/tapset/ChangeLog index 32aee13bf..82a46e61e 100644 --- a/tapset/ChangeLog +++ b/tapset/ChangeLog @@ -1,3 +1,10 @@ +2006-11-07 Li Guanglei + + From Gui Jian + * 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 * README: Add a blurb against running these scripts directly. diff --git a/tapset/memory.stp b/tapset/memory.stp index 2c36f83e5..b66e1eb2b 100644 --- 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 5b0429914..da220bab6 100644 --- 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) } -- 2.43.5