[PATCH v3 03/13] x86/msr: Remove rdmsr_safe()
From: Juergen Gross <jgross@suse.com>
Date: 2026-09-11 07:46:03
Also in:
lkml
Subsystem:
paravirt_ops interface, the rest, x86 architecture (32-bit and 64-bit) · Maintainers:
Juergen Gross, Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
rdmsr_safe() has no users left. Delete it. Signed-off-by: Juergen Gross <jgross@suse.com> --- arch/x86/include/asm/msr.h | 10 ---------- arch/x86/include/asm/paravirt.h | 10 ---------- 2 files changed, 20 deletions(-)
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 6fb7125608c7..776a2daa2ba2 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h@@ -205,16 +205,6 @@ static inline int wrmsrq_safe(u32 msr, u64 val) return native_write_msr_safe(msr, val); } -/* rdmsr with exception handling */ -#define rdmsr_safe(msr, low, high) \ -({ \ - u64 __val; \ - int __err = native_read_msr_safe((msr), &__val); \ - (*low) = (u32)__val; \ - (*high) = (u32)(__val >> 32); \ - __err; \ -}) - static inline int rdmsrq_safe(u32 msr, u64 *p) { return native_read_msr_safe(msr, p);
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 0591aa38fd85..97b082095572 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h@@ -177,16 +177,6 @@ static inline int wrmsrq_safe(u32 msr, u64 val) return paravirt_write_msr_safe(msr, val); } -/* rdmsr with exception handling */ -#define rdmsr_safe(msr, a, b) \ -({ \ - u64 _l; \ - int _err = paravirt_read_msr_safe((msr), &_l); \ - (*a) = (u32)_l; \ - (*b) = (u32)(_l >> 32); \ - _err; \ -}) - static __always_inline int rdmsrq_safe(u32 msr, u64 *p) { return paravirt_read_msr_safe(msr, p);
--
2.55.0