summaryrefslogtreecommitdiff
path: root/include/trace
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-07-06 13:12:17 +0400
committerIngo Molnar <mingo@kernel.org>2012-07-06 13:12:17 +0400
commit35c2f48c66d9c1b8d794c3936c3be22aa7c89adb (patch)
treede0233d45fec273920bce0bc8640465cbf439600 /include/trace
parent47fbc518a4b5c9a949f7cab8b14a00d3549bf138 (diff)
parenta5fb833172eca69136e9ee1ada778e404086ab8a (diff)
downloadlinux-35c2f48c66d9c1b8d794c3936c3be22aa7c89adb.tar.xz
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.h1
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) \
#undef __print_flags
#undef __print_symbolic
+#undef __print_hex
#undef __get_dynamic_array
#undef __get_str