[PATCH 6/8] x86/msr: Consolidate rdpmc() implementations

[Dave Hansen]

From: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>

Doing this is debatable. It does not actually remove any code. But,
rdpmc() is the last thing left in the #ifdef CONFIG_PARAVIRT_XXL
block and this seems like nice consistency.

Signed-off-by: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
---

 b/arch/x86/include/asm/msr.h      |   12 +++++++-----
 b/arch/x86/include/asm/paravirt.h |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff -puN arch/x86/include/asm/msr.h~rdmsr-dups-9 arch/x86/include/asm/msr.h
--- a/arch/x86/include/asm/msr.h~rdmsr-dups-9	2026-03-20 11:24:21.013880656 -0700
+++ b/arch/x86/include/asm/msr.h	2026-03-20 11:24:21.020880966 -0700
@@ -176,6 +176,7 @@ static inline u64 native_read_pmc(int co
 #define raw_read_msr_safe	paravirt_read_msr_safe
 #define raw_write_msr		paravirt_write_msr
 #define raw_write_msr_safe	paravirt_write_msr_safe
+#define raw_read_pmc		paravirt_read_pmc
 
 #else
 #include <linux/errno.h>
@@ -184,6 +185,7 @@ static inline u64 native_read_pmc(int co
 #define raw_read_msr_safe	native_read_msr_safe
 #define raw_write_msr		native_write_msr
 #define raw_write_msr_safe	native_write_msr_safe
+#define raw_read_pmc		native_read_pmc
 
 /*
  * Access to machine-specific registers (available on 586 and better only)
@@ -191,11 +193,6 @@ static inline u64 native_read_pmc(int co
  * pointer indirection), this allows gcc to optimize better
  */
 
-static __always_inline u64 rdpmc(int counter)
-{
-	return native_read_pmc(counter);
-}
-
 #endif	/* !CONFIG_PARAVIRT_XXL */
 
 /*
@@ -242,6 +239,11 @@ static inline void wrmsrq(u32 msr, u64 v
 	raw_write_msr(msr, val);
 }
 
+static __always_inline u64 rdpmc(int counter)
+{
+	return raw_read_pmc(counter);
+}
+
 /* Instruction opcode for WRMSRNS supported in binutils >= 2.40 */
 #define ASM_WRMSRNS _ASM_BYTES(0x0f,0x01,0xc6)
 
diff -puN arch/x86/include/asm/paravirt.h~rdmsr-dups-9 arch/x86/include/asm/paravirt.h
--- a/arch/x86/include/asm/paravirt.h~rdmsr-dups-9	2026-03-20 11:24:21.017880833 -0700
+++ b/arch/x86/include/asm/paravirt.h	2026-03-20 11:24:21.020880966 -0700
@@ -161,7 +161,7 @@ static inline int paravirt_write_msr_saf
 	return PVOP_CALL2(int, pv_ops, cpu.write_msr_safe, msr, val);
 }
 
-static __always_inline u64 rdpmc(int counter)
+static __always_inline u64 paravirt_read_pmc(int counter)
 {
 	return PVOP_CALL1(u64, pv_ops, cpu.read_pmc, counter);
 }
_