From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 7 Sep 2009 06:19:51 +0000 (+0200)
Subject: Merge branch 'tracing/core' into tracing/hw-breakpoints
X-Git-Tag: v2.6.33-rc1~399^2~146^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1922ed661ab2c1637d0b10cde933bd9cd33d965;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'tracing/core' into tracing/hw-breakpoints

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>
---

a1922ed661ab2c1637d0b10cde933bd9cd33d965
diff --cc arch/Kconfig
index 1adf2d0e6356e,99193b1602324..c72f18fde3199
--- a/arch/Kconfig
+++ b/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"
diff --cc arch/x86/kernel/ptrace.c
index cabdabce3cb21,8d7d5c9c1be31..113b8927c8228
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@@ -34,12 -34,12 +34,13 @@@
  #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,
diff --cc kernel/Makefile
index f88decb1b4452,2093a691f1c25..52508612a08ff
--- a/kernel/Makefile
+++ b/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)
diff --cc kernel/trace/trace.h
index ff1ef411a1767,fa1dccb579d57..ea7e0bcbd5399
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@@ -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)