The following commit has been merged into the x86/alternatives branch of tip: Commit-ID: ad36085ee3563001cf1720eeb93c2e85715eb5cd Gitweb: https://git.kernel.org/tip/ad36085ee3563001cf1720eeb93c2e85715eb5cd Author: Borislav Petkov (AMD) <bp@xxxxxxxxx> AuthorDate: Fri, 07 Jun 2024 13:16:53 +02:00 Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx> CommitterDate: Tue, 11 Jun 2024 18:12:29 +02:00 x86/alternative: Convert alternative_io() Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx> Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20240607111701.8366-7-bp@xxxxxxxxxx --- arch/x86/include/asm/alternative.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index 428d6ef..6a74681 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) /*
|