summaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorFrédéric Weisbecker <fweisbec@gmail.com>2008-09-24 10:36:09 +0100
committerIngo Molnar <mingo@elte.hu>2008-10-14 10:38:51 +0200
commit3ce2b9200da8b7170cc7463b7ee4212fad7b291e (patch)
tree8e9e05fb3e5282e199ee9953205504a8ded54d02 /kernel/trace
parent3bf77af6e1fef1124bf71d81f9f84885f0ee0dea (diff)
downloadblackbird-op-linux-3ce2b9200da8b7170cc7463b7ee4212fad7b291e.tar.gz
blackbird-op-linux-3ce2b9200da8b7170cc7463b7ee4212fad7b291e.zip
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/trace')
-rw-r--r--kernel/trace/Kconfig7
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
the timings of the initcalls. Its aim is to be parsed by the
/scripts/bootgraph.pl tool to produce pretty graphics about
boot inefficiencies, giving a visual representation of the
- delays during initcalls.
+ delays during initcalls. Note that tracers self tests can't
+ be enabled if this tracer is selected since only one tracer
+ should touch the tracing buffer at a time.
config STACK_TRACER
bool "Trace max stack"
@@ -168,8 +170,7 @@ config FTRACE_SELFTEST
config FTRACE_STARTUP_TEST
bool "Perform a startup test on ftrace"
- depends on TRACING
- depends on DEBUG_KERNEL
+ depends on TRACING && DEBUG_KERNEL && !BOOT_TRACER
select FTRACE_SELFTEST
help
This option performs a series of startup tests on ftrace. On bootup
OpenPOWER on IntegriCloud