Commit-ID: 7fd565e27547c913b83b46d94662103be81a88ec Gitweb: http://git.kernel.org/tip/7fd565e27547c913b83b46d94662103be81a88ec Author: Stephane Eranian <eranian@xxxxxxxxxx> AuthorDate: Mon, 16 Dec 2013 21:20:23 +0100 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Tue, 17 Dec 2013 15:21:32 +0100 perf/x86: enable Haswell Celeron RAPL support Enable RAPL support for Haswell Celeron (model 69). Signed-off-by: Stephane Eranian <eranian@xxxxxxxxxx> Signed-off-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: ak@xxxxxxxxxxxxxxx Cc: acme@xxxxxxxxxx Cc: jolsa@xxxxxxxxxx Cc: zheng.z.yan@xxxxxxxxx Cc: bp@xxxxxxxxx Cc: vincent.weaver@xxxxxxxxx Cc: maria.n.dimakopoulou@xxxxxxxxx Cc: peterz@xxxxxxxxxxxxx Link: http://lkml.kernel.org/r/1387225224-27799-2-git-send-email-eranian@xxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- arch/x86/kernel/cpu/perf_event_intel_rapl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c index bf8e4a7..0e3754e 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c +++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c @@ -615,6 +615,7 @@ static int __init rapl_pmu_init(void) case 42: /* Sandy Bridge */ case 58: /* Ivy Bridge */ case 60: /* Haswell */ + case 69: /* Haswell-Celeron */ rapl_cntr_mask = RAPL_IDX_CLN; rapl_pmu_events_group.attrs = rapl_events_cln_attr; break; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|