[tip: x86/alternatives] x86/alternatives: Simplify and clean up patch_cmp()

From: tip-bot2 for Ingo Molnar
Date: Fri Apr 11 2025 - 06:05:04 EST


The following commit has been merged into the x86/alternatives branch of tip:

Commit-ID: 3e6f47573ec3ed1d9dc50243fbcf50c87f740853
Gitweb: https://git.kernel.org/tip/3e6f47573ec3ed1d9dc50243fbcf50c87f740853
Author: Ingo Molnar <mingo@xxxxxxxxxx>
AuthorDate: Fri, 11 Apr 2025 07:40:55 +02:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Fri, 11 Apr 2025 11:01:35 +02:00

x86/alternatives: Simplify and clean up patch_cmp()

- No need to cast over to 'struct smp_text_poke_loc *', void * is just fine
for a binary search,

- Use the canonical (a, b) input parameter nomenclature of cmp_func_t
functions and rename the input parameters from (tp, elt) to
(tpl_a, tpl_b).

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-44-mingo@xxxxxxxxxx
---
arch/x86/kernel/alternative.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 14ca17d..f278655 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -2498,13 +2498,11 @@ static __always_inline void *text_poke_addr(const struct smp_text_poke_loc *tp)
return _stext + tp->rel_addr;
}

-static __always_inline int patch_cmp(const void *key, const void *elt)
+static __always_inline int patch_cmp(const void *tpl_a, const void *tpl_b)
{
- struct smp_text_poke_loc *tp = (struct smp_text_poke_loc *) elt;
-
- if (key < text_poke_addr(tp))
+ if (tpl_a < text_poke_addr(tpl_b))
return -1;
- if (key > text_poke_addr(tp))
+ if (tpl_a > text_poke_addr(tpl_b))
return 1;
return 0;
}