diff options
| author | Will Deacon <will.deacon@arm.com> | 2011-11-14 10:33:05 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2011-12-02 15:16:25 +0000 |
| commit | feb45d06ffd7b59f43f1ed8edf53a0cfe3e7ad2a (patch) | |
| tree | edb7c4425d0cd554b5eb2a4366fb98f424f214f5 | |
| parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
| download | op-kernel-dev-feb45d06ffd7b59f43f1ed8edf53a0cfe3e7ad2a.zip op-kernel-dev-feb45d06ffd7b59f43f1ed8edf53a0cfe3e7ad2a.tar.gz | |
ARM: perf: remove unused armpmu_get_max_events
armpmu_get_max_events is only called from perf_num_counters, so we can
inline it there. It existed as a separate entity as a hangover from
the original perf-based oprofile implementation.
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | arch/arm/include/asm/perf_event.h | 3 | ||||
| -rw-r--r-- | arch/arm/kernel/perf_event.c | 9 |
2 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/include/asm/perf_event.h b/arch/arm/include/asm/perf_event.h index 0f8e382..99cfe36 100644 --- a/arch/arm/include/asm/perf_event.h +++ b/arch/arm/include/asm/perf_event.h @@ -32,7 +32,4 @@ enum arm_perf_pmu_ids { extern enum arm_perf_pmu_ids armpmu_get_pmu_id(void); -extern int -armpmu_get_max_events(void); - #endif /* __ARM_PERF_EVENT_H__ */ diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c index c475379..bf0d7b6 100644 --- a/arch/arm/kernel/perf_event.c +++ b/arch/arm/kernel/perf_event.c @@ -59,8 +59,7 @@ armpmu_get_pmu_id(void) } EXPORT_SYMBOL_GPL(armpmu_get_pmu_id); -int -armpmu_get_max_events(void) +int perf_num_counters(void) { int max_events = 0; @@ -69,12 +68,6 @@ armpmu_get_max_events(void) return max_events; } -EXPORT_SYMBOL_GPL(armpmu_get_max_events); - -int perf_num_counters(void) -{ - return armpmu_get_max_events(); -} EXPORT_SYMBOL_GPL(perf_num_counters); #define HW_OP_UNSUPPORTED 0xFFFF |
