summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2008-10-29 11:15:57 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-29 17:21:05 +0100
commitf3384b28a05624783b53836ccfed95ecde66a7ad (patch)
treee5fa8281ef1e4a9e638160204291556d42ed8a06 /kernel
parent0b6e4d56bf71866a2b58daa8323cf747988ce7e4 (diff)
downloadblackbird-op-linux-f3384b28a05624783b53836ccfed95ecde66a7ad.tar.gz
blackbird-op-linux-f3384b28a05624783b53836ccfed95ecde66a7ad.zip
ftrace: fix trace_nop config select
Impact: build fix on non-function-tracing architectures The trace_nop is the tracer that is defined when no tracer is set in the ftrace infrastructure. The trace_nop was mistakenly selected by HAVE_FTRACE due to the confusion between ftrace infrastructure and the ftrace function tracer (which has been solved by renaming the function tracer). This patch changes the select to the approriate TRACING. This patch should fix compile errors on architectures that do not define the FUNCTION_TRACER. Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index e0cea282e0c5..b58f43bec363 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -8,7 +8,6 @@ config NOP_TRACER
config HAVE_FUNCTION_TRACER
bool
- select NOP_TRACER
config HAVE_DYNAMIC_FTRACE
bool
@@ -28,6 +27,7 @@ config TRACING
select RING_BUFFER
select STACKTRACE
select TRACEPOINTS
+ select NOP_TRACER
menu "Tracers"
OpenPOWER on IntegriCloud