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>

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/processor.h
Simple merge

diff --cc arch/x86/kernel/kprobes.c
index c5f1f117e0c0577a527e788d4c80220bd49dd84d,b5b1848c5336e505a5a147f0497865056f34b307..3fe86d706a1493ad59cb655478bd9b41cfd11f4d
--- 1/arch/x86/kernel/kprobes.c
--- 2/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 arch/x86/kernel/process_64.c
Simple merge

diff --cc arch/x86/kernel/ptrace.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc include/linux/perf_event.h
index 7f87563c8485a62da6aafe2e646bd5eb6bdb73ab,cead64ea6c1569c5cc70204a774c30625ad6293a..b5cdac0de370ce538241eba6aa50e1547ac43f7a
--- 1/include/linux/perf_event.h
--- 2/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/exit.c
Simple merge

diff --cc kernel/perf_event.c
Simple merge

diff --cc kernel/trace/Kconfig
Simple merge

diff --cc kernel/trace/Makefile
index edc3a3cca1a16cbd4199a0b8035550f60f7ba593,0f84c52e58fe641db0e5b4afe5beb1eed49368ba..cd9ecd89ec7714d34f16fd541beabd9ce0e504d2
--- 1/kernel/trace/Makefile
--- 2/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

diff --cc kernel/trace/trace.h
Simple merge