aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace
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 12:21:05 -0400
commitf3384b28a05624783b53836ccfed95ecde66a7ad (patch)
treee5fa8281ef1e4a9e638160204291556d42ed8a06 /kernel/trace
parent0b6e4d56bf71866a2b58daa8323cf747988ce7e4 (diff)
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/trace')
-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
8 8
9config HAVE_FUNCTION_TRACER 9config HAVE_FUNCTION_TRACER
10 bool 10 bool
11 select NOP_TRACER
12 11
13config HAVE_DYNAMIC_FTRACE 12config HAVE_DYNAMIC_FTRACE
14 bool 13 bool
@@ -28,6 +27,7 @@ config TRACING
28 select RING_BUFFER 27 select RING_BUFFER
29 select STACKTRACE 28 select STACKTRACE
30 select TRACEPOINTS 29 select TRACEPOINTS
30 select NOP_TRACER
31 31
32menu "Tracers" 32menu "Tracers"
33 33