[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <174436572743.31282.14483128670941314417.tip-bot2@tip-bot2>
Date: Fri, 11 Apr 2025 10:02:07 -0000
From: "tip-bot2 for Ingo Molnar" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Ingo Molnar <mingo@...nel.org>, Juergen Gross <jgross@...e.com>,
"H . Peter Anvin" <hpa@...or.com>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Peter Zijlstra <peterz@...radead.org>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject:
[tip: x86/alternatives] x86/alternatives: Rename 'int3_desc' to 'int3_vec'
The following commit has been merged into the x86/alternatives branch of tip:
Commit-ID: 3bd7546ff24ecf9dbd74adf92b843eebd2862d1c
Gitweb: https://git.kernel.org/tip/3bd7546ff24ecf9dbd74adf92b843eebd2862d1c
Author: Ingo Molnar <mingo@...nel.org>
AuthorDate: Fri, 11 Apr 2025 07:40:32 +02:00
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Fri, 11 Apr 2025 11:01:33 +02:00
x86/alternatives: Rename 'int3_desc' to 'int3_vec'
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Cc: Juergen Gross <jgross@...e.com>
Cc: "H . Peter Anvin" <hpa@...or.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Link: https://lore.kernel.org/r/20250411054105.2341982-21-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 9abb8f0..b97abfb 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -2473,7 +2473,7 @@ struct text_poke_int3_vec {
static DEFINE_PER_CPU(atomic_t, text_poke_array_refs);
-static struct text_poke_int3_vec int3_desc;
+static struct text_poke_int3_vec int3_vec;
static __always_inline
struct text_poke_int3_vec *try_get_desc(void)
@@ -2483,7 +2483,7 @@ struct text_poke_int3_vec *try_get_desc(void)
if (!raw_atomic_inc_not_zero(refs))
return NULL;
- return &int3_desc;
+ return &int3_vec;
}
static __always_inline void put_desc(void)
@@ -2522,7 +2522,7 @@ noinstr int smp_text_poke_int3_handler(struct pt_regs *regs)
/*
* Having observed our INT3 instruction, we now must observe
- * int3_desc with non-zero refcount:
+ * int3_vec with non-zero refcount:
*
* text_poke_array_refs = 1 INT3
* WMB RMB
@@ -2625,12 +2625,12 @@ static void smp_text_poke_batch_process(struct smp_text_poke_loc *tp, unsigned i
lockdep_assert_held(&text_mutex);
- int3_desc.vec = tp;
- int3_desc.nr_entries = nr_entries;
+ int3_vec.vec = tp;
+ int3_vec.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 int3_desc data.
+ * ensure reading a non-zero refcount provides up to date int3_vec data.
*/
for_each_possible_cpu(i)
atomic_set_release(per_cpu_ptr(&text_poke_array_refs, i), 1);
Powered by blists - more mailing lists