From: Dave Hansen <[email protected]> Another straightforward replacement of magic numbers.
Signed-off-by: Dave Hansen <[email protected]> Cc: Rajneesh Bhardwaj <[email protected]> Cc: Vishwanath Somayaji <[email protected]> Cc: Darren Hart <[email protected]> Cc: [email protected] --- b/drivers/platform/x86/intel_pmc_core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff -puN drivers/platform/x86/intel_pmc_core.c~x86-intel-families-pmc_core drivers/platform/x86/intel_pmc_core.c --- a/drivers/platform/x86/intel_pmc_core.c~x86-intel-families-pmc_core 2016-06-01 15:45:09.410182530 -0700 +++ b/drivers/platform/x86/intel_pmc_core.c 2016-06-01 15:45:09.413182667 -0700 @@ -26,6 +26,7 @@ #include <linux/seq_file.h> #include <asm/cpu_device_id.h> +#include <asm/intel-family.h> #include <asm/pmc_core.h> #include "intel_pmc_core.h" @@ -138,10 +139,10 @@ static inline void pmc_core_dbgfs_unregi #endif /* CONFIG_DEBUG_FS */ 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_MODEL_SKYLAKE_MOBILE, X86_FEATURE_MWAIT, + (kernel_ulong_t)NULL}, + { X86_VENDOR_INTEL, 6, INTEL_FAM6_MODEL_SKYLAKE_DESKTOP, X86_FEATURE_MWAIT, + (kernel_ulong_t)NULL}, {} }; _
