From: Borislav Petkov (AMD) Date: Fri, 7 Jun 2024 11:16:53 +0000 (+0200) Subject: x86/alternative: Convert alternative_io() X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ad36085ee3563001cf1720eeb93c2e85715eb5cd;p=users%2Fjedix%2Flinux-maple.git x86/alternative: Convert alternative_io() Signed-off-by: Borislav Petkov (AMD) Acked-by: Peter Zijlstra (Intel) 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 428d6efeb3332..6a746811c602c 100644 --- 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) /*