From e84c31b9c9ac75ceaa2597bce021c529e76edd26 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 11 Apr 2025 07:40:22 +0200 Subject: [PATCH] x86/alternatives: Rename 'bp_desc' to 'int3_desc' Signed-off-by: Ingo Molnar Cc: Juergen Gross Cc: "H . Peter Anvin" Cc: Linus Torvalds Cc: Peter Zijlstra Link: https://lore.kernel.org/r/20250411054105.2341982-11-mingo@kernel.org --- arch/x86/kernel/alternative.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 62d74442cbd1f..c6d0ca3d683b0 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -2478,7 +2478,7 @@ struct text_poke_int3_vec { static DEFINE_PER_CPU(atomic_t, text_poke_array_refs); -static struct text_poke_int3_vec bp_desc; +static struct text_poke_int3_vec int3_desc; static __always_inline struct text_poke_int3_vec *try_get_desc(void) @@ -2488,7 +2488,7 @@ struct text_poke_int3_vec *try_get_desc(void) if (!raw_atomic_inc_not_zero(refs)) return NULL; - return &bp_desc; + return &int3_desc; } static __always_inline void put_desc(void) @@ -2527,7 +2527,7 @@ noinstr int smp_text_poke_int3_handler(struct pt_regs *regs) /* * Having observed our INT3 instruction, we now must observe - * bp_desc with non-zero refcount: + * int3_desc with non-zero refcount: * * text_poke_array_refs = 1 INT3 * WMB RMB @@ -2630,12 +2630,12 @@ static void smp_text_poke_batch_process(struct text_poke_loc *tp, unsigned int n lockdep_assert_held(&text_mutex); - bp_desc.vec = tp; - bp_desc.nr_entries = nr_entries; + int3_desc.vec = tp; + int3_desc.nr_entries = nr_entries; /* * Corresponds to the implicit memory barrier in try_get_desc() to - * ensure reading a non-zero refcount provides up to date bp_desc data. + * ensure reading a non-zero refcount provides up to date int3_desc data. */ for_each_possible_cpu(i) atomic_set_release(per_cpu_ptr(&text_poke_array_refs, i), 1); -- 2.50.1