diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 04:18:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 04:18:43 -0500 |
| commit | 99793e3dbe39a50d871eedc361659a894601e2bf (patch) | |
| tree | a676d42a42f4c884e38121e5a5a4d6630929a9f7 /kernel/trace/trace_boot.c | |
| parent | 3e80680208ba6ce9635ca7c21ad0019442ea166a (diff) | |
| parent | a103e2ab7377dbbef2506be59c49a3f2ae10b60b (diff) | |
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.c | 1 |
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 @@ | |||
| 11 | #include <linux/kallsyms.h> | 11 | #include <linux/kallsyms.h> |
| 12 | 12 | ||
| 13 | #include "trace.h" | 13 | #include "trace.h" |
| 14 | #include "trace_output.h" | ||
| 14 | 15 | ||
| 15 | static struct trace_array *boot_trace; | 16 | static struct trace_array *boot_trace; |
| 16 | static bool pre_initcalls_finished; | 17 | static bool pre_initcalls_finished; |