Merge tag 'pm-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[linux-2.6-block.git] / drivers / powercap / intel_rapl.c

diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index f2201d42a9cdd8a5acde7000127aa29e2cc83f59..b2766b867b0eb692dd30d7a1987567b5688077c9 100644 (file)
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1115,6 +1115,8 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
        RAPL_CPU(0X5C, rapl_defaults_core),/* Broxton */
        RAPL_CPU(0x5E, rapl_defaults_core),/* Skylake-H/S */
        RAPL_CPU(0x57, rapl_defaults_hsw_server),/* Knights Landing */
+       RAPL_CPU(0x8E, rapl_defaults_core),/* Kabylake */
+       RAPL_CPU(0x9E, rapl_defaults_core),/* Kabylake */
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, rapl_ids);