diff options
Diffstat (limited to 'arch/arm/kernel/perf_event_v6.c')
| -rw-r--r-- | arch/arm/kernel/perf_event_v6.c | 32 | 
1 files changed, 18 insertions, 14 deletions
diff --git a/arch/arm/kernel/perf_event_v6.c b/arch/arm/kernel/perf_event_v6.c index e63d8115c01..533be9930ec 100644 --- a/arch/arm/kernel/perf_event_v6.c +++ b/arch/arm/kernel/perf_event_v6.c @@ -65,13 +65,15 @@ enum armv6_counters {   * accesses/misses in hardware.   */  static const unsigned armv6_perf_map[PERF_COUNT_HW_MAX] = { -	[PERF_COUNT_HW_CPU_CYCLES]	    = ARMV6_PERFCTR_CPU_CYCLES, -	[PERF_COUNT_HW_INSTRUCTIONS]	    = ARMV6_PERFCTR_INSTR_EXEC, -	[PERF_COUNT_HW_CACHE_REFERENCES]    = HW_OP_UNSUPPORTED, -	[PERF_COUNT_HW_CACHE_MISSES]	    = HW_OP_UNSUPPORTED, -	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = ARMV6_PERFCTR_BR_EXEC, -	[PERF_COUNT_HW_BRANCH_MISSES]	    = ARMV6_PERFCTR_BR_MISPREDICT, -	[PERF_COUNT_HW_BUS_CYCLES]	    = HW_OP_UNSUPPORTED, +	[PERF_COUNT_HW_CPU_CYCLES]		= ARMV6_PERFCTR_CPU_CYCLES, +	[PERF_COUNT_HW_INSTRUCTIONS]		= ARMV6_PERFCTR_INSTR_EXEC, +	[PERF_COUNT_HW_CACHE_REFERENCES]	= HW_OP_UNSUPPORTED, +	[PERF_COUNT_HW_CACHE_MISSES]		= HW_OP_UNSUPPORTED, +	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS]	= ARMV6_PERFCTR_BR_EXEC, +	[PERF_COUNT_HW_BRANCH_MISSES]		= ARMV6_PERFCTR_BR_MISPREDICT, +	[PERF_COUNT_HW_BUS_CYCLES]		= HW_OP_UNSUPPORTED, +	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND]	= ARMV6_PERFCTR_IBUF_STALL, +	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND]	= ARMV6_PERFCTR_LSU_FULL_STALL,  };  static const unsigned armv6_perf_cache_map[PERF_COUNT_HW_CACHE_MAX] @@ -218,13 +220,15 @@ enum armv6mpcore_perf_types {   * accesses/misses in hardware.   */  static const unsigned armv6mpcore_perf_map[PERF_COUNT_HW_MAX] = { -	[PERF_COUNT_HW_CPU_CYCLES]	    = ARMV6MPCORE_PERFCTR_CPU_CYCLES, -	[PERF_COUNT_HW_INSTRUCTIONS]	    = ARMV6MPCORE_PERFCTR_INSTR_EXEC, -	[PERF_COUNT_HW_CACHE_REFERENCES]    = HW_OP_UNSUPPORTED, -	[PERF_COUNT_HW_CACHE_MISSES]	    = HW_OP_UNSUPPORTED, -	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = ARMV6MPCORE_PERFCTR_BR_EXEC, -	[PERF_COUNT_HW_BRANCH_MISSES]	    = ARMV6MPCORE_PERFCTR_BR_MISPREDICT, -	[PERF_COUNT_HW_BUS_CYCLES]	    = HW_OP_UNSUPPORTED, +	[PERF_COUNT_HW_CPU_CYCLES]		= ARMV6MPCORE_PERFCTR_CPU_CYCLES, +	[PERF_COUNT_HW_INSTRUCTIONS]		= ARMV6MPCORE_PERFCTR_INSTR_EXEC, +	[PERF_COUNT_HW_CACHE_REFERENCES]	= HW_OP_UNSUPPORTED, +	[PERF_COUNT_HW_CACHE_MISSES]		= HW_OP_UNSUPPORTED, +	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS]	= ARMV6MPCORE_PERFCTR_BR_EXEC, +	[PERF_COUNT_HW_BRANCH_MISSES]		= ARMV6MPCORE_PERFCTR_BR_MISPREDICT, +	[PERF_COUNT_HW_BUS_CYCLES]		= HW_OP_UNSUPPORTED, +	[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND]	= ARMV6MPCORE_PERFCTR_IBUF_STALL, +	[PERF_COUNT_HW_STALLED_CYCLES_BACKEND]	= ARMV6MPCORE_PERFCTR_LSU_FULL_STALL,  };  static const unsigned armv6mpcore_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]  |