Merge tag 'platform-drivers-x86-v4.8-1' of git://git.infradead.org/users/dvhart/linux...

[linux-2.6-block.git] / drivers / platform / x86 / intel_pmc_core.c

diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index d8379cd865168dbf1d7202e1356b53d60b646680..520b58a04daa8d898a2e7eb4277a55b7d752a5ce 100644 (file)
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -25,6 +25,7 @@
 #include <linux/pci.h>
 
 #include <asm/cpu_device_id.h>
+#include <asm/intel-family.h>
 #include <asm/pmc_core.h>
 
 #include "intel_pmc_core.h"
@@ -115,10 +116,10 @@ static int pmc_core_dbgfs_register(struct pmc_dev *pmcdev)
 }
 
 static const struct x86_cpu_id intel_pmc_core_ids[] = {
-       { X86_VENDOR_INTEL, 6, 0x4e, X86_FEATURE_MWAIT,
-               (kernel_ulong_t)NULL}, /* Skylake CPUID Signature */
-       { X86_VENDOR_INTEL, 6, 0x5e, X86_FEATURE_MWAIT,
-               (kernel_ulong_t)NULL}, /* Skylake CPUID Signature */
+       { X86_VENDOR_INTEL, 6, INTEL_FAM6_SKYLAKE_MOBILE, X86_FEATURE_MWAIT,
+               (kernel_ulong_t)NULL},
+       { X86_VENDOR_INTEL, 6, INTEL_FAM6_SKYLAKE_DESKTOP, X86_FEATURE_MWAIT,
+               (kernel_ulong_t)NULL},
        {}
 };