Merge branch 'perf' into devel

Conflicts:
	arch/arm/Kconfig

diff --cc arch/arm/Kconfig
index 7afc6150ac71eaf6f53eae32ba8952eff5b789b8,1d10b9064567da2dc4ae91f9df14ba9d5fa38090..100b90f3778a57e914945803fe3be4d6c888c2f1
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -18,8 -18,8 +18,10 @@@ config AR
        select HAVE_KRETPROBES if (HAVE_KPROBES)
        select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
        select HAVE_GENERIC_DMA_COHERENT
 +      select HAVE_KERNEL_GZIP
 +      select HAVE_KERNEL_LZO
+       select HAVE_PERF_EVENTS
+       select PERF_USE_VMALLOC
        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and