diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-01-22 10:26:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-22 10:26:30 +0100 |
| commit | 03b30d151a918364c1c7d08bcb3e167be0a3746f (patch) | |
| tree | 0c728e624889c4fb32e028786c5db91bbdb5def1 /include/linux | |
| parent | ftrace: test for running of recordmcount.pl twice on an object (diff) | |
| parent | trace_workqueue: use percpu data for workqueue stat (diff) | |
Merge branch 'tracing/ftrace' into tracing/core
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ftrace.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 054721487574..9f7880d87c39 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -496,4 +496,17 @@ static inline int test_tsk_trace_graph(struct task_struct *tsk) #endif /* CONFIG_TRACING */ + +#ifdef CONFIG_HW_BRANCH_TRACER + +void trace_hw_branch(u64 from, u64 to); +void trace_hw_branch_oops(void); + +#else /* CONFIG_HW_BRANCH_TRACER */ + +static inline void trace_hw_branch(u64 from, u64 to) {} +static inline void trace_hw_branch_oops(void) {} + +#endif /* CONFIG_HW_BRANCH_TRACER */ + #endif /* _LINUX_FTRACE_H */ |