From: Borislav Petkov (AMD) Date: Fri, 7 Jun 2024 11:16:51 +0000 (+0200) Subject: x86/alternative: Convert alternative_2() X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8cb1f14b707d3d9b7d2b330c0acd62537576c6a7;p=users%2Fjedix%2Flinux-maple.git x86/alternative: Convert alternative_2() Signed-off-by: Borislav Petkov (AMD) Acked-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20240607111701.8366-5-bp@kernel.org --- diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index c05bff2e3626e..21ead5dea15af 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h @@ -319,9 +319,6 @@ static inline int alternatives_text_reserved(void *start, void *end) asm_inline volatile(N_ALTERNATIVE(oldinstr, newinstr, ft_flags) : : : "memory") #define alternative_2(oldinstr, newinstr1, ft_flags1, newinstr2, ft_flags2) \ - asm_inline volatile(ALTERNATIVE_2(oldinstr, newinstr1, ft_flags1, newinstr2, ft_flags2) ::: "memory") - -#define n_alternative_2(oldinstr, newinstr1, ft_flags1, newinstr2, ft_flags2) \ asm_inline volatile(N_ALTERNATIVE_2(oldinstr, newinstr1, ft_flags1, newinstr2, ft_flags2) ::: "memory") /*