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

[~andy/linux] / kernel / trace / trace_boot.c

diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c
index 366c8c333e136e77d79a4579b4e70f24242b1404..0e94b3d091f70229d4ff521ea18aa3823c6b5ed7 100644 (file)
--- a/kernel/trace/trace_boot.c
+++ b/kernel/trace/trace_boot.c
@@ -11,6 +11,7 @@
 #include <linux/kallsyms.h>
 
 #include "trace.h"
+#include "trace_output.h"
 
 static struct trace_array *boot_trace;
 static bool pre_initcalls_finished;