From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754690AbcJNMUa (ORCPT ); Fri, 14 Oct 2016 08:20:30 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49132 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753234AbcJNMUW (ORCPT ); Fri, 14 Oct 2016 08:20:22 -0400 Date: Fri, 14 Oct 2016 05:19:58 -0700 From: "tip-bot for Longpeng(Mike)" Message-ID: Cc: longpeng2@huawei.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, bp@suse.de, mingo@kernel.org, hpa@zytor.com Reply-To: tglx@linutronix.de, bp@suse.de, hpa@zytor.com, mingo@kernel.org, longpeng2@huawei.com, linux-kernel@vger.kernel.org In-Reply-To: <1476405740-80816-1-git-send-email-longpeng2@huawei.com> References: <1476405740-80816-1-git-send-email-longpeng2@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86: Remove duplicate rtit status MSR macro Git-Commit-ID: c836eeda3e1e652d424bbbbb908f07eb7380448c 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: c836eeda3e1e652d424bbbbb908f07eb7380448c Gitweb: http://git.kernel.org/tip/c836eeda3e1e652d424bbbbb908f07eb7380448c Author: Longpeng(Mike) AuthorDate: Fri, 14 Oct 2016 08:42:20 +0800 Committer: Thomas Gleixner CommitDate: Fri, 14 Oct 2016 14:14:20 +0200 x86: Remove duplicate rtit status MSR macro The MSR_IA32_RTIT_STATUS is defined twice, so remove one. Signed-off-by: Longpeng(Mike) Acked-by: Borislav Petkov Cc: len.brown@intel.com Cc: peterz@infradead.org Cc: rafael.j.wysocki@intel.com Cc: alexander.shishkin@linux.intel.com Cc: ray.huang@amd.com Cc: Aravind.Gopalakrishnan@amd.com Cc: wu.wubin@huawei.com Cc: srinivas.pandruvada@linux.intel.com Cc: zhaoshenglong@huawei.com Cc: vladimir_zapolskiy@mentor.com Link: http://lkml.kernel.org/r/1476405740-80816-1-git-send-email-longpeng2@huawei.com Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/msr-index.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 56f4c66..78f3760 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -88,7 +88,6 @@ #define MSR_IA32_RTIT_CTL 0x00000570 #define MSR_IA32_RTIT_STATUS 0x00000571 -#define MSR_IA32_RTIT_STATUS 0x00000571 #define MSR_IA32_RTIT_ADDR0_A 0x00000580 #define MSR_IA32_RTIT_ADDR0_B 0x00000581 #define MSR_IA32_RTIT_ADDR1_A 0x00000582