diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-19 13:48:03 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-19 13:48:03 -0400 |
| commit | 29510ec3b626c86de9707bb8904ff940d430289b (patch) | |
| tree | 4e1f579058302cbe7274435a72c64ee54012c192 /kernel/trace/trace.h | |
| parent | 398995ce7980b03b5803f8f31073b45d87746bc1 (diff) | |
| parent | 95950c2ecb31314ef827428e43ff771cf3b037e5 (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/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 5e9dfc6286dd..6b69c4bd306f 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
| @@ -419,6 +419,8 @@ extern void trace_find_cmdline(int pid, char comm[]); | |||
| 419 | extern unsigned long ftrace_update_tot_cnt; | 419 | extern unsigned long ftrace_update_tot_cnt; |
| 420 | #define DYN_FTRACE_TEST_NAME trace_selftest_dynamic_test_func | 420 | #define DYN_FTRACE_TEST_NAME trace_selftest_dynamic_test_func |
| 421 | extern int DYN_FTRACE_TEST_NAME(void); | 421 | extern int DYN_FTRACE_TEST_NAME(void); |
| 422 | #define DYN_FTRACE_TEST_NAME2 trace_selftest_dynamic_test_func2 | ||
| 423 | extern int DYN_FTRACE_TEST_NAME2(void); | ||
| 422 | #endif | 424 | #endif |
| 423 | 425 | ||
| 424 | extern int ring_buffer_expanded; | 426 | extern int ring_buffer_expanded; |