From 658f465aca815a23163505ef1561696b4be763cc Mon Sep 17 00:00:00 2001 From: Youquan Song Date: Tue, 18 Dec 2012 12:20:23 -0500 Subject: [PATCH] --- yaml --- r: 349499 b: refs/heads/master c: 923d8697e24847000490c187de1aeaca622611a3 h: refs/heads/master i: 349497: 87e74a46438424e8536d2275b1d3f3ab1f69d2e6 349495: 2626424f6b30fccc381cdfa328ae6eb6cffa90d2 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/perf_event_intel.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a4ed4250d1fd..e784e0a1059e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9faec5be3a27f95ee359b42c6c81b3173eb13958 +refs/heads/master: 923d8697e24847000490c187de1aeaca622611a3 diff --git a/trunk/arch/x86/kernel/cpu/perf_event_intel.c b/trunk/arch/x86/kernel/cpu/perf_event_intel.c index cb313a56c21b..4914e94ad6e8 100644 --- a/trunk/arch/x86/kernel/cpu/perf_event_intel.c +++ b/trunk/arch/x86/kernel/cpu/perf_event_intel.c @@ -2087,6 +2087,7 @@ __init int intel_pmu_init(void) pr_cont("SandyBridge events, "); break; case 58: /* IvyBridge */ + case 62: /* IvyBridge EP */ memcpy(hw_cache_event_ids, snb_hw_cache_event_ids, sizeof(hw_cache_event_ids)); memcpy(hw_cache_extra_regs, snb_hw_cache_extra_regs,