diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 08:41:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 08:41:17 -0400 |
| commit | 86665c75da41889f92b774f31ea5a9a436f392a8 (patch) | |
| tree | 94b003ab677a64b7d0a6dcca1f636bbbc2a187c9 /kernel/trace/trace.h | |
| parent | 93776a8ec746cf9d32c36e5a5b23d28d8be28826 (diff) | |
| parent | 1bbe2a83ab68e5cf8c66c372c7cb3b51910c2cfe (diff) | |
Merge branch 'tracing/urgent' into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index fec6521ffa13..47aa6d0c97a0 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
| @@ -602,7 +602,7 @@ extern int trace_selftest_startup_branch(struct tracer *trace, | |||
| 602 | #endif /* CONFIG_FTRACE_STARTUP_TEST */ | 602 | #endif /* CONFIG_FTRACE_STARTUP_TEST */ |
| 603 | 603 | ||
| 604 | extern void *head_page(struct trace_array_cpu *data); | 604 | extern void *head_page(struct trace_array_cpu *data); |
| 605 | extern long ns2usecs(cycle_t nsec); | 605 | extern unsigned long long ns2usecs(cycle_t nsec); |
| 606 | extern int | 606 | extern int |
| 607 | trace_vbprintk(unsigned long ip, const char *fmt, va_list args); | 607 | trace_vbprintk(unsigned long ip, const char *fmt, va_list args); |
| 608 | extern int | 608 | extern int |