diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-08 09:54:29 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-08 09:54:29 +0100 |
| commit | cb5fd904f0f14866ab76ec1f6ca3469896e4e2cf (patch) | |
| tree | 38b829a0bfe220f8486ab4f771910738c83161be /arch/arm/kernel/perf_event.c | |
| parent | 2ff0720933f9a5e502a46fb6ea14ceeaad65131f (diff) | |
| parent | f4daf06fc23b99df5ca5b3e892428b91e148cc52 (diff) | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
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 d53c0abc4dd..262ea67f60a 100644 --- a/arch/arm/kernel/perf_event.c +++ b/arch/arm/kernel/perf_event.c @@ -660,6 +660,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) { |