[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-e1089602a3bf3efd13d0ffc575f3e22213f009da@git.kernel.org>
Date: Sat, 23 Apr 2016 05:53:10 -0700
From: tip-bot for Srinivas Pandruvada <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: hpa@...or.com, tglx@...utronix.de, peterz@...radead.org,
torvalds@...ux-foundation.org, srinivas.pandruvada@...ux.intel.com,
alexander.shishkin@...ux.intel.com, linux-kernel@...r.kernel.org,
eranian@...gle.com, jolsa@...hat.com, mingo@...nel.org,
vincent.weaver@...ne.edu, acme@...hat.com
Subject: [tip:perf/core] perf/x86/intel/rapl: Add missing Haswell model
Commit-ID: e1089602a3bf3efd13d0ffc575f3e22213f009da
Gitweb: http://git.kernel.org/tip/e1089602a3bf3efd13d0ffc575f3e22213f009da
Author: Srinivas Pandruvada <srinivas.pandruvada@...ux.intel.com>
AuthorDate: Sun, 17 Apr 2016 08:43:29 -0700
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Sat, 23 Apr 2016 13:46:45 +0200
perf/x86/intel/rapl: Add missing Haswell model
Added one missing Haswell model.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@...ux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Stephane Eranian <eranian@...gle.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Vince Weaver <vincent.weaver@...ne.edu>
Cc: bp@...en8.de
Cc: hpa@...or.com
Link: http://lkml.kernel.org/r/1460907809-11897-1-git-send-email-srinivas.pandruvada@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/events/intel/rapl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 70c93f9..1705c9d 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -718,6 +718,7 @@ static int __init rapl_pmu_init(void)
break;
case 60: /* Haswell */
case 69: /* Haswell-Celeron */
+ case 70: /* Haswell GT3e */
case 61: /* Broadwell */
case 71: /* Broadwell-H */
rapl_cntr_mask = RAPL_IDX_HSW;
Powered by blists - more mailing lists