diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 10:18:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 10:18:43 +0100 |
| commit | 99793e3dbe39a50d871eedc361659a894601e2bf (patch) | |
| tree | a676d42a42f4c884e38121e5a5a4d6630929a9f7 /kernel/trace/Makefile | |
| parent | kmemtrace: add kmemtrace_init() (diff) | |
| parent | tracing/selftest: remove TRACE_CONT reference (diff) | |
| download | linux-99793e3dbe39a50d871eedc361659a894601e2bf.tar.xz linux-99793e3dbe39a50d871eedc361659a894601e2bf.zip | |
Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent
Diffstat (limited to 'kernel/trace/Makefile')
| -rw-r--r-- | kernel/trace/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index 513dc86b5dfa..05c9182061de 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile @@ -19,6 +19,8 @@ obj-$(CONFIG_FUNCTION_TRACER) += libftrace.o obj-$(CONFIG_RING_BUFFER) += ring_buffer.o obj-$(CONFIG_TRACING) += trace.o +obj-$(CONFIG_TRACING) += trace_output.o +obj-$(CONFIG_TRACING) += trace_stat.o obj-$(CONFIG_CONTEXT_SWITCH_TRACER) += trace_sched_switch.o obj-$(CONFIG_SYSPROF_TRACER) += trace_sysprof.o obj-$(CONFIG_FUNCTION_TRACER) += trace_functions.o |