diff options
Diffstat (limited to 'kernel/trace/Kconfig')
-rw-r--r-- | kernel/trace/Kconfig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index dde1d46f77e5..28f2644484d9 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig | |||
@@ -164,9 +164,8 @@ config BOOT_TRACER | |||
164 | representation of the delays during initcalls - but the raw | 164 | representation of the delays during initcalls - but the raw |
165 | /debug/tracing/trace text output is readable too. | 165 | /debug/tracing/trace text output is readable too. |
166 | 166 | ||
167 | ( Note that tracing self tests can't be enabled if this tracer is | 167 | You must pass in ftrace=initcall to the kernel command line |
168 | selected, because the self-tests are an initcall as well and that | 168 | to enable this on bootup. |
169 | would invalidate the boot trace. ) | ||
170 | 169 | ||
171 | config TRACE_BRANCH_PROFILING | 170 | config TRACE_BRANCH_PROFILING |
172 | bool "Trace likely/unlikely profiler" | 171 | bool "Trace likely/unlikely profiler" |
@@ -326,7 +325,7 @@ config FTRACE_SELFTEST | |||
326 | 325 | ||
327 | config FTRACE_STARTUP_TEST | 326 | config FTRACE_STARTUP_TEST |
328 | bool "Perform a startup test on ftrace" | 327 | bool "Perform a startup test on ftrace" |
329 | depends on TRACING && DEBUG_KERNEL && !BOOT_TRACER | 328 | depends on TRACING && DEBUG_KERNEL |
330 | select FTRACE_SELFTEST | 329 | select FTRACE_SELFTEST |
331 | help | 330 | help |
332 | This option performs a series of startup tests on ftrace. On bootup | 331 | This option performs a series of startup tests on ftrace. On bootup |