From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 14 Apr 2012 11:18:27 +0000 (+0200)
Subject: Merge branch 'perf/core' into perf/uprobes
X-Git-Tag: v3.12-rc1~3106^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ac1ef482d7ae0c690f1640bf6eb818ff9a2d91e;p=kernel%2Fkernel-generic.git

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

6ac1ef482d7ae0c690f1640bf6eb818ff9a2d91e
diff --cc arch/x86/Kconfig
index d2a540f,1d14cc6..76f5a46
--- a/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