diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-23 00:09:07 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-23 00:09:07 +0200 |
| commit | 3ad55155b222f2a901405dea20ff7c68828ecd92 (patch) | |
| tree | 53b24c981387b037084a333dc5ae23be8e82ef4a /arch/arm/kernel/perf_event.c | |
| parent | Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci... (diff) | |
| parent | ARM: Fix build errors caused by adding generic macros (diff) | |
| download | linux-3ad55155b222f2a901405dea20ff7c68828ecd92.tar.xz linux-3ad55155b222f2a901405dea20ff7c68828ecd92.zip | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/kernel/entry-armv.S
Diffstat (limited to 'arch/arm/kernel/perf_event.c')
| -rw-r--r-- | arch/arm/kernel/perf_event.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c index 8d8507858e5c..53c9c2610cbc 100644 --- a/arch/arm/kernel/perf_event.c +++ b/arch/arm/kernel/perf_event.c @@ -662,6 +662,12 @@ init_hw_perf_events(void) case 0xC090: /* Cortex-A9 */ armpmu = armv7_a9_pmu_init(); break; + case 0xC050: /* Cortex-A5 */ + armpmu = armv7_a5_pmu_init(); + break; + case 0xC0F0: /* Cortex-A15 */ + armpmu = armv7_a15_pmu_init(); + break; } /* Intel CPUs [xscale]. */ } else if (0x69 == implementor) { |