diff options
author | Frédéric Weisbecker <fweisbec@gmail.com> | 2008-09-24 05:36:09 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-14 04:38:51 -0400 |
commit | 3ce2b9200da8b7170cc7463b7ee4212fad7b291e (patch) | |
tree | 8e9e05fb3e5282e199ee9953205504a8ded54d02 /kernel | |
parent | 3bf77af6e1fef1124bf71d81f9f84885f0ee0dea (diff) |
ftrace/fastboot: disable tracers self-tests when boot tracer is selected
The tracing engine resets the ring buffer and the tracers touch it
too during self-tests. These self-tests happen during tracers registering
and work against boot tracing which is logging initcalls.
We have to disable tracing self-tests if the boot-tracer is selected.
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/trace/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 81a17ef6b942..4feb3c81f94d 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig | |||
@@ -126,7 +126,9 @@ config BOOT_TRACER | |||
126 | the timings of the initcalls. Its aim is to be parsed by the | 126 | the timings of the initcalls. Its aim is to be parsed by the |
127 | /scripts/bootgraph.pl tool to produce pretty graphics about | 127 | /scripts/bootgraph.pl tool to produce pretty graphics about |
128 | boot inefficiencies, giving a visual representation of the | 128 | boot inefficiencies, giving a visual representation of the |
129 | delays during initcalls. | 129 | delays during initcalls. Note that tracers self tests can't |
130 | be enabled if this tracer is selected since only one tracer | ||
131 | should touch the tracing buffer at a time. | ||
130 | 132 | ||
131 | config STACK_TRACER | 133 | config STACK_TRACER |
132 | bool "Trace max stack" | 134 | bool "Trace max stack" |
@@ -168,8 +170,7 @@ config FTRACE_SELFTEST | |||
168 | 170 | ||
169 | config FTRACE_STARTUP_TEST | 171 | config FTRACE_STARTUP_TEST |
170 | bool "Perform a startup test on ftrace" | 172 | bool "Perform a startup test on ftrace" |
171 | depends on TRACING | 173 | depends on TRACING && DEBUG_KERNEL && !BOOT_TRACER |
172 | depends on DEBUG_KERNEL | ||
173 | select FTRACE_SELFTEST | 174 | select FTRACE_SELFTEST |
174 | help | 175 | help |
175 | This option performs a series of startup tests on ftrace. On bootup | 176 | This option performs a series of startup tests on ftrace. On bootup |