[tip: x86/alternatives] x86/alternatives: Simplify text_poke_addr_ordered()
From: tip-bot2 for Ingo Molnar
Date: Fri Apr 11 2025 - 06:05:32 EST
The following commit has been merged into the x86/alternatives branch of tip:
Commit-ID: 0e67e587e2e07be8d6775a1444e679c6afbc87f4
Gitweb: https://git.kernel.org/tip/0e67e587e2e07be8d6775a1444e679c6afbc87f4
Author: Ingo Molnar <mingo@xxxxxxxxxx>
AuthorDate: Fri, 11 Apr 2025 07:40:53 +02:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Fri, 11 Apr 2025 11:01:34 +02:00
x86/alternatives: Simplify text_poke_addr_ordered()
- Use direct 'void *' pointer comparison, there's no
need to force the type to 'unsigned long'.
- Remove the 'tp' local variable indirection
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Juergen Gross <jgross@xxxxxxxx>
Cc: "H . Peter Anvin" <hpa@xxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20250411054105.2341982-42-mingo@xxxxxxxxxx
---
arch/x86/kernel/alternative.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index e4c51d8..a747b08 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -2838,8 +2838,6 @@ static void __smp_text_poke_batch_add(void *addr, const void *opcode, size_t len
*/
static bool text_poke_addr_ordered(void *addr)
{
- struct smp_text_poke_loc *tp;
-
WARN_ON_ONCE(!addr);
if (!text_poke_array.nr_entries)
@@ -2851,8 +2849,7 @@ static bool text_poke_addr_ordered(void *addr)
* is violated and we must first flush all pending patching
* requests:
*/
- tp = &text_poke_array.vec[text_poke_array.nr_entries-1];
- if ((unsigned long)text_poke_addr(tp) > (unsigned long)addr)
+ if (text_poke_addr(text_poke_array.vec + text_poke_array.nr_entries-1) > addr)
return false;
return true;