From 35cfb8965f4139a718b218e85c8a7bdff71b01a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Weisbecker?= Date: Wed, 24 Sep 2008 10:36:09 +0100 Subject: [PATCH] --- yaml --- r: 116649 b: refs/heads/master c: 3ce2b9200da8b7170cc7463b7ee4212fad7b291e h: refs/heads/master i: 116647: 2f48661013167974881f651ab5703fa4bfc96c9c v: v3 --- [refs] | 2 +- trunk/kernel/trace/Kconfig | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d633c1e07866..6d201aa94c94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bf77af6e1fef1124bf71d81f9f84885f0ee0dea +refs/heads/master: 3ce2b9200da8b7170cc7463b7ee4212fad7b291e diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig index 81a17ef6b942..4feb3c81f94d 100644 --- a/trunk/kernel/trace/Kconfig +++ b/trunk/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