[PATCH 39/49] x86/alternatives: Simplify text_poke_addr_ordered()

From: Ingo Molnar
Date: Fri Mar 28 2025 - 09:41:31 EST


- 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>
---
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 b0bd8cd524c5..27f1c7bdd384 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;
--
2.45.2