x86/alternative: Convert alternative_call_2()

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-9-bp@kernel.org

diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index b6597574fa433259535ad64fc0450c429d51f573..bc260f27d7f1ec5c6d810133451a3dab97fabe39 100644 (file)
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -358,23 +358,14 @@ static inline int alternatives_text_reserved(void *start, void *end)
  * Otherwise, if CPU has feature1, function1 is used.
  * Otherwise, old function is used.
  */
-#define alternative_call_2(oldfunc, newfunc1, ft_flags1, newfunc2, ft_flags2, \
-                          output, input...)                            \
-       asm_inline volatile (ALTERNATIVE_2("call %c[old]", "call %c[new1]", ft_flags1, \
-               "call %c[new2]", ft_flags2)                             \
-               : output, ASM_CALL_CONSTRAINT                           \
-               : [old] "i" (oldfunc), [new1] "i" (newfunc1),           \
+#define alternative_call_2(oldfunc, newfunc1, ft_flags1, newfunc2, ft_flags2,          \
+                          output, input...)                                            \
+       asm_inline volatile(N_ALTERNATIVE_2("call %c[old]", "call %c[new1]", ft_flags1, \
+               "call %c[new2]", ft_flags2)                                             \
+               : output, ASM_CALL_CONSTRAINT                                           \
+               : [old] "i" (oldfunc), [new1] "i" (newfunc1),                           \
                  [new2] "i" (newfunc2), ## input)
 
-#define n_alternative_call_2(oldfunc, newfunc1, ft_flags1, newfunc2, ft_flags2,   \
-                          output, input...)                                  \
-       asm_inline volatile (N_ALTERNATIVE_2("call %c[old]", "call %c[new1]", ft_flags1,\
-               "call %c[new2]", ft_flags2)                                   \
-               : output, ASM_CALL_CONSTRAINT                                 \
-               : [old] "i" (oldfunc), [new1] "i" (newfunc1),                 \
-                 [new2] "i" (newfunc2), ## input)
-
-
 /*
  * use this macro(s) if you need more than one output parameter
  * in alternative_io