From: Borislav Petkov <bp@kernel.org>
To: X86 ML <x86@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
"Borislav Petkov (AMD)" <bp@alien8.de>
Subject: [PATCH v1 05/14] x86/alternative: Convert alternative_input()
Date: Fri, 7 Jun 2024 13:16:52 +0200 [thread overview]
Message-ID: <20240607111701.8366-6-bp@kernel.org> (raw)
In-Reply-To: <20240607111701.8366-1-bp@kernel.org>
From: "Borislav Petkov (AMD)" <bp@alien8.de>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
---
arch/x86/include/asm/alternative.h | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index 21ead5dea15a..428d6efeb333 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -330,7 +330,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
* Leaving an unused argument 0 to keep API compatibility.
*/
#define alternative_input(oldinstr, newinstr, ft_flags, input...) \
- asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, ft_flags) \
+ asm_inline volatile(N_ALTERNATIVE(oldinstr, newinstr, ft_flags) \
: : "i" (0), ## input)
/* Like alternative_input, but with a single output argument */
@@ -356,10 +356,6 @@ static inline int alternatives_text_reserved(void *start, void *end)
asm_inline volatile (ALTERNATIVE("call %c[old]", "call %c[new]", ft_flags) \
: output : [old] "i" (oldfunc), [new] "i" (newfunc), ## input)
-#define n_alternative_input(oldinstr, newinstr, ft_flags, input...) \
- asm_inline volatile (N_ALTERNATIVE(oldinstr, newinstr, ft_flags) \
- : : "i" (0), ## input)
-
#define n_alternative_call(oldfunc, newfunc, ft_flags, output, input...) \
asm_inline volatile (N_ALTERNATIVE("call %c[old]", "call %c[new]", ft_flags) \
: output : [old] "i" (oldfunc), [new] "i" (newfunc), ## input)
--
2.43.0
next prev parent reply other threads:[~2024-06-07 11:17 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-07 11:16 [PATCH v1 00/14] x86/alternatives: Nest them Borislav Petkov
2024-06-07 11:16 ` [PATCH v1 01/14] x86/alternative: Zap alternative_ternary() Borislav Petkov
2024-06-11 16:53 ` [tip: x86/alternatives] " tip-bot2 for Borislav Petkov (AMD)
2024-06-07 11:16 ` [PATCH v1 02/14] x86/alternatives: Add nested alternatives macros Borislav Petkov
2024-06-07 11:16 ` [PATCH v1 03/14] x86/alternative: Convert alternative() Borislav Petkov
2024-06-11 16:53 ` [tip: x86/alternatives] " tip-bot2 for Borislav Petkov (AMD)
2024-06-07 11:16 ` [PATCH v1 04/14] x86/alternative: Convert alternative_2() Borislav Petkov
2024-06-11 16:53 ` [tip: x86/alternatives] " tip-bot2 for Borislav Petkov (AMD)
2024-06-07 11:16 ` Borislav Petkov [this message]
2024-06-11 16:53 ` [tip: x86/alternatives] x86/alternative: Convert alternative_input() tip-bot2 for Borislav Petkov (AMD)
2024-06-07 11:16 ` [PATCH v1 06/14] x86/alternative: Convert alternative_io() Borislav Petkov
2024-06-11 16:53 ` [tip: x86/alternatives] " tip-bot2 for Borislav Petkov (AMD)
2024-06-07 11:16 ` [PATCH v1 07/14] x86/alternative: Convert alternative_call() Borislav Petkov
2024-06-11 16:53 ` [tip: x86/alternatives] " tip-bot2 for Borislav Petkov (AMD)
2024-06-07 11:16 ` [PATCH v1 08/14] x86/alternative: Convert alternative_call_2() Borislav Petkov
2024-06-11 16:53 ` [tip: x86/alternatives] " tip-bot2 for Borislav Petkov (AMD)
2024-06-07 11:16 ` [PATCH v1 09/14] x86/alternative: Convert ALTERNATIVE_TERNARY() Borislav Petkov
2024-06-11 16:53 ` [tip: x86/alternatives] " tip-bot2 for Borislav Petkov (AMD)
2024-06-07 11:16 ` [PATCH v1 10/14] x86/alternative: Convert ALTERNATIVE_3() Borislav Petkov
2024-06-11 16:53 ` [tip: x86/alternatives] " tip-bot2 for Borislav Petkov (AMD)
2024-06-07 11:16 ` [PATCH v1 11/14] x86/alternative: Convert the asm ALTERNATIVE() macro Borislav Petkov
2024-06-11 16:53 ` [tip: x86/alternatives] " tip-bot2 for Borislav Petkov (AMD)
2024-06-07 11:16 ` [PATCH v1 12/14] x86/alternative: Convert the asm ALTERNATIVE_2() macro Borislav Petkov
2024-06-11 16:53 ` [tip: x86/alternatives] " tip-bot2 for Borislav Petkov (AMD)
2024-06-07 11:17 ` [PATCH v1 13/14] x86/alternative: Convert the asm ALTERNATIVE_3() macro Borislav Petkov
2024-06-11 16:53 ` [tip: x86/alternatives] " tip-bot2 for Borislav Petkov (AMD)
2024-06-07 11:17 ` [PATCH v1 14/14] x86/alternative: Replace the old macros Borislav Petkov
2024-06-11 13:25 ` Peter Zijlstra
2024-06-11 16:53 ` [tip: x86/alternatives] " tip-bot2 for Borislav Petkov (AMD)
2024-06-11 13:26 ` [PATCH v1 00/14] x86/alternatives: Nest them Peter Zijlstra
2024-06-11 14:05 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240607111701.8366-6-bp@kernel.org \
--to=bp@kernel.org \
--cc=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox