From: Ingo Molnar Date: Thu, 7 May 2009 09:18:34 +0000 (+0200) Subject: Merge branch 'tracing/hw-branch-tracing' into tracing/core X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0ad5d703c6c0fcd385d956555460df95dff7eb7e;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 --- 0ad5d703c6c0fcd385d956555460df95dff7eb7e diff --cc kernel/trace/Makefile index 7c34cbfff96e,ecc671e9f142..06b85850fab4 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile @@@ -15,12 -15,16 +15,17 @@@ ifdef CONFIG_TRACING_BRANCHE 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