Merge branch 'perf/core' into perf/uprobes

Merge in latest upstream (and the latest perf development tree),
to prepare for tooling changes, and also to pick up v3.4 MM
changes that the uprobes code needs to take care of.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
index d2a540f7d6cbb27dfd0af40a002a5b8979d325a1,1d14cc6b79ad399d1ad293030c9f2271d9e5df1d..76f5a466547a5162912e128a1c5421d2f9125f71
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -82,9 -81,10 +81,10 @@@ config X8
        select CLKEVT_I8253
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_IOMAP
+       select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC
  
  config INSTRUCTION_DECODER
 -      def_bool (KPROBES || PERF_EVENTS)
 +      def_bool (KPROBES || PERF_EVENTS || UPROBES)
  
  config OUTPUT_FORMAT
        string

diff --cc arch/x86/kernel/Makefile
Simple merge

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

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/signal.c
Simple merge

diff --cc mm/mmap.c
Simple merge