Merge branch 'tracing/core' into tracing/hw-breakpoints
Ingo Molnar [Mon, 7 Sep 2009 06:19:51 +0000 (08:19 +0200)]
Conflicts:
arch/Kconfig
kernel/trace/trace.h

Merge reason: resolve the conflicts, plus adopt to the new
              ring-buffer APIs.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
arch/Kconfig
arch/x86/Kconfig
arch/x86/kernel/Makefile
arch/x86/kernel/process.c
arch/x86/kernel/ptrace.c
arch/x86/kernel/traps.c
arch/x86/power/cpu.c
kernel/Makefile
kernel/trace/Kconfig
kernel/trace/trace.h
kernel/trace/trace_selftest.c

diff --cc arch/Kconfig
@@@ -113,6 -113,4 +113,8 @@@ config HAVE_DMA_API_DEBU
  config HAVE_DEFAULT_NO_SPIN_MUTEXES
        bool
  
 +config HAVE_HW_BREAKPOINT
 +      bool
 +
++
+ source "kernel/gcov/Kconfig"
Simple merge
Simple merge
Simple merge
  #include <asm/prctl.h>
  #include <asm/proto.h>
  #include <asm/ds.h>
 +#include <asm/hw_breakpoint.h>
  
- #include <trace/syscall.h>
  #include "tls.h"
  
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/syscalls.h>
  enum x86_regset {
        REGSET_GENERAL,
        REGSET_FP,
Simple merge
Simple merge
diff --cc kernel/Makefile
@@@ -95,9 -96,9 +96,10 @@@ obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT
  obj-$(CONFIG_FUNCTION_TRACER) += trace/
  obj-$(CONFIG_TRACING) += trace/
  obj-$(CONFIG_X86_DS) += trace/
+ obj-$(CONFIG_RING_BUFFER) += trace/
  obj-$(CONFIG_SMP) += sched_cpupri.o
  obj-$(CONFIG_SLOW_WORK) += slow-work.o
 +obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
  obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o
  
  ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
Simple merge
@@@ -334,11 -315,6 +330,7 @@@ extern void __ftrace_bad_type(void)
                          TRACE_KMEM_ALLOC);    \
                IF_ASSIGN(var, ent, struct kmemtrace_free_entry,        \
                          TRACE_KMEM_FREE);     \
-               IF_ASSIGN(var, ent, struct syscall_trace_enter,         \
-                         TRACE_SYSCALL_ENTER);                         \
-               IF_ASSIGN(var, ent, struct syscall_trace_exit,          \
-                         TRACE_SYSCALL_EXIT);                          \
 +              IF_ASSIGN(var, ent, struct ksym_trace_entry, TRACE_KSYM);\
                __ftrace_bad_type();                                    \
        } while (0)
  
Simple merge