---

yaml
---
r: 116627
b: refs/heads/master
c: 2a3a4f6
h: refs/heads/master
i:
  116625: 906dced
  116623: eca1eb9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35cb5ed01261f5669657d2f1720aca902299887d
+refs/heads/master: 2a3a4f669df2164288d11406d11d5e4933bf5e53

trunk/kernel/trace/Kconfig

@@ -1,8 +1,13 @@
 #
 # Architectures that offer an FTRACE implementation should select HAVE_FTRACE:
 #
+
+config NOP_TRACER
+	bool
+
 config HAVE_FTRACE
 	bool
+	select NOP_TRACER
 
 config HAVE_DYNAMIC_FTRACE
 	bool
@@ -101,16 +106,6 @@ config SCHED_TRACER
 	  This tracer tracks the latency of the highest priority task
 	  to be scheduled in, starting from the point it has woken up.
 
-config NOP_TRACER
-	bool "NOP Tracer"
-	depends on HAVE_FTRACE
-	depends on DEBUG_KERNEL
-	select TRACING
-	help
-	  This tracer does nothing. The primary purpose for it is to
-	  politely print the output of ftrace_printk() calls without
-	  the overhead of an irrelevant trace taking place.
-
 config CONTEXT_SWITCH_TRACER
 	bool "Trace process context switches"
 	depends on HAVE_FTRACE