[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-c836eeda3e1e652d424bbbbb908f07eb7380448c@git.kernel.org>
Date: Fri, 14 Oct 2016 05:19:58 -0700
From: "tip-bot for Longpeng(Mike)" <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: longpeng2@...wei.com, linux-kernel@...r.kernel.org,
tglx@...utronix.de, bp@...e.de, mingo@...nel.org, hpa@...or.com
Subject: [tip:x86/urgent] x86: Remove duplicate rtit status MSR macro
Commit-ID: c836eeda3e1e652d424bbbbb908f07eb7380448c
Gitweb: http://git.kernel.org/tip/c836eeda3e1e652d424bbbbb908f07eb7380448c
Author: Longpeng(Mike) <longpeng2@...wei.com>
AuthorDate: Fri, 14 Oct 2016 08:42:20 +0800
Committer: Thomas Gleixner <tglx@...utronix.de>
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) <longpeng2@...wei.com>
Acked-by: Borislav Petkov <bp@...e.de>
Cc: len.brown@...el.com
Cc: peterz@...radead.org
Cc: rafael.j.wysocki@...el.com
Cc: alexander.shishkin@...ux.intel.com
Cc: ray.huang@....com
Cc: Aravind.Gopalakrishnan@....com
Cc: wu.wubin@...wei.com
Cc: srinivas.pandruvada@...ux.intel.com
Cc: zhaoshenglong@...wei.com
Cc: vladimir_zapolskiy@...tor.com
Link: http://lkml.kernel.org/r/1476405740-80816-1-git-send-email-longpeng2@huawei.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
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
Powered by blists - more mailing lists