aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/oprofile/common.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
index 1e971a7fcf82..4f67cfab2c59 100644
--- a/arch/arm/oprofile/common.c
+++ b/arch/arm/oprofile/common.c
@@ -155,8 +155,10 @@ static void op_perf_stop(void)
155} 155}
156 156
157 157
158static char *op_name_from_perf_id(enum arm_perf_pmu_ids id) 158char *op_name_from_perf_id(void)
159{ 159{
160 enum arm_perf_pmu_ids id = armpmu_get_pmu_id();
161
160 switch (id) { 162 switch (id) {
161 case ARM_PERF_PMU_ID_XSCALE1: 163 case ARM_PERF_PMU_ID_XSCALE1:
162 return "arm/xscale1"; 164 return "arm/xscale1";
@@ -391,7 +393,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
391 ops->start = op_arm_start; 393 ops->start = op_arm_start;
392 ops->stop = op_arm_stop; 394 ops->stop = op_arm_stop;
393 ops->shutdown = op_arm_stop; 395 ops->shutdown = op_arm_stop;
394 ops->cpu_type = op_name_from_perf_id(armpmu_get_pmu_id()); 396 ops->cpu_type = op_name_from_perf_id();
395 397
396 if (!ops->cpu_type) 398 if (!ops->cpu_type)
397 ret = -ENODEV; 399 ret = -ENODEV;