aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_boot.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-06 10:18:43 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-06 10:18:43 +0100
commit99793e3dbe39a50d871eedc361659a894601e2bf (patch)
treea676d42a42f4c884e38121e5a5a4d6630929a9f7 /kernel/trace/trace_boot.c
parentkmemtrace: add kmemtrace_init() (diff)
parenttracing/selftest: remove TRACE_CONT reference (diff)
downloadlinux-dev-99793e3dbe39a50d871eedc361659a894601e2bf.tar.xz
linux-dev-99793e3dbe39a50d871eedc361659a894601e2bf.zip
Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent
Diffstat (limited to 'kernel/trace/trace_boot.c')
-rw-r--r--kernel/trace/trace_boot.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c
index 366c8c333e13..0e94b3d091f7 100644
--- 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;