Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932073AbcC2JQE (ORCPT ); Tue, 29 Mar 2016 05:16:04 -0400 Received: from terminus.zytor.com ([198.137.202.10]:45264 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751393AbcC2JQA (ORCPT ); Tue, 29 Mar 2016 05:16:00 -0400 Date: Tue, 29 Mar 2016 02:15:35 -0700 From: tip-bot for Vladimir Zapolskiy Message-ID: Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, len.brown@intel.com, srinivas.pandruvada@linux.intel.com, rafael.j.wysocki@intel.com, mingo@kernel.org, hpa@zytor.com, vladimir_zapolskiy@mentor.com Reply-To: len.brown@intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, rafael.j.wysocki@intel.com, srinivas.pandruvada@linux.intel.com, vladimir_zapolskiy@mentor.com, hpa@zytor.com In-Reply-To: <1459018020-24577-1-git-send-email-vladimir_zapolskiy@mentor.com> References: <1459018020-24577-1-git-send-email-vladimir_zapolskiy@mentor.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/cpufreq: Remove duplicated TDP MSR macro definitions Git-Commit-ID: 4a6772f514891eaacf26bcb7c2c808c557d23c6f 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 Content-Length: 2050 Lines: 53 Commit-ID: 4a6772f514891eaacf26bcb7c2c808c557d23c6f Gitweb: http://git.kernel.org/tip/4a6772f514891eaacf26bcb7c2c808c557d23c6f Author: Vladimir Zapolskiy AuthorDate: Sat, 26 Mar 2016 20:47:00 +0200 Committer: Thomas Gleixner CommitDate: Tue, 29 Mar 2016 11:12:10 +0200 x86/cpufreq: Remove duplicated TDP MSR macro definitions The list of CPU model specific registers contains two copies of TDP registers, remove the one, which is out of numerical order in the list. Fixes: 6a35fc2d6c22 ("cpufreq: intel_pstate: get P1 from TAR when available") Signed-off-by: Vladimir Zapolskiy Cc: Len Brown Cc: "Rafael J. Wysocki" Cc: Kristen Carlson Accardi Cc: Srinivas Pandruvada Link: http://lkml.kernel.org/r/1459018020-24577-1-git-send-email-vladimir_zapolskiy@mentor.com Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/msr-index.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 2da46ac..426e946 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -190,6 +190,7 @@ #define MSR_PP1_ENERGY_STATUS 0x00000641 #define MSR_PP1_POLICY 0x00000642 +/* Config TDP MSRs */ #define MSR_CONFIG_TDP_NOMINAL 0x00000648 #define MSR_CONFIG_TDP_LEVEL_1 0x00000649 #define MSR_CONFIG_TDP_LEVEL_2 0x0000064A @@ -210,13 +211,6 @@ #define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 #define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 -/* Config TDP MSRs */ -#define MSR_CONFIG_TDP_NOMINAL 0x00000648 -#define MSR_CONFIG_TDP_LEVEL1 0x00000649 -#define MSR_CONFIG_TDP_LEVEL2 0x0000064A -#define MSR_CONFIG_TDP_CONTROL 0x0000064B -#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C - /* Hardware P state interface */ #define MSR_PPERF 0x0000064e #define MSR_PERF_LIMIT_REASONS 0x0000064f