x86/alternative: Convert alternative_io()

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240607111701.8366-7-bp@kernel.org

diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index 428d6efeb3332fb1ccd8689a8fc502165fbdd602..6a746811c602c77fd494033ef460a07824600b4a 100644 (file)
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -335,11 +335,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
 
 /* Like alternative_input, but with a single output argument */
 #define alternative_io(oldinstr, newinstr, ft_flags, output, input...) \
-       asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, ft_flags)  \
-               : output : "i" (0), ## input)
-
-#define n_alternative_io(oldinstr, newinstr, ft_flags, output, input...)       \
-       asm_inline volatile (N_ALTERNATIVE(oldinstr, newinstr, ft_flags)        \
+       asm_inline volatile(N_ALTERNATIVE(oldinstr, newinstr, ft_flags) \
                : output : "i" (0), ## input)
 
 /*