Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core

2011-10-18 08:31:07 +02:00 · 2011-10-18 08:31:07 +02:00 · 47724df337
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@ -10,6 +10,7 @@ config M32R
 	select HAVE_GENERIC_HARDIRQS
 	select GENERIC_IRQ_PROBE
 	select GENERIC_IRQ_SHOW
+	select GENERIC_ATOMIC64

 config SBUS
 	bool