The following commit has been merged into the x86/alternatives branch of tip: Commit-ID: a880f9ef6bf7edc36753a9e40388d42ae8d7e099 Gitweb: https://git.kernel.org/tip/a880f9ef6bf7edc36753a9e40388d42ae8d7e099 Author: Borislav Petkov (AMD) <bp@xxxxxxxxx> AuthorDate: Fri, 07 Jun 2024 13:16:54 +02:00 Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx> CommitterDate: Tue, 11 Jun 2024 18:15:03 +02:00 x86/alternative: Convert alternative_call() Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx> Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20240607111701.8366-8-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 6a74681..b659757 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h @@ -349,11 +349,7 @@ static inline int alternatives_text_reserved(void *start, void *end) * suffix. */ #define alternative_call(oldfunc, newfunc, ft_flags, output, input...) \ - asm_inline volatile (ALTERNATIVE("call %c[old]", "call %c[new]", ft_flags) \ - : output : [old] "i" (oldfunc), [new] "i" (newfunc), ## input) - -#define n_alternative_call(oldfunc, newfunc, ft_flags, output, input...) \ - asm_inline volatile (N_ALTERNATIVE("call %c[old]", "call %c[new]", ft_flags) \ + asm_inline volatile(N_ALTERNATIVE("call %c[old]", "call %c[new]", ft_flags) \ : output : [old] "i" (oldfunc), [new] "i" (newfunc), ## input) /*