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