Merge branch 'x86/cleanups' into perf/uprobes

Merge reason: We want to merge a dependent patch.

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

diff --cc arch/powerpc/kernel/perf_event.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

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

diff --cc arch/x86/kernel/cpu/perf_event.c
index 3c44b71,63c0e05..1c52bdb
--- 1/arch/x86/kernel/cpu/perf_event.c
--- 2/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@@ -29,10 -28,8 +29,9 @@@
  #include <asm/apic.h>
  #include <asm/stacktrace.h>
  #include <asm/nmi.h>
- #include <asm/compat.h>
  #include <asm/smp.h>
  #include <asm/alternative.h>
 +#include <asm/timer.h>
  
  #include "perf_event.h"
  

diff --cc arch/x86/kernel/cpu/perf_event.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/events/hw_breakpoint.c
Simple merge

diff --cc tools/perf/util/evlist.c
Simple merge

diff --cc tools/perf/util/probe-event.c
Simple merge

diff --cc tools/perf/util/probe-finder.c
Simple merge