x86/alternative: Convert the asm ALTERNATIVE_3() macro

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240607111701.8366-14-bp@kernel.org

diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index 28e07a0389640b92ca32ae9de8bdfbc3112ce9d5..5278cfb1f7454e444e5d7c930c46998b5462716e 100644 (file)
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -466,31 +466,6 @@ void nop_func(void);
 .endm
 
 .macro ALTERNATIVE_3 oldinstr, newinstr1, ft_flags1, newinstr2, ft_flags2, newinstr3, ft_flags3
-140:
-       \oldinstr
-141:
-       .skip -((alt_max_3(new_len1, new_len2, new_len3) - (old_len)) > 0) * \
-               (alt_max_3(new_len1, new_len2, new_len3) - (old_len)),0x90
-142:
-
-       .pushsection .altinstructions,"a"
-       altinstr_entry 140b,143f,\ft_flags1,142b-140b,144f-143f
-       altinstr_entry 140b,144f,\ft_flags2,142b-140b,145f-144f
-       altinstr_entry 140b,145f,\ft_flags3,142b-140b,146f-145f
-       .popsection
-
-       .pushsection .altinstr_replacement,"ax"
-143:
-       \newinstr1
-144:
-       \newinstr2
-145:
-       \newinstr3
-146:
-       .popsection
-.endm
-
-.macro N_ALTERNATIVE_3 oldinstr, newinstr1, ft_flags1, newinstr2, ft_flags2, newinstr3, ft_flags3
        __N_ALTERNATIVE(N_ALTERNATIVE_2(\oldinstr, \newinstr1, \ft_flags1, \newinstr2, \ft_flags2),
                      \newinstr3, \ft_flags3)
 .endm