projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
[deliverable/linux.git]
/
arch
/
arm
/
kernel
/
perf_event.c
diff --git
a/arch/arm/kernel/perf_event.c
b/arch/arm/kernel/perf_event.c
index 8a89d3b7626b2fd6e7e984f6561ca113b12d1081..186c8cb982c543a2cc1631796b34376151b33702 100644
(file)
--- a/
arch/arm/kernel/perf_event.c
+++ b/
arch/arm/kernel/perf_event.c
@@
-738,6
+738,9
@@
init_hw_perf_events(void)
case 0xC0F0: /* Cortex-A15 */
cpu_pmu = armv7_a15_pmu_init();
break;
+ case 0xC070: /* Cortex-A7 */
+ cpu_pmu = armv7_a7_pmu_init();
+ break;
}
/* Intel CPUs [xscale]. */
} else if (0x69 == implementor) {
This page took
0.025933 seconds
and
5
git commands to generate.