From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 25 Feb 2010 22:09:22 +0000 (+0000)
Subject: Merge branch 'perf' into devel
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~22947^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bc85e585c6d0fab4bde12d60964b2f25802c3163;p=mirror_ubuntu-artful-kernel.git

Merge branch 'perf' into devel

Conflicts:
	arch/arm/Kconfig
---

bc85e585c6d0fab4bde12d60964b2f25802c3163
diff --cc arch/arm/Kconfig
index 7afc6150ac71,1d10b9064567..100b90f3778a
--- a/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