summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Hong <lihong.hi@gmail.com>2009-10-28 06:03:32 +0100
committerSteven Rostedt <rostedt@goodmis.org>2009-10-29 20:11:43 +0100
commitbdd3b052c63b2c19a0118937f500985c01a19956 (patch)
tree4625bcea7646f3ac04395dffc5cc226f4927e9ad
parenttracing: Correct the check for number of arguments in recordmcount.pl (diff)
downloadlinux-bdd3b052c63b2c19a0118937f500985c01a19956.tar.xz
linux-bdd3b052c63b2c19a0118937f500985c01a19956.zip
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@gmail.com> LKML-Reference: <20091028050332.GC30758@uhli> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rwxr-xr-xscripts/recordmcount.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index a512af1514bd..b80e5d04416b 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);
}