From: Ingo Molnar Date: Tue, 7 Apr 2009 11:47:33 +0000 (+0200) Subject: Merge branch 'linus' into tracing/core X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=93776a8ec746cf9d32c36e5a5b23d28d8be28826;p=mv-sheeva.git Merge branch 'linus' into tracing/core Merge reason: update to upstream tracing facilities Signed-off-by: Ingo Molnar --- 93776a8ec746cf9d32c36e5a5b23d28d8be28826 diff --cc kernel/trace/Kconfig index 8a4136096d7,2246141bda4..23b96ebbf89 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@@ -99,13 -99,11 +99,12 @@@ config FUNCTION_GRAPH_TRACE help Enable the kernel to trace a function at both its return and its entry. - It's first purpose is to trace the duration of functions and - draw a call graph for each thread with some informations like - the return value. - This is done by setting the current return address on the current - task structure into a stack of calls. + Its first purpose is to trace the duration of functions and + draw a call graph for each thread with some information like + the return value. This is done by setting the current return + address on the current task structure into a stack of calls. + config IRQSOFF_TRACER bool "Interrupts-off Latency Tracer" default n