diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-29 07:06:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-29 07:06:05 -0400 |
| commit | 73222acf966792c7fda219724af963339be32e62 (patch) | |
| tree | 83109ded0bcfdc6a0ec5e8ea6becffd7ac41ec6a /kernel/trace/trace.h | |
| parent | 0dd7b74787eaf7858c6c573353a83c3e2766e674 (diff) | |
| parent | 5d4a9dba2d7fbab69f00dedd430d1788834a055a (diff) | |
Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 654fd657bd03..e2c06b21dd82 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
| @@ -473,12 +473,14 @@ void unregister_tracer(struct tracer *type); | |||
| 473 | 473 | ||
| 474 | extern unsigned long nsecs_to_usecs(unsigned long nsecs); | 474 | extern unsigned long nsecs_to_usecs(unsigned long nsecs); |
| 475 | 475 | ||
| 476 | #ifdef CONFIG_TRACER_MAX_TRACE | ||
| 476 | extern unsigned long tracing_max_latency; | 477 | extern unsigned long tracing_max_latency; |
| 477 | extern unsigned long tracing_thresh; | 478 | extern unsigned long tracing_thresh; |
| 478 | 479 | ||
| 479 | void update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu); | 480 | void update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu); |
| 480 | void update_max_tr_single(struct trace_array *tr, | 481 | void update_max_tr_single(struct trace_array *tr, |
| 481 | struct task_struct *tsk, int cpu); | 482 | struct task_struct *tsk, int cpu); |
| 483 | #endif /* CONFIG_TRACER_MAX_TRACE */ | ||
| 482 | 484 | ||
| 483 | #ifdef CONFIG_STACKTRACE | 485 | #ifdef CONFIG_STACKTRACE |
| 484 | void ftrace_trace_stack(struct trace_array *tr, unsigned long flags, | 486 | void ftrace_trace_stack(struct trace_array *tr, unsigned long flags, |