From 49f426d9fd471bbdabb0e7a25525d0884b7e8831 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Mon, 12 May 2008 19:35:17 -0400 Subject: Revert "PR6487: extend blacklist with relay/timer subsystem" This reverts commit e0d0dcf974e2d0898a7f5a05a2a3fdc93ba51fea. It seems that blacklisting kernel/timer.c is overbroad. --- ChangeLog | 6 ------ tapsets.cxx | 12 ++---------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ed59476..1054e468 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,3 @@ -2008-05-09 Frank Ch. Eigler - - PR 6487. - * main.cxx (dwarf_query::build_blacklist): Add kernel/relay.c - and kernel/timer.c to probing blacklist. - 2008-05-07 Frank Ch. Eigler PR 6492. diff --git a/tapsets.cxx b/tapsets.cxx index 67412396..7cdf3c32 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -2425,11 +2425,8 @@ dwarf_query::build_blacklist() // XXX: it would be nice if these blacklisted functions were pulled // in dynamically, instead of being statically defined here. - // Perhaps it could be populated from script files. A - // - // noprobe kernel.function("...")" - // - // construct might do the trick. + // Perhaps it could be populated from script files. A "noprobe + // kernel.function("...")" construct might do the trick. // Most of these are marked __kprobes in newer kernels. We list // them here (anyway) so the translator can block them on older @@ -2500,11 +2497,6 @@ dwarf_query::build_blacklist() blfn += "|.*preempt_count.*"; blfn += "|preempt_schedule"; - // PR 6487, relay/timer interactions - blfile += "|kernel/relay.c"; - blfile += "|kernel/timer.c"; - // blfile += "|kernel/workqueue.c"; - // These functions don't return, so return probes would never be recovered blfn_ret += "do_exit"; // no "|" blfn_ret += "|sys_exit"; -- cgit