x86/perf/rapl: Add missing Broadwell model
authorPeter Zijlstra <peterz@infradead.org>
Thu, 21 Apr 2016 13:15:47 +0000 (15:15 +0200)
committerIngo Molnar <mingo@kernel.org>
Sat, 23 Apr 2016 12:14:27 +0000 (14:14 +0200)
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>
arch/x86/events/intel/rapl.c

index 1e7b1dfff1c7237ae2e2438e7ef1e80c9151c824..99c4bab123cdae71b14ab92241d81dbf15616fe1 100644 (file)
@@ -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 */