Messages in this thread Patch in this message |  | | Date | Fri, 14 Oct 2016 05:19:58 -0700 | From | "tip-bot for Longpeng(Mike)" <> | 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@huawei.com> AuthorDate: Fri, 14 Oct 2016 08:42:20 +0800 Committer: Thomas Gleixner <tglx@linutronix.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@huawei.com> Acked-by: Borislav Petkov <bp@suse.de> 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 <tglx@linutronix.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
|  |