[<prev] [next>] [day] [month] [year] [list]
Message-ID: <174457057133.31282.16757526610954970512.tip-bot2@tip-bot2>
Date: Sun, 13 Apr 2025 18:56:11 -0000
From: "tip-bot2 for Ingo Molnar" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: "H. Peter Anvin" <hpa@...or.com>, Ingo Molnar <mingo@...nel.org>,
"Peter Zijlstra (Intel)" <peterz@...radead.org>,
Juergen Gross <jgross@...e.com>, Dave Hansen <dave.hansen@...el.com>,
Xin Li <xin@...or.com>, Linus Torvalds <torvalds@...ux-foundation.org>,
x86@...nel.org, linux-kernel@...r.kernel.org
Subject:
[tip: x86/msr] x86/msr: Rename 'rdmsrl_amd_safe()' to 'rdmsrq_amd_safe()'
The following commit has been merged into the x86/msr branch of tip:
Commit-ID: e2b8af0c693993e80415997f4842a372359b463e
Gitweb: https://git.kernel.org/tip/e2b8af0c693993e80415997f4842a372359b463e
Author: Ingo Molnar <mingo@...nel.org>
AuthorDate: Wed, 09 Apr 2025 22:29:04 +02:00
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Thu, 10 Apr 2025 11:59:19 +02:00
x86/msr: Rename 'rdmsrl_amd_safe()' to 'rdmsrq_amd_safe()'
Suggested-by: "H. Peter Anvin" <hpa@...or.com>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: Juergen Gross <jgross@...e.com>
Cc: Dave Hansen <dave.hansen@...el.com>
Cc: Xin Li <xin@...or.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
---
arch/x86/kernel/cpu/amd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 8937923..0aefa41 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -31,7 +31,7 @@
u16 invlpgb_count_max __ro_after_init;
-static inline int rdmsrl_amd_safe(unsigned msr, u64 *p)
+static inline int rdmsrq_amd_safe(unsigned msr, u64 *p)
{
u32 gprs[8] = { 0 };
int err;
@@ -636,7 +636,7 @@ static void init_amd_k8(struct cpuinfo_x86 *c)
*/
if (c->x86_model < 0x14 && cpu_has(c, X86_FEATURE_LAHF_LM) && !cpu_has(c, X86_FEATURE_HYPERVISOR)) {
clear_cpu_cap(c, X86_FEATURE_LAHF_LM);
- if (!rdmsrl_amd_safe(0xc001100d, &value)) {
+ if (!rdmsrq_amd_safe(0xc001100d, &value)) {
value &= ~BIT_64(32);
wrmsrl_amd_safe(0xc001100d, value);
}
Powered by blists - more mailing lists