Skip to content

Commit bb91576

Browse files
committed
x86/alternative: Convert alternative_input()
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-6-bp@kernel.org
1 parent 8cb1f14 commit bb91576

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

arch/x86/include/asm/alternative.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
330330
* Leaving an unused argument 0 to keep API compatibility.
331331
*/
332332
#define alternative_input(oldinstr, newinstr, ft_flags, input...) \
333-
asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, ft_flags) \
333+
asm_inline volatile(N_ALTERNATIVE(oldinstr, newinstr, ft_flags) \
334334
: : "i" (0), ## input)
335335

336336
/* Like alternative_input, but with a single output argument */
@@ -356,10 +356,6 @@ static inline int alternatives_text_reserved(void *start, void *end)
356356
asm_inline volatile (ALTERNATIVE("call %c[old]", "call %c[new]", ft_flags) \
357357
: output : [old] "i" (oldfunc), [new] "i" (newfunc), ## input)
358358

359-
#define n_alternative_input(oldinstr, newinstr, ft_flags, input...) \
360-
asm_inline volatile (N_ALTERNATIVE(oldinstr, newinstr, ft_flags) \
361-
: : "i" (0), ## input)
362-
363359
#define n_alternative_call(oldfunc, newfunc, ft_flags, output, input...) \
364360
asm_inline volatile (N_ALTERNATIVE("call %c[old]", "call %c[new]", ft_flags) \
365361
: output : [old] "i" (oldfunc), [new] "i" (newfunc), ## input)

0 commit comments

Comments
 (0)