[RFC PATCH v2 31/34] x86/msr: Rename native_read_msr() to native_rdmsrq()

Xin Li (Intel)
2025-04-22T08:24:03Z

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

diff --git a/arch/x86/hyperv/ivm.c b/arch/x86/hyperv/ivm.c
index dfddf522e838..8860c6c0f013 100644
--- a/arch/x86/hyperv/ivm.c
+++ b/arch/x86/hyperv/ivm.c
@@ -319,7 +319,7 @@ int hv_snp_boot_ap(u32 cpu, unsigned long start_ip)
asm volatile("movl %%ds, %%eax;" : "=a" (vmsa->ds.selector));
hv_populate_vmcb_seg(vmsa->ds, vmsa->gdtr.base);

- vmsa->efer = native_read_msr(MSR_EFER);
+ vmsa->efer = native_rdmsrq(MSR_EFER);

vmsa->cr4 = native_read_cr4();
vmsa->cr3 = __native_read_cr3();
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index dfaac42b6258..4c7aa9e7fbac 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -160,7 +160,7 @@ static __always_inline bool is_msr_imm_insn(void *ip)
* native_rdmsrq_no_trace() native_read_msr_safe() |
* / \ |
* / \ |
- * native_rdmsr_no_trace() native_read_msr() |
+ * native_rdmsr_no_trace() native_rdmsrq() |
* |
* |
* |
@@ -263,7 +263,7 @@ do { \
(void)((high) = (u32)(__val >> 32)); \
} while (0)

-static inline u64 native_read_msr(u32 msr)
+static inline u64 native_rdmsrq(u32 msr)
{
u64 val = native_rdmsrq_no_trace(msr);

--
2.49.0