Merge branch 'tracing/hw-branch-tracing' into tracing/core
Ingo Molnar [Thu, 7 May 2009 09:18:34 +0000 (11:18 +0200)]
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>

1  2 
include/linux/sched.h
kernel/fork.c
kernel/ptrace.c
kernel/sched.c
kernel/trace/Makefile
kernel/trace/trace.h
kernel/trace/trace_hw_branches.c

Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc kernel/ptrace.c
Simple merge
diff --cc kernel/sched.c
Simple merge
@@@ -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
Simple merge
Simple merge