diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:09:22 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:09:22 +0000 |
| commit | bc85e585c6d0fab4bde12d60964b2f25802c3163 (patch) | |
| tree | 80f5fe916e3458d0676e595e3433a0313e7ba72b /arch/arm/Kconfig | |
| parent | Merge branch 'tmpreg' into devel (diff) | |
| parent | ARM: 5903/1: arm/perfevents: add support for ARMv7 (diff) | |
| download | linux-dev-bc85e585c6d0fab4bde12d60964b2f25802c3163.tar.xz linux-dev-bc85e585c6d0fab4bde12d60964b2f25802c3163.zip | |
Merge branch 'perf' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7afc6150ac71..100b90f3778a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -20,6 +20,8 @@ config ARM 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 @@ -877,6 +879,11 @@ config XSCALE_PMU 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 +1188,14 @@ config HIGHPTE 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 |