[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <df08c856d0f2b7f2db503249d551d09408393cc3.1741988314.git.jpoimboe@kernel.org>
Date: Fri, 14 Mar 2025 14:41:32 -0700
From: Josh Poimboeuf <jpoimboe@...nel.org>
To: x86@...nel.org
Cc: linux-kernel@...r.kernel.org,
Linus Torvalds <torvalds@...ux-foundation.org>,
Peter Zijlstra <peterz@...radead.org>,
Borislav Petkov <bp@...en8.de>,
"H. Peter Anvin" <hpa@...or.com>,
Uros Bizjak <ubizjak@...il.com>,
Andrew Cooper <andrew.cooper3@...rix.com>,
Ingo Molnar <mingo@...nel.org>
Subject: [PATCH 19/20] x86/uaccess: Use alternative_io() in __untagged_addr()
Use the standard alternative_io() interface.
Signed-off-by: Josh Poimboeuf <jpoimboe@...nel.org>
---
arch/x86/include/asm/uaccess_64.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
index c52f0133425b..b507d5fb5443 100644
--- a/arch/x86/include/asm/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
@@ -26,10 +26,10 @@ extern unsigned long USER_PTR_MAX;
*/
static inline unsigned long __untagged_addr(unsigned long addr)
{
- asm (ALTERNATIVE("",
- "and " __percpu_arg([mask]) ", %[addr]", X86_FEATURE_LAM)
- : [addr] "+r" (addr)
- : [mask] "m" (__my_cpu_var(tlbstate_untag_mask)));
+ alternative_io("",
+ "and " __percpu_arg([mask]) ", %[addr]", X86_FEATURE_LAM,
+ ARG([addr] "+r" (addr)),
+ ARG([mask] "m" (__my_cpu_var(tlbstate_untag_mask))));
return addr;
}
--
2.48.1
Powered by blists - more mailing lists