[tip:x86/urgent] x86: Remove duplicate rtit status MSR macro

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Commit-ID:  c836eeda3e1e652d424bbbbb908f07eb7380448c
Gitweb:     http://git.kernel.org/tip/c836eeda3e1e652d424bbbbb908f07eb7380448c
Author:     Longpeng(Mike) <longpeng2@xxxxxxxxxx>
AuthorDate: Fri, 14 Oct 2016 08:42:20 +0800
Committer:  Thomas Gleixner <tglx@xxxxxxxxxxxxx>
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@xxxxxxxxxx>
Acked-by: Borislav Petkov <bp@xxxxxxx>
Cc: len.brown@xxxxxxxxx
Cc: peterz@xxxxxxxxxxxxx
Cc: rafael.j.wysocki@xxxxxxxxx
Cc: alexander.shishkin@xxxxxxxxxxxxxxx
Cc: ray.huang@xxxxxxx
Cc: Aravind.Gopalakrishnan@xxxxxxx
Cc: wu.wubin@xxxxxxxxxx
Cc: srinivas.pandruvada@xxxxxxxxxxxxxxx
Cc: zhaoshenglong@xxxxxxxxxx
Cc: vladimir_zapolskiy@xxxxxxxxxx
Link: http://lkml.kernel.org/r/1476405740-80816-1-git-send-email-longpeng2@xxxxxxxxxx
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

---
 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
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Stable Commits]     [Linux Stable Kernel]     [Linux Kernel]     [Linux USB Devel]     [Linux Video &Media]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux