2024-05-06 12:29:10

by Borislav Petkov

Subject: [PATCH] x86/alternatives: Remove alternative_input_2()

From: "Borislav Petkov (AMD)" <[email protected]>

It is unused.

Signed-off-by: Borislav Petkov (AMD) <[email protected]>
---
arch/x86/include/asm/alternative.h | 14 --------------
1 file changed, 14 deletions(-)

diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index 76d66bf7bfeb..1237d6647f21 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -350,20 +350,6 @@ static inline int alternatives_text_reserved(void *start, void *end)
asm_inline volatile (N_ALTERNATIVE(oldinstr, newinstr, ft_flags) \
: : "i" (0), ## input)

-/*
- * This is similar to alternative_input. But it has two features and
- * respective instructions.
- *
- * If CPU has feature2, newinstr2 is used.
- * Otherwise, if CPU has feature1, newinstr1 is used.
- * Otherwise, oldinstr is used.
- */
-#define alternative_input_2(oldinstr, newinstr1, ft_flags1, newinstr2, \
- ft_flags2, input...) \
- asm_inline volatile(ALTERNATIVE_2(oldinstr, newinstr1, ft_flags1, \
- newinstr2, ft_flags2) \
- : : "i" (0), ## input)
-
/* Like alternative_input, but with a single output argument */
#define alternative_io(oldinstr, newinstr, ft_flags, output, input...) \
asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, ft_flags) \
--
2.43.0

2024-05-06 12:51:20

by tip-bot2 for Alexey Makhalov

Subject: [tip: x86/alternatives] x86/alternatives: Remove alternative_input_2()

The following commit has been merged into the x86/alternatives branch of tip:

Commit-ID: 8dc8b02d707ee4167fffaf3a97003bcdac282876
Gitweb: https://git.kernel.org/tip/8dc8b02d707ee4167fffaf3a97003bcdac282876
Author: Borislav Petkov (AMD) <[email protected]>
AuthorDate: Mon, 06 May 2024 14:28:48 +02:00
Committer: Borislav Petkov (AMD) <[email protected]>
CommitterDate: Mon, 06 May 2024 14:30:54 +02:00

x86/alternatives: Remove alternative_input_2()

It is unused.

Signed-off-by: Borislav Petkov (AMD) <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
arch/x86/include/asm/alternative.h | 14 --------------
1 file changed, 14 deletions(-)

diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index 67b68d0..c595358 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -286,20 +286,6 @@ static inline int alternatives_text_reserved(void *start, void *end)
asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, ft_flags) \
: : "i" (0), ## input)

-/*
- * This is similar to alternative_input. But it has two features and
- * respective instructions.
- *
- * If CPU has feature2, newinstr2 is used.
- * Otherwise, if CPU has feature1, newinstr1 is used.
- * Otherwise, oldinstr is used.
- */
-#define alternative_input_2(oldinstr, newinstr1, ft_flags1, newinstr2, \
- ft_flags2, input...) \
- asm_inline volatile(ALTERNATIVE_2(oldinstr, newinstr1, ft_flags1, \
- newinstr2, ft_flags2) \
- : : "i" (0), ## input)
-
/* Like alternative_input, but with a single output argument */
#define alternative_io(oldinstr, newinstr, ft_flags, output, input...) \
asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, ft_flags) \