summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2026-06-29 08:04:57 +0200
committerIngo Molnar <mingo@kernel.org>2026-07-02 11:54:51 +0200
commitc69d7feb8d124e5f82d502ce0d93d8be6bd80dd1 (patch)
tree8693c6ea85090f090fc6b7532815b99694449f7b
parentdc59e4fea9d83f03bad6bddf3fa2e52491777482 (diff)
downloadlinux-c69d7feb8d124e5f82d502ce0d93d8be6bd80dd1.tar.gz
linux-c69d7feb8d124e5f82d502ce0d93d8be6bd80dd1.zip
x86/msr: Stop using 32-bit MSR interfaces in lib/msr-smp.c
The 32-bit MSR interfaces rdmsr(), wrmsr(), rdmsr_safe() and wrmsr_safe() are planned to be removed. Use the related 64-bit variants instead. Signed-off-by: Juergen Gross <jgross@suse.com> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: H. Peter Anvin <hpa@zytor.com> Link: https://patch.msgid.link/20260629060526.3638272-7-jgross@suse.com
-rw-r--r--arch/x86/lib/msr-smp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/lib/msr-smp.c b/arch/x86/lib/msr-smp.c
index 0c6627773c80..7b6cfc2c0970 100644
--- a/arch/x86/lib/msr-smp.c
+++ b/arch/x86/lib/msr-smp.c
@@ -15,7 +15,7 @@ static void __rdmsr_on_cpu(void *info)
else
reg = &rv->reg;
- rdmsr(rv->msr_no, reg->l, reg->h);
+ rdmsrq(rv->msr_no, reg->q);
}
static void __wrmsr_on_cpu(void *info)
@@ -28,7 +28,7 @@ static void __wrmsr_on_cpu(void *info)
else
reg = &rv->reg;
- wrmsr(rv->msr_no, reg->l, reg->h);
+ wrmsrq(rv->msr_no, reg->q);
}
int rdmsrq_on_cpu(unsigned int cpu, u32 msr_no, u64 *q)
@@ -121,7 +121,7 @@ static void __rdmsr_safe_on_cpu(void *info)
{
struct msr_info_completion *rv = info;
- rv->msr.err = rdmsr_safe(rv->msr.msr_no, &rv->msr.reg.l, &rv->msr.reg.h);
+ rv->msr.err = rdmsrq_safe(rv->msr.msr_no, &rv->msr.reg.q);
complete(&rv->done);
}
@@ -129,7 +129,7 @@ static void __wrmsr_safe_on_cpu(void *info)
{
struct msr_info *rv = info;
- rv->err = wrmsr_safe(rv->msr_no, rv->reg.l, rv->reg.h);
+ rv->err = wrmsrq_safe(rv->msr_no, rv->reg.q);
}
int wrmsrq_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 q)