Merge branch 'perf' into devel

Conflicts:
	arch/arm/Kconfig

diff --combined 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
@@@ -550,15 -550,6 +552,15 @@@ config ARCH_W90X90
          <http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/
                ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller>
  
 +config ARCH_NUC93X
 +      bool "Nuvoton NUC93X CPU"
 +      select CPU_ARM926T
 +      select HAVE_CLK
 +      select COMMON_CLKDEV
 +      help
 +        Support for Nuvoton (Winbond logic dept.) NUC93X MCU,The NUC93X is a
 +        low-power and high performance MPEG-4/JPEG multimedia controller chip.
 +
  config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
        select CPU_ARM926T
@@@ -699,7 -690,6 +701,7 @@@ config ARCH_DAVINC
        select HAVE_IDE
        select COMMON_CLKDEV
        select GENERIC_ALLOCATOR
 +      select ARCH_HAS_HOLES_MEMORYMODEL
        help
          Support for TI's DaVinci platform.
  
@@@ -738,26 -728,14 +740,26 @@@ config ARCH_U850
  
  endchoice
  
 +source "arch/arm/mach-aaec2000/Kconfig"
 +
 +source "arch/arm/mach-at91/Kconfig"
 +
 +source "arch/arm/mach-bcmring/Kconfig"
 +
  source "arch/arm/mach-clps711x/Kconfig"
  
 +source "arch/arm/mach-davinci/Kconfig"
 +
 +source "arch/arm/mach-dove/Kconfig"
 +
  source "arch/arm/mach-ep93xx/Kconfig"
  
  source "arch/arm/mach-footbridge/Kconfig"
  
  source "arch/arm/mach-gemini/Kconfig"
  
 +source "arch/arm/mach-h720x/Kconfig"
 +
  source "arch/arm/mach-integrator/Kconfig"
  
  source "arch/arm/mach-iop32x/Kconfig"
@@@ -772,28 -750,16 +774,28 @@@ source "arch/arm/mach-ixp2000/Kconfig
  
  source "arch/arm/mach-ixp23xx/Kconfig"
  
 +source "arch/arm/mach-kirkwood/Kconfig"
 +
 +source "arch/arm/mach-ks8695/Kconfig"
 +
 +source "arch/arm/mach-lh7a40x/Kconfig"
 +
  source "arch/arm/mach-loki/Kconfig"
  
 +source "arch/arm/mach-msm/Kconfig"
 +
  source "arch/arm/mach-mv78xx0/Kconfig"
  
 -source "arch/arm/mach-pxa/Kconfig"
 -source "arch/arm/plat-pxa/Kconfig"
 +source "arch/arm/plat-mxc/Kconfig"
  
 -source "arch/arm/mach-mmp/Kconfig"
 +source "arch/arm/mach-netx/Kconfig"
  
 -source "arch/arm/mach-sa1100/Kconfig"
 +source "arch/arm/mach-nomadik/Kconfig"
 +source "arch/arm/plat-nomadik/Kconfig"
 +
 +source "arch/arm/mach-ns9xxx/Kconfig"
 +
 +source "arch/arm/mach-nuc93x/Kconfig"
  
  source "arch/arm/plat-omap/Kconfig"
  
@@@ -803,14 -769,9 +805,14 @@@ source "arch/arm/mach-omap2/Kconfig
  
  source "arch/arm/mach-orion5x/Kconfig"
  
 -source "arch/arm/mach-kirkwood/Kconfig"
 +source "arch/arm/mach-pxa/Kconfig"
 +source "arch/arm/plat-pxa/Kconfig"
  
 -source "arch/arm/mach-dove/Kconfig"
 +source "arch/arm/mach-mmp/Kconfig"
 +
 +source "arch/arm/mach-realview/Kconfig"
 +
 +source "arch/arm/mach-sa1100/Kconfig"
  
  source "arch/arm/plat-samsung/Kconfig"
  source "arch/arm/plat-s3c24xx/Kconfig"
@@@ -838,14 -799,41 +840,14 @@@ if ARCH_S5PC1X
  source "arch/arm/mach-s5pc100/Kconfig"
  endif
  
 -source "arch/arm/mach-lh7a40x/Kconfig"
 +source "arch/arm/mach-u300/Kconfig"
  
 -source "arch/arm/mach-h720x/Kconfig"
 +source "arch/arm/mach-ux500/Kconfig"
  
  source "arch/arm/mach-versatile/Kconfig"
  
 -source "arch/arm/mach-aaec2000/Kconfig"
 -
 -source "arch/arm/mach-realview/Kconfig"
 -
 -source "arch/arm/mach-at91/Kconfig"
 -
 -source "arch/arm/plat-mxc/Kconfig"
 -
 -source "arch/arm/mach-nomadik/Kconfig"
 -source "arch/arm/plat-nomadik/Kconfig"
 -
 -source "arch/arm/mach-netx/Kconfig"
 -
 -source "arch/arm/mach-ns9xxx/Kconfig"
 -
 -source "arch/arm/mach-davinci/Kconfig"
 -
 -source "arch/arm/mach-ks8695/Kconfig"
 -
 -source "arch/arm/mach-msm/Kconfig"
 -
 -source "arch/arm/mach-u300/Kconfig"
 -
  source "arch/arm/mach-w90x900/Kconfig"
  
 -source "arch/arm/mach-bcmring/Kconfig"
 -
 -source "arch/arm/mach-ux500/Kconfig"
 -
  # Definitions to make life easier
  config ARCH_ACORN
        bool
@@@ -877,6 -865,11 +879,11 @@@ config XSCALE_PM
        depends on CPU_XSCALE && !XSCALE_PMU_TIMER
        default y
  
+ config CPU_HAS_PMU
+       depends on CPU_V6 || CPU_V7 || XSCALE_PMU
+       default y
+       bool
+ 
  if !MMU
  source "arch/arm/Kconfig-nommu"
  endif
@@@ -1181,6 -1174,14 +1188,14 @@@ config HIGHPT
        depends on HIGHMEM
        depends on !OUTER_CACHE
  
+ config HW_PERF_EVENTS
+       bool "Enable hardware performance counter support for perf events"
+       depends on PERF_EVENTS && CPU_HAS_PMU && (CPU_V6 || CPU_V7)
+       default y
+       help
+         Enable hardware performance counter support for perf events. If
+         disabled, perf events will use software events only.
+ 
  source "mm/Kconfig"
  
  config LEDS