[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-7fd565e27547c913b83b46d94662103be81a88ec@git.kernel.org>
Date: Wed, 18 Dec 2013 02:32:20 -0800
From: tip-bot for Stephane Eranian <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, eranian@...gle.com, hpa@...or.com,
mingo@...nel.org, peterz@...radead.org, tglx@...utronix.de
Subject: [tip:perf/core] perf/x86: enable Haswell Celeron RAPL support
Commit-ID: 7fd565e27547c913b83b46d94662103be81a88ec
Gitweb: http://git.kernel.org/tip/7fd565e27547c913b83b46d94662103be81a88ec
Author: Stephane Eranian <eranian@...gle.com>
AuthorDate: Mon, 16 Dec 2013 21:20:23 +0100
Committer: Ingo Molnar <mingo@...nel.org>
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@...gle.com>
Signed-off-by: Peter Zijlstra <peterz@...radead.org>
Cc: ak@...ux.intel.com
Cc: acme@...hat.com
Cc: jolsa@...hat.com
Cc: zheng.z.yan@...el.com
Cc: bp@...en8.de
Cc: vincent.weaver@...ne.edu
Cc: maria.n.dimakopoulou@...il.com
Cc: peterz@...radead.org
Link: http://lkml.kernel.org/r/1387225224-27799-2-git-send-email-eranian@google.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists