linux-kernel - [tip:perf/core] x86/pmc_core: Use Intel family name macros for pmc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-70e0d117f2502f19517be03a64b3c513f31b3cdb@git.kernel.org>
Date:	Wed, 8 Jun 2016 07:12:55 -0700
From:	tip-bot for Dave Hansen <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	hpa@...or.com, dave.hansen@...ux.intel.com, tglx@...utronix.de,
	mingo@...nel.org, dvlasenk@...hat.com,
	torvalds@...ux-foundation.org, rajneesh.bhardwaj@...el.com,
	brgerst@...il.com, dvhart@...radead.org, peterz@...radead.org,
	dave@...1.net, vishwanath.somayaji@...el.com, luto@...capital.net,
	linux-kernel@...r.kernel.org, bp@...en8.de
Subject: [tip:perf/core] x86/pmc_core: Use Intel family name macros for
 pmc_core driver

Commit-ID:  70e0d117f2502f19517be03a64b3c513f31b3cdb
Gitweb:     http://git.kernel.org/tip/70e0d117f2502f19517be03a64b3c513f31b3cdb
Author:     Dave Hansen <dave.hansen@...ux.intel.com>
AuthorDate: Thu, 2 Jun 2016 17:19:49 -0700
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Wed, 8 Jun 2016 13:02:52 +0200

x86/pmc_core: Use Intel family name macros for pmc_core driver

Another straightforward replacement of magic numbers.

Signed-off-by: Dave Hansen <dave.hansen@...ux.intel.com>
Acked-by: Darren Hart <dvhart@...radead.org>
Cc: Andy Lutomirski <luto@...capital.net>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Dave Hansen <dave@...1.net>
Cc: Denys Vlasenko <dvlasenk@...hat.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Rajneesh Bhardwaj <rajneesh.bhardwaj@...el.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Vishwanath Somayaji <vishwanath.somayaji@...el.com>
Cc: jacob.jun.pan@...el.com
Cc: platform-driver-x86@...r.kernel.org
Link: http://lkml.kernel.org/r/20160603001949.7D5B9534@viggo.jf.intel.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 drivers/platform/x86/intel_pmc_core.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index 2776bec..e57f923 100644
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -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_unregister(struct pmc_dev *pmcdev)
 #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_SKYLAKE_MOBILE, X86_FEATURE_MWAIT,
+		(kernel_ulong_t)NULL},
+	{ X86_VENDOR_INTEL, 6, INTEL_FAM6_SKYLAKE_DESKTOP, X86_FEATURE_MWAIT,
+		(kernel_ulong_t)NULL},
 	{}
 };