[<prev] [next>] [day] [month] [year] [list]
Message-ID: <174457058541.31282.13598330252936280450.tip-bot2@tip-bot2>
Date: Sun, 13 Apr 2025 18:56:25 -0000
From: "tip-bot2 for Ingo Molnar" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Ingo Molnar <mingo@...nel.org>,
"Peter Zijlstra (Intel)" <peterz@...radead.org>,
Juergen Gross <jgross@...e.com>, "H. Peter Anvin" <hpa@...or.com>,
Dave Hansen <dave.hansen@...el.com>, Xin Li <xin@...or.com>,
Linus Torvalds <torvalds@...ux-foundation.org>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject:
[tip: x86/msr] x86/msr: Use u64 in rdmsrl_safe() and paravirt_read_pmc()
The following commit has been merged into the x86/msr branch of tip:
Commit-ID: cd905826cbc833b7494573998bd1c407dfa7924f
Gitweb: https://git.kernel.org/tip/cd905826cbc833b7494573998bd1c407dfa7924f
Author: Ingo Molnar <mingo@...nel.org>
AuthorDate: Wed, 09 Apr 2025 22:28:51 +02:00
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Thu, 10 Apr 2025 11:58:07 +02:00
x86/msr: Use u64 in rdmsrl_safe() and paravirt_read_pmc()
The paravirt_read_pmc() result is in fact only loaded into an u64 variable.
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: Juergen Gross <jgross@...e.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Dave Hansen <dave.hansen@...el.com>
Cc: Xin Li <xin@...or.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
---
arch/x86/include/asm/paravirt.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index c4c2319..c270ca0 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -231,7 +231,7 @@ static inline void wrmsrl(unsigned msr, u64 val)
_err; \
})
-static inline int rdmsrl_safe(unsigned msr, unsigned long long *p)
+static inline int rdmsrl_safe(unsigned msr, u64 *p)
{
int err;
@@ -239,7 +239,7 @@ static inline int rdmsrl_safe(unsigned msr, unsigned long long *p)
return err;
}
-static inline unsigned long long paravirt_read_pmc(int counter)
+static inline u64 paravirt_read_pmc(int counter)
{
return PVOP_CALL1(u64, cpu.read_pmc, counter);
}
Powered by blists - more mailing lists