diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 11:18:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 13:36:22 +0200 |
| commit | 0ad5d703c6c0fcd385d956555460df95dff7eb7e (patch) | |
| tree | 4b777100f9be4fe90ca4bd043b9f98df672b5b3b /kernel/trace/Makefile | |
| parent | 44347d947f628060b92449702071bfe1d31dfb75 (diff) | |
| parent | 1cb81b143fa8f0e4629f10690862e2e52ca792ff (diff) | |
Merge branch 'tracing/hw-branch-tracing' into tracing/core
Merge reason: this topic is ready for upstream now. It passed
Oleg's review and Andrew had no further mm/*
objections/observations either.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/Makefile')
| -rw-r--r-- | kernel/trace/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index 7c34cbfff96..06b85850fab 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile @@ -15,12 +15,17 @@ ifdef CONFIG_TRACING_BRANCHES KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING endif +# +# Make the trace clocks available generally: it's infrastructure +# relied on by ptrace for example: +# +obj-y += trace_clock.o + obj-$(CONFIG_FUNCTION_TRACER) += libftrace.o obj-$(CONFIG_RING_BUFFER) += ring_buffer.o obj-$(CONFIG_RING_BUFFER_BENCHMARK) += ring_buffer_benchmark.o obj-$(CONFIG_TRACING) += trace.o -obj-$(CONFIG_TRACING) += trace_clock.o obj-$(CONFIG_TRACING) += trace_output.o obj-$(CONFIG_TRACING) += trace_stat.o obj-$(CONFIG_TRACING) += trace_printk.o |