diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 11:18:34 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 13:36:22 +0200 |
commit | 0ad5d703c6c0fcd385d956555460df95dff7eb7e (patch) | |
tree | 4b777100f9be4fe90ca4bd043b9f98df672b5b3b /kernel/trace/trace.h | |
parent | 44347d947f628060b92449702071bfe1d31dfb75 (diff) | |
parent | 1cb81b143fa8f0e4629f10690862e2e52ca792ff (diff) |
Merge branch 'tracing/hw-branch-tracing' into tracing/core
Merge reason: this topic is ready for upstream now. It passed
Oleg's review and Andrew had no further mm/*
objections/observations either.
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, 2 insertions, 0 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index ba25793ffe6..6e735d4771f 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -538,6 +538,8 @@ extern int trace_selftest_startup_sysprof(struct tracer *trace, struct trace_array *tr); extern int trace_selftest_startup_branch(struct tracer *trace, struct trace_array *tr); +extern int trace_selftest_startup_hw_branches(struct tracer *trace, + struct trace_array *tr); #endif /* CONFIG_FTRACE_STARTUP_TEST */ extern void *head_page(struct trace_array_cpu *data); |