diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 05:27:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 05:27:25 -0400 |
| commit | f15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9 (patch) | |
| tree | d93b59190624c0df80854aff5078c588420c3516 /arch/arm/oprofile | |
| parent | c89c3a6acb847b03250a83cecae4f5c9ced2d960 (diff) | |
| parent | c70fbb01b11cecfa13d9e746f462617d3ac0e38c (diff) | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/kernel/perf_event_cpu.c
Diffstat (limited to 'arch/arm/oprofile')
| -rw-r--r-- | arch/arm/oprofile/common.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c index e6a3c4c92163..cc649a1e46da 100644 --- a/arch/arm/oprofile/common.c +++ b/arch/arm/oprofile/common.c | |||
| @@ -33,12 +33,14 @@ static struct op_perf_name { | |||
| 33 | char *perf_name; | 33 | char *perf_name; |
| 34 | char *op_name; | 34 | char *op_name; |
| 35 | } op_perf_name_map[] = { | 35 | } op_perf_name_map[] = { |
| 36 | { "xscale1", "arm/xscale1" }, | 36 | { "armv5_xscale1", "arm/xscale1" }, |
| 37 | { "xscale1", "arm/xscale2" }, | 37 | { "armv5_xscale2", "arm/xscale2" }, |
| 38 | { "v6", "arm/armv6" }, | 38 | { "armv6_1136", "arm/armv6" }, |
| 39 | { "v6mpcore", "arm/mpcore" }, | 39 | { "armv6_1156", "arm/armv6" }, |
| 40 | { "ARMv7 Cortex-A8", "arm/armv7" }, | 40 | { "armv6_1176", "arm/armv6" }, |
| 41 | { "ARMv7 Cortex-A9", "arm/armv7-ca9" }, | 41 | { "armv6_11mpcore", "arm/mpcore" }, |
| 42 | { "armv7_cortex_a8", "arm/armv7" }, | ||
| 43 | { "armv7_cortex_a9", "arm/armv7-ca9" }, | ||
| 42 | }; | 44 | }; |
| 43 | 45 | ||
| 44 | char *op_name_from_perf_id(void) | 46 | char *op_name_from_perf_id(void) |