diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 03:08:51 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 03:08:51 -0400 |
| commit | b9a3acf46afdafc601947136f63e9dd228cd86e8 (patch) | |
| tree | 2b206b6d3c51f673c94fbcdf03df2a699e7110d2 /arch/x86/kernel/cpu/perf_event_intel.c | |
| parent | 9f0fa7991af382bfa8c9575d2457a0b6ad03ac4c (diff) | |
| parent | 21d41f2b312231536cf981c960c83cc4493c0293 (diff) | |
Merge branch 'sh/stable-updates' into sh-latest
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 45fbb8f7f549..f88af2c2a561 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c | |||
| @@ -1590,6 +1590,7 @@ static __init int intel_pmu_init(void) | |||
| 1590 | break; | 1590 | break; |
| 1591 | 1591 | ||
| 1592 | case 42: /* SandyBridge */ | 1592 | case 42: /* SandyBridge */ |
| 1593 | case 45: /* SandyBridge, "Romely-EP" */ | ||
| 1593 | memcpy(hw_cache_event_ids, snb_hw_cache_event_ids, | 1594 | memcpy(hw_cache_event_ids, snb_hw_cache_event_ids, |
| 1594 | sizeof(hw_cache_event_ids)); | 1595 | sizeof(hw_cache_event_ids)); |
| 1595 | 1596 | ||