diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-21 16:48:01 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-21 16:48:01 -0400 |
| commit | 0c9de3c52d2baed6bc2ee44885adb418152c71c4 (patch) | |
| tree | e19ab2c41ae47250fd614418022b32aa783aa563 /arch/x86/kernel/cpu/perf_event_intel.c | |
| parent | 6bfc82ff589a00e5fbc12b958c649d703d273c86 (diff) | |
| parent | 3c7c5dab44d6c8861bc86dab924353d8d40344f8 (diff) | |
Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer
Conflicts:
arch/arm/mach-omap2/timer.c
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_intel.c')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c index 7f2739e03e79..0d3d63afa76a 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c | |||
| @@ -2008,6 +2008,7 @@ __init int intel_pmu_init(void) | |||
| 2008 | break; | 2008 | break; |
| 2009 | 2009 | ||
| 2010 | case 28: /* Atom */ | 2010 | case 28: /* Atom */ |
| 2011 | case 54: /* Cedariew */ | ||
| 2011 | memcpy(hw_cache_event_ids, atom_hw_cache_event_ids, | 2012 | memcpy(hw_cache_event_ids, atom_hw_cache_event_ids, |
| 2012 | sizeof(hw_cache_event_ids)); | 2013 | sizeof(hw_cache_event_ids)); |
| 2013 | 2014 | ||