From: Peter Zijlstra <peterz@infradead.org>
Date: Thu, 21 Apr 2016 13:15:47 +0000 (+0200)
Subject: x86/perf/rapl: Add missing Broadwell model
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=31b84310c79421d726621e800434c66a48a6c959;p=openwrt%2Fstaging%2Fblogic.git

x86/perf/rapl: Add missing Broadwell model

With the array aligned as per events/intel/core.c it was fairly
obvious we missed one, add it in.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 1e7b1dfff1c7..99c4bab123cd 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -800,6 +800,7 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = {
 	X86_RAPL_MODEL_MATCH(61, hsw_rapl_init),	/* Broadwell */
 	X86_RAPL_MODEL_MATCH(71, hsw_rapl_init),	/* Broadwell-H */
 	X86_RAPL_MODEL_MATCH(79, hsx_rapl_init),	/* Broadwell-Server */
+	X86_RAPL_MODEL_MATCH(86, hsx_rapl_init),	/* Broadwell Xeon D */
 
 	X86_RAPL_MODEL_MATCH(87, knl_rapl_init),	/* Knights Landing */