[RFC PATCH v2 27/34] x86/msr: Rename native_write_msr() to native_wrmsrq()

Xin Li (Intel)
2025-04-22T08:23:58Z

Signed-off-by: Xin Li (Intel) <xin@zytor.com>
---
arch/x86/include/asm/msr.h | 4 ++--
arch/x86/kernel/kvmclock.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 2a62a899f7a5..72a1c3301d46 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -369,7 +369,7 @@ static __always_inline int rdmsrq_safe(u32 msr, u64 *val)
* native_wrmsrq_no_trace() native_write_msr_safe() |
* / \ |
* / \ |
- * native_wrmsr_no_trace() native_write_msr() |
+ * native_wrmsr_no_trace() native_wrmsrq() |
* |
* |
* |
@@ -472,7 +472,7 @@ static __always_inline void native_wrmsr_no_trace(u32 msr, u32 low, u32 high)
native_wrmsrq_no_trace(msr, (u64)high << 32 | low);
}

-static inline void notrace native_write_msr(u32 msr, u64 val)
+static inline void notrace native_wrmsrq(u32 msr, u64 val)
{
native_wrmsrq_no_trace(msr, val);

diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index ca0a49eeac4a..36417fed7f18 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -196,7 +196,7 @@ static void kvm_setup_secondary_clock(void)
void kvmclock_disable(void)
{
if (msr_kvm_system_time)
- native_write_msr(msr_kvm_system_time, 0);
+ native_wrmsrq(msr_kvm_system_time, 0);
}

static void __init kvmclock_init_mem(void)
--
2.49.0