summaryrefslogtreecommitdiffstats
path: root/arch/arm/oprofile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-08-05 10:27:25 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-08-05 10:27:25 +0100
commitf15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9 (patch)
treed93b59190624c0df80854aff5078c588420c3516 /arch/arm/oprofile
parentc89c3a6acb847b03250a83cecae4f5c9ced2d960 (diff)
parentc70fbb01b11cecfa13d9e746f462617d3ac0e38c (diff)
downloadlinux-f15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9.tar.bz2
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.c14
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 {
char *perf_name;
char *op_name;
} op_perf_name_map[] = {
- { "xscale1", "arm/xscale1" },
- { "xscale1", "arm/xscale2" },
- { "v6", "arm/armv6" },
- { "v6mpcore", "arm/mpcore" },
- { "ARMv7 Cortex-A8", "arm/armv7" },
- { "ARMv7 Cortex-A9", "arm/armv7-ca9" },
+ { "armv5_xscale1", "arm/xscale1" },
+ { "armv5_xscale2", "arm/xscale2" },
+ { "armv6_1136", "arm/armv6" },
+ { "armv6_1156", "arm/armv6" },
+ { "armv6_1176", "arm/armv6" },
+ { "armv6_11mpcore", "arm/mpcore" },
+ { "armv7_cortex_a8", "arm/armv7" },
+ { "armv7_cortex_a9", "arm/armv7-ca9" },
};
char *op_name_from_perf_id(void)