From: Mark Rutland Date: Tue, 18 Feb 2014 10:31:10 +0000 (+0000) Subject: ARM: perf: remove unused PMU probing code X-Git-Tag: v3.15-rc1~31^2^2~2^2~1 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=51e5fef62059e4074054ee731385e0dc7ca561ff;p=linux-block.git ARM: perf: remove unused PMU probing code The ARM perf backend can discover the type of PMU it needs to drive either from DT or by probing a CPU it is running on. For Cortex-A{5,7,15} there are no platforms in mainline not using dt, and this probing won't work well for big.LITTLE systems with heterogeneous PMUs. This patch drops the probing for those CPUs, relying on information from dt instead. Future platforms should describe their PMU(s) with dt. Suggested-by: Will Deacon Signed-off-by: Mark Rutland Signed-off-by: Will Deacon --- diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c index ed571d386c0b..326cb58de2f8 100644 --- a/arch/arm/kernel/perf_event_cpu.c +++ b/arch/arm/kernel/perf_event_cpu.c @@ -267,15 +267,6 @@ static int probe_current_pmu(struct arm_pmu *pmu) case ARM_CPU_PART_CORTEX_A9: ret = armv7_a9_pmu_init(pmu); break; - case ARM_CPU_PART_CORTEX_A5: - ret = armv7_a5_pmu_init(pmu); - break; - case ARM_CPU_PART_CORTEX_A15: - ret = armv7_a15_pmu_init(pmu); - break; - case ARM_CPU_PART_CORTEX_A7: - ret = armv7_a7_pmu_init(pmu); - break; } /* Intel CPUs [xscale]. */ } else if (implementor == ARM_CPU_IMP_INTEL) {