From: "tip-bot for Longpeng(Mike)" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: longpeng2@huawei.com, linux-kernel@vger.kernel.org,
tglx@linutronix.de, bp@suse.de, mingo@kernel.org, hpa@zytor.com
Subject: [tip:x86/urgent] x86: Remove duplicate rtit status MSR macro
Date: Fri, 14 Oct 2016 05:19:58 -0700 [thread overview]
Message-ID: <tip-c836eeda3e1e652d424bbbbb908f07eb7380448c@git.kernel.org> (raw)
In-Reply-To: <1476405740-80816-1-git-send-email-longpeng2@huawei.com>
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
prev parent reply other threads:[~2016-10-14 12:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-14 0:42 [PATCH] x86: remove " Longpeng(Mike)
2016-10-14 9:50 ` Borislav Petkov
2016-10-14 12:19 ` tip-bot for Longpeng(Mike) [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-c836eeda3e1e652d424bbbbb908f07eb7380448c@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=longpeng2@huawei.com \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome