| Date | Fri, 11 Apr 2025 10:01:59 -0000 | | From | "tip-bot2 for Ingo Molnar" <> | | Subject | [tip: x86/alternatives] x86/alternatives: Rename 'try_get_desc()' to 'try_get_text_poke_array()' |
| |
The following commit has been merged into the x86/alternatives branch of tip:
Commit-ID: 46f3d9d329dec169c54a3b5b48deb1ba258689fc Gitweb: https://git.kernel.org/tip/46f3d9d329dec169c54a3b5b48deb1ba258689fc Author: Ingo Molnar <mingo@kernel.org> AuthorDate: Fri, 11 Apr 2025 07:40:41 +02:00 Committer: Ingo Molnar <mingo@kernel.org> CommitterDate: Fri, 11 Apr 2025 11:01:34 +02:00
x86/alternatives: Rename 'try_get_desc()' to 'try_get_text_poke_array()'
This better reflects what the underlying code is doing, there's no 'descriptor' indirection anymore.
Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Juergen Gross <jgross@suse.com> Cc: "H . Peter Anvin" <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: https://lore.kernel.org/r/20250411054105.2341982-30-mingo@kernel.org --- arch/x86/kernel/alternative.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 9937345..02f123c 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -2476,7 +2476,7 @@ static struct smp_text_poke_array { static DEFINE_PER_CPU(atomic_t, text_poke_array_refs); static __always_inline -struct smp_text_poke_array *try_get_desc(void) +struct smp_text_poke_array *try_get_text_poke_array(void) { atomic_t *refs = this_cpu_ptr(&text_poke_array_refs); @@ -2530,7 +2530,7 @@ noinstr int smp_text_poke_int3_handler(struct pt_regs *regs) */ smp_rmb(); - desc = try_get_desc(); + desc = try_get_text_poke_array(); if (!desc) return 0; @@ -2627,7 +2627,7 @@ static void smp_text_poke_batch_process(struct smp_text_poke_loc *tp, unsigned i WARN_ON_ONCE(nr_entries != text_poke_array.nr_entries); /* - * Corresponds to the implicit memory barrier in try_get_desc() to + * Corresponds to the implicit memory barrier in try_get_text_poke_array() to * ensure reading a non-zero refcount provides up to date text_poke_array data. */ for_each_possible_cpu(i)
|