summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBorislav Petkov (AMD) <bp@alien8.de>2024-06-07 14:16:53 +0300
committerBorislav Petkov (AMD) <bp@alien8.de>2024-06-11 19:12:29 +0300
commitad36085ee3563001cf1720eeb93c2e85715eb5cd (patch)
tree97d354f6f522941916ddf32c7096063b02dcbd5b
parentbb91576965e79d17e8e23fccdef91c4bf09d1a74 (diff)
downloadlinux-ad36085ee3563001cf1720eeb93c2e85715eb5cd.tar.xz
x86/alternative: Convert alternative_io()
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-7-bp@kernel.org
-rw-r--r--arch/x86/include/asm/alternative.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index 428d6efeb333..6a746811c602 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -335,11 +335,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
/* 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) \
- : output : "i" (0), ## input)
-
-#define n_alternative_io(oldinstr, newinstr, ft_flags, output, input...) \
- asm_inline volatile (N_ALTERNATIVE(oldinstr, newinstr, ft_flags) \
+ asm_inline volatile(N_ALTERNATIVE(oldinstr, newinstr, ft_flags) \
: output : "i" (0), ## input)
/*