From: Borislav Petkov (AMD) Date: Fri, 7 Jun 2024 11:16:54 +0000 (+0200) Subject: x86/alternative: Convert alternative_call() X-Git-Tag: io_uring-6.11-20240722~110^2~8 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a880f9ef6bf7edc36753a9e40388d42ae8d7e099;p=linux-block.git x86/alternative: Convert alternative_call() Signed-off-by: Borislav Petkov (AMD) Acked-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20240607111701.8366-8-bp@kernel.org --- diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index 6a746811c602..b6597574fa43 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) /*