[tip: x86/msr] x86/msr: Rename 'wrmsrl_amd_safe()' to 'wrmsrq_amd_safe()'

From: tip-bot2 for Ingo Molnar
Date: Sun Apr 13 2025 - 14:56:40 EST


The following commit has been merged into the x86/msr branch of tip:

Commit-ID: 604d15d15ebd6148a084ea53d0fa493a74e51b11
Gitweb: https://git.kernel.org/tip/604d15d15ebd6148a084ea53d0fa493a74e51b11
Author: Ingo Molnar <mingo@xxxxxxxxxx>
AuthorDate: Wed, 09 Apr 2025 22:29:05 +02:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Thu, 10 Apr 2025 11:59:24 +02:00

x86/msr: Rename 'wrmsrl_amd_safe()' to 'wrmsrq_amd_safe()'

Suggested-by: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Cc: Juergen Gross <jgross@xxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxx>
Cc: Xin Li <xin@xxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
---
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 0aefa41..0bbe798 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -49,7 +49,7 @@ static inline int rdmsrq_amd_safe(unsigned msr, u64 *p)
return err;
}

-static inline int wrmsrl_amd_safe(unsigned msr, u64 val)
+static inline int wrmsrq_amd_safe(unsigned msr, u64 val)
{
u32 gprs[8] = { 0 };

@@ -638,7 +638,7 @@ static void init_amd_k8(struct cpuinfo_x86 *c)
clear_cpu_cap(c, X86_FEATURE_LAHF_LM);
if (!rdmsrq_amd_safe(0xc001100d, &value)) {
value &= ~BIT_64(32);
- wrmsrl_amd_safe(0xc001100d, value);
+ wrmsrq_amd_safe(0xc001100d, value);
}
}