diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 07:47:33 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 07:47:45 -0400 |
| commit | 93776a8ec746cf9d32c36e5a5b23d28d8be28826 (patch) | |
| tree | 6c472ae9f709246ee5268e1d71559d07839fb965 /kernel/trace/Kconfig | |
| parent | 34886c8bc590f078d4c0b88f50d061326639198d (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: update to upstream tracing facilities
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/Kconfig')
| -rw-r--r-- | kernel/trace/Kconfig | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 8a4136096d7d..23b96ebbf893 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig | |||
| @@ -99,11 +99,10 @@ config FUNCTION_GRAPH_TRACER | |||
| 99 | help | 99 | help |
| 100 | Enable the kernel to trace a function at both its return | 100 | Enable the kernel to trace a function at both its return |
| 101 | and its entry. | 101 | and its entry. |
| 102 | It's first purpose is to trace the duration of functions and | 102 | Its first purpose is to trace the duration of functions and |
| 103 | draw a call graph for each thread with some informations like | 103 | draw a call graph for each thread with some information like |
| 104 | the return value. | 104 | the return value. This is done by setting the current return |
| 105 | This is done by setting the current return address on the current | 105 | address on the current task structure into a stack of calls. |
| 106 | task structure into a stack of calls. | ||
| 107 | 106 | ||
| 108 | 107 | ||
| 109 | config IRQSOFF_TRACER | 108 | config IRQSOFF_TRACER |