[PATCH 17/20] x86/smap: Use named asm operands in smap_{save,restore}()

From: Josh Poimboeuf
Date: Fri Mar 14 2025 - 17:50:59 EST


Use named operands in preparation for using alternative_io().

Signed-off-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
---
arch/x86/include/asm/smap.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
index 2de1e5a75c57..60ea21b4c8b7 100644
--- a/arch/x86/include/asm/smap.h
+++ b/arch/x86/include/asm/smap.h
@@ -40,9 +40,9 @@ static __always_inline unsigned long smap_save(void)
unsigned long flags;

asm volatile ("# smap_save\n\t"
- ALTERNATIVE("", "pushf; pop %0; " "clac" "\n\t",
- X86_FEATURE_SMAP)
- : "=rm" (flags) : : "memory", "cc");
+ ALTERNATIVE("",
+ "pushf; pop %[flags]; clac\n\t", X86_FEATURE_SMAP)
+ : [flags] "=rm" (flags) : : "memory", "cc");

return flags;
}
@@ -50,9 +50,9 @@ static __always_inline unsigned long smap_save(void)
static __always_inline void smap_restore(unsigned long flags)
{
asm volatile ("# smap_restore\n\t"
- ALTERNATIVE("", "push %0; popf\n\t",
- X86_FEATURE_SMAP)
- : : "g" (flags) : "memory", "cc");
+ ALTERNATIVE("",
+ "push %[flags]; popf\n\t", X86_FEATURE_SMAP)
+ : : [flags] "g" (flags) : "memory", "cc");
}

/* These macros can be used in asm() statements */
--
2.48.1