From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162117AbcFHOOM (ORCPT ); Wed, 8 Jun 2016 10:14:12 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33462 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162099AbcFHOOK (ORCPT ); Wed, 8 Jun 2016 10:14:10 -0400 Date: Wed, 8 Jun 2016 07:12:55 -0700 From: tip-bot for Dave Hansen Message-ID: Cc: hpa@zytor.com, dave.hansen@linux.intel.com, tglx@linutronix.de, mingo@kernel.org, dvlasenk@redhat.com, torvalds@linux-foundation.org, rajneesh.bhardwaj@intel.com, brgerst@gmail.com, dvhart@infradead.org, peterz@infradead.org, dave@sr71.net, vishwanath.somayaji@intel.com, luto@amacapital.net, linux-kernel@vger.kernel.org, bp@alien8.de Reply-To: vishwanath.somayaji@intel.com, luto@amacapital.net, bp@alien8.de, linux-kernel@vger.kernel.org, peterz@infradead.org, dave@sr71.net, torvalds@linux-foundation.org, rajneesh.bhardwaj@intel.com, dvhart@infradead.org, brgerst@gmail.com, dvlasenk@redhat.com, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, dave.hansen@linux.intel.com In-Reply-To: <20160603001949.7D5B9534@viggo.jf.intel.com> References: <20160603001949.7D5B9534@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] x86/pmc_core: Use Intel family name macros for pmc_core driver Git-Commit-ID: 70e0d117f2502f19517be03a64b3c513f31b3cdb X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 70e0d117f2502f19517be03a64b3c513f31b3cdb Gitweb: http://git.kernel.org/tip/70e0d117f2502f19517be03a64b3c513f31b3cdb Author: Dave Hansen AuthorDate: Thu, 2 Jun 2016 17:19:49 -0700 Committer: Ingo Molnar 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 Acked-by: Darren Hart Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Rajneesh Bhardwaj Cc: Thomas Gleixner Cc: Vishwanath Somayaji Cc: jacob.jun.pan@intel.com Cc: platform-driver-x86@vger.kernel.org Link: http://lkml.kernel.org/r/20160603001949.7D5B9534@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- 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 #include +#include #include #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}, {} };