diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-04-14 15:44:06 +0200 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-04-22 14:32:39 +0200 |
| commit | e9c74a686a45e54b2e1c4586b14c84f3ee2f2014 (patch) | |
| tree | c54184c5a01713fa8ad9ae595c5c77a0592b931f | |
| parent | KVM: arm64: Divorce the perf code from oprofile helpers (diff) | |
| download | linux-e9c74a686a45e54b2e1c4586b14c84f3ee2f2014.tar.xz linux-e9c74a686a45e54b2e1c4586b14c84f3ee2f2014.zip | |
arm64: Get rid of oprofile leftovers
perf_pmu_name() and perf_num_counters() are now unused. Drop them.
Signed-off-by: Marc Zyngier <maz@kernel.org>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20210414134409.1266357-3-maz@kernel.org
| -rw-r--r-- | drivers/perf/arm_pmu.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index 2d10d84fb79c..d4f7f1f9cc77 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -581,33 +581,6 @@ static const struct attribute_group armpmu_common_attr_group = { .attrs = armpmu_common_attrs, }; -/* Set at runtime when we know what CPU type we are. */ -static struct arm_pmu *__oprofile_cpu_pmu; - -/* - * Despite the names, these two functions are CPU-specific and are used - * by the OProfile/perf code. - */ -const char *perf_pmu_name(void) -{ - if (!__oprofile_cpu_pmu) - return NULL; - - return __oprofile_cpu_pmu->name; -} -EXPORT_SYMBOL_GPL(perf_pmu_name); - -int perf_num_counters(void) -{ - int max_events = 0; - - if (__oprofile_cpu_pmu != NULL) - max_events = __oprofile_cpu_pmu->num_events; - - return max_events; -} -EXPORT_SYMBOL_GPL(perf_num_counters); - static int armpmu_count_irq_users(const int irq) { int cpu, count = 0; @@ -979,9 +952,6 @@ int armpmu_register(struct arm_pmu *pmu) if (ret) goto out_destroy; - if (!__oprofile_cpu_pmu) - __oprofile_cpu_pmu = pmu; - pr_info("enabled with %s PMU driver, %d counters available%s\n", pmu->name, pmu->num_events, has_nmi ? ", using NMIs" : ""); |