Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent

[firefly-linux-kernel-4.4.55.git] / kernel / trace / trace_hw_branches.c

diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c
index 649df22d435fc3507d05aecbb244ccf5cbcfffa1..df21c1e72b95f865ab5ea2a21f3787463117dcf3 100644 (file)
--- a/kernel/trace/trace_hw_branches.c
+++ b/kernel/trace/trace_hw_branches.c
@@ -14,6 +14,7 @@
 #include <asm/ds.h>
 
 #include "trace.h"
+#include "trace_output.h"
 
 
 #define SIZEOF_BTS (1 << 13)