[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-8ee3c92b7f2751c392be2d8fc360a410480b8757@git.kernel.org>
Date: Fri, 18 Nov 2011 15:12:05 -0800
From: tip-bot for Steven Rostedt <srostedt@...hat.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
rabin@....in, rostedt@...dmis.org, srostedt@...hat.com,
tglx@...utronix.de
Subject: [tip:perf/core] ftrace: Remove force undef config value left for testing
Commit-ID: 8ee3c92b7f2751c392be2d8fc360a410480b8757
Gitweb: http://git.kernel.org/tip/8ee3c92b7f2751c392be2d8fc360a410480b8757
Author: Steven Rostedt <srostedt@...hat.com>
AuthorDate: Fri, 4 Nov 2011 10:45:23 -0400
Committer: Steven Rostedt <rostedt@...dmis.org>
CommitDate: Mon, 7 Nov 2011 11:02:33 -0500
ftrace: Remove force undef config value left for testing
A forced undef of a config value was used for testing and was
accidently left in during the final commit. This causes x86 to
run slower than needed while running function tracing as well
as causes the function graph selftest to fail when DYNMAIC_FTRACE
is not set. This is because the code in MCOUNT expects the ftrace
code to be processed with the config value set that happened to
be forced not set.
The forced config option was left in by:
commit 6331c28c962561aee59e5a493b7556a4bb585957
ftrace: Fix dynamic selftest failure on some archs
Link: http://lkml.kernel.org/r/20111102150255.GA6973@debian
Cc: stable@...r.kernel.org
Reported-by: Rabin Vincent <rabin@....in>
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
---
kernel/trace/ftrace.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 077d853..0fcc6ca 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -151,7 +151,6 @@ void clear_ftrace_function(void)
ftrace_pid_function = ftrace_stub;
}
-#undef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST
#ifndef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST
/*
* For those archs that do not test ftrace_trace_stop in their
--
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