diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-06 05:12:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-06 05:12:17 -0400 |
| commit | 35c2f48c66d9c1b8d794c3936c3be22aa7c89adb (patch) | |
| tree | de0233d45fec273920bce0bc8640465cbf439600 /include/trace | |
| parent | 47fbc518a4b5c9a949f7cab8b14a00d3549bf138 (diff) | |
| parent | a5fb833172eca69136e9ee1ada778e404086ab8a (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull tracing updates from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/ftrace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 769724944fc6..c6bc2faaf261 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h | |||
| @@ -571,6 +571,7 @@ static inline void ftrace_test_probe_##call(void) \ | |||
| 571 | 571 | ||
| 572 | #undef __print_flags | 572 | #undef __print_flags |
| 573 | #undef __print_symbolic | 573 | #undef __print_symbolic |
| 574 | #undef __print_hex | ||
| 574 | #undef __get_dynamic_array | 575 | #undef __get_dynamic_array |
| 575 | #undef __get_str | 576 | #undef __get_str |
| 576 | 577 | ||