From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 21 Nov 2009 13:07:23 +0000 (+0100)
Subject: Merge branch 'tracing/hw-breakpoints' into perf/core
X-Git-Tag: v2.6.33-rc1~48^2~269
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=96200591a34f8ecb98481c626125df43a2463b55;p=linux-2.6-block.git

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

Conflicts:
	arch/x86/kernel/kprobes.c
	kernel/trace/Makefile

Merge reason: hw-breakpoints perf integration is looking
              good in testing and in reviews, plus conflicts
              are mounting up - so merge & resolve.

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

96200591a34f8ecb98481c626125df43a2463b55
diff --cc arch/x86/kernel/kprobes.c
index c5f1f117e0c0,b5b1848c5336..3fe86d706a14
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@@ -55,7 -54,7 +55,8 @@@
  #include <asm/pgtable.h>
  #include <asm/uaccess.h>
  #include <asm/alternative.h>
 +#include <asm/insn.h>
+ #include <asm/debugreg.h>
  
  void jprobe_return_end(void);
  
diff --cc include/linux/perf_event.h
index 7f87563c8485,cead64ea6c15..b5cdac0de370
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@@ -474,10 -486,15 +488,15 @@@ struct hw_perf_event 
  			unsigned long	event_base;
  			int		idx;
  		};
 -		union { /* software */
 -			atomic64_t	count;
 +		struct { /* software */
 +			s64		remaining;
  			struct hrtimer	hrtimer;
  		};
+ #ifdef CONFIG_HAVE_HW_BREAKPOINT
+ 		union { /* breakpoint */
+ 			struct arch_hw_breakpoint	info;
+ 		};
+ #endif
  	};
  	atomic64_t			prev_count;
  	u64				sample_period;
diff --cc kernel/trace/Makefile
index edc3a3cca1a1,0f84c52e58fe..cd9ecd89ec77
--- a/kernel/trace/Makefile
+++ b/kernel/trace/Makefile
@@@ -53,7 -53,7 +53,8 @@@ obj-$(CONFIG_EVENT_TRACING) += trace_ex
  obj-$(CONFIG_FTRACE_SYSCALLS) += trace_syscalls.o
  obj-$(CONFIG_EVENT_PROFILE) += trace_event_profile.o
  obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
 +obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
+ obj-$(CONFIG_KSYM_TRACER) += trace_ksym.o
  obj-$(CONFIG_EVENT_TRACING) += power-traces.o
  
  libftrace-y := ftrace.o