diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-23 05:25:31 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-23 05:25:31 -0400 |
| commit | 77a7f2e94e6998e307917fe63fa4b6d5162d44e9 (patch) | |
| tree | 1db43ac215fa9eac6ebb09cb0ddea5e3d285e132 /include/linux/ftrace.h | |
| parent | ac0053fd51d2bac09a7d4b4a59f6dac863bd4373 (diff) | |
| parent | cecbca96da387428e220e307a9c945e37e2f4d9e (diff) | |
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core
Diffstat (limited to 'include/linux/ftrace.h')
| -rw-r--r-- | include/linux/ftrace.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 01e6adea07ec..ea5b1aae0e8b 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
| @@ -492,7 +492,9 @@ static inline int test_tsk_trace_graph(struct task_struct *tsk) | |||
| 492 | return tsk->trace & TSK_TRACE_FL_GRAPH; | 492 | return tsk->trace & TSK_TRACE_FL_GRAPH; |
| 493 | } | 493 | } |
| 494 | 494 | ||
| 495 | extern int ftrace_dump_on_oops; | 495 | enum ftrace_dump_mode; |
| 496 | |||
| 497 | extern enum ftrace_dump_mode ftrace_dump_on_oops; | ||
| 496 | 498 | ||
| 497 | #ifdef CONFIG_PREEMPT | 499 | #ifdef CONFIG_PREEMPT |
| 498 | #define INIT_TRACE_RECURSION .trace_recursion = 0, | 500 | #define INIT_TRACE_RECURSION .trace_recursion = 0, |