aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-07-28 11:27:03 -0400
committerWill Deacon <will.deacon@arm.com>2012-08-23 06:35:51 -0400
commitf0d1bc47953743aef9d2ed5326bc5973a3db08ab (patch)
treeda83dfd3a4ec6e92da3401a0563072bdfb3afccc /arch/arm/Kconfig
parent50243efde0993f6fe98f27a35692d0e8efdf7a0f (diff)
ARM: pmu: remove unused reservation mechanism
The PMU reservation mechanism was originally intended to allow OProfile and perf-events to co-ordinate over access to the CPU PMU. Since then, OProfile for ARM has moved to using perf as its backend, so the reservation code is no longer used. This patch removes the reservation code for the CPU PMU on ARM. Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6d6e18fee9fe..1d5ce138b877 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1179,12 +1179,6 @@ config XSCALE_PMU
1179 depends on CPU_XSCALE 1179 depends on CPU_XSCALE
1180 default y 1180 default y
1181 1181
1182config CPU_HAS_PMU
1183 depends on (CPU_V6 || CPU_V6K || CPU_V7 || XSCALE_PMU) && \
1184 (!ARCH_OMAP3 || OMAP3_EMU)
1185 default y
1186 bool
1187
1188config MULTI_IRQ_HANDLER 1182config MULTI_IRQ_HANDLER
1189 bool 1183 bool
1190 help 1184 help
@@ -1757,7 +1751,7 @@ config HIGHPTE
1757 1751
1758config HW_PERF_EVENTS 1752config HW_PERF_EVENTS
1759 bool "Enable hardware performance counter support for perf events" 1753 bool "Enable hardware performance counter support for perf events"
1760 depends on PERF_EVENTS && CPU_HAS_PMU 1754 depends on PERF_EVENTS
1761 default y 1755 default y
1762 help 1756 help
1763 Enable hardware performance counter support for perf events. If 1757 Enable hardware performance counter support for perf events. If