summaryrefslogtreecommitdiffstats
path: root/arch/x86/events/intel/rapl.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-04-23 14:12:10 +0200
committerIngo Molnar <mingo@kernel.org>2016-04-23 14:12:10 +0200
commit65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee (patch)
tree02b22c99008630010f28f45f502f55915f1014c2 /arch/x86/events/intel/rapl.c
parent9243ae5b28d02dc7d71a4f00c981ef6feaede3f1 (diff)
parentb303e7c15d53cd8ef6b349b702e07eee3f102792 (diff)
downloadlinux-65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee.tar.bz2
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/intel/rapl.c')
-rw-r--r--arch/x86/events/intel/rapl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index e657de1923c2..c9b7489ae8ee 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -744,6 +744,7 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = {
X86_RAPL_MODEL_MATCH(79, hsx_rapl_init), /* Broadwell-Server */
X86_RAPL_MODEL_MATCH(60, hsw_rapl_init), /* Haswell */
X86_RAPL_MODEL_MATCH(69, hsw_rapl_init), /* Haswell-Celeron */
+ X86_RAPL_MODEL_MATCH(70, hsw_rapl_init), /* Haswell GT3e */
X86_RAPL_MODEL_MATCH(61, hsw_rapl_init), /* Broadwell */
X86_RAPL_MODEL_MATCH(71, hsw_rapl_init), /* Broadwell-H */
X86_RAPL_MODEL_MATCH(45, snbep_rapl_init), /* Sandy Bridge-EP */