diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-24 04:11:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-24 04:11:23 -0400 |
| commit | 416dfdcdb894432547ead4fcb9fa6a36b396059e (patch) | |
| tree | 8033fdda07397a59c5fa98c88927040906ce6c1a /kernel/trace/trace.h | |
| parent | 56449f437add737a1e5e1cb7e00f63ac8ead1938 (diff) | |
| parent | 091069740304c979f957ceacec39c461d0192158 (diff) | |
Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing
Conflicts:
arch/x86/kernel/ptrace.c
Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN
dependency change from upstream so that we can remove it
here.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 9e15802cca9f..7c3f49aad6e2 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
| @@ -604,7 +604,7 @@ extern int trace_selftest_startup_hw_branches(struct tracer *trace, | |||
| 604 | #endif /* CONFIG_FTRACE_STARTUP_TEST */ | 604 | #endif /* CONFIG_FTRACE_STARTUP_TEST */ |
| 605 | 605 | ||
| 606 | extern void *head_page(struct trace_array_cpu *data); | 606 | extern void *head_page(struct trace_array_cpu *data); |
| 607 | extern long ns2usecs(cycle_t nsec); | 607 | extern unsigned long long ns2usecs(cycle_t nsec); |
| 608 | extern int | 608 | extern int |
| 609 | trace_vbprintk(unsigned long ip, const char *fmt, va_list args); | 609 | trace_vbprintk(unsigned long ip, const char *fmt, va_list args); |
| 610 | extern int | 610 | extern int |