[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-bdd3b052c63b2c19a0118937f500985c01a19956@git.kernel.org>
Date: Fri, 30 Oct 2009 16:19:18 GMT
From: tip-bot for Li Hong <lihong.hi@...il.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, lihong.hi@...il.com, hpa@...or.com,
mingo@...hat.com, rostedt@...dmis.org, tglx@...utronix.de
Subject: [tip:tracing/core] tracing: Check absolute path of input file in recordmcount.pl
Commit-ID: bdd3b052c63b2c19a0118937f500985c01a19956
Gitweb: http://git.kernel.org/tip/bdd3b052c63b2c19a0118937f500985c01a19956
Author: Li Hong <lihong.hi@...il.com>
AuthorDate: Wed, 28 Oct 2009 13:03:32 +0800
Committer: Steven Rostedt <rostedt@...dmis.org>
CommitDate: Thu, 29 Oct 2009 15:11:43 -0400
tracing: Check absolute path of input file in recordmcount.pl
The ftrace.c file may reference the mcount function and this may interfere
with the recordmcount.pl processing. To avoid this, the code does not
process the kernel/trace/ftrace.o. But currently the check is against
a relative path. This patch modifies the check to succeed if the path
is an absolute path.
Signed-off-by: Li Hong <lihong.hi@...il.com>
LKML-Reference: <20091028050332.GC30758@...i>
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
---
scripts/recordmcount.pl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index a512af1..b80e5d0 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -123,7 +123,7 @@ my ($arch, $bits, $objdump, $objcopy, $cc,
$ld, $nm, $rm, $mv, $is_module, $inputfile) = @ARGV;
# This file refers to mcount and shouldn't be ftraced, so lets' ignore it
-if ($inputfile eq "kernel/trace/ftrace.o") {
+if ($inputfile =~ m,kernel/trace/ftrace\.o$,) {
exit(0);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists