Skip to content

Commit 256e525

Browse files
Kexin Sundaniel-thompson
authored andcommitted
kgdb: update outdated references to kgdb_wait()
The function kgdb_wait() was folded into the static function kgdb_cpu_enter() by commit 62fae31 ("kgdb: eliminate kgdb_wait(), all cpus enter the same way"). Update the four stale references accordingly: - include/linux/kgdb.h and arch/x86/kernel/kgdb.c: the kgdb_roundup_cpus() kdoc describes what other CPUs are rounded up to call. Because kgdb_cpu_enter() is static, the correct public entry point is kgdb_handle_exception(); also fix a pre-existing grammar error ("get them be" -> "get them into") and reflow the text. - kernel/debug/debug_core.c: replace with the generic description "the debug trap handler", since the actual entry path is architecture-specific. - kernel/debug/gdbstub.c: kgdb_cpu_enter() is correct here (it describes internal state, not a call target); add the missing parentheses. Suggested-by: Daniel Thompson <[email protected]> Assisted-by: unnamed:deepseek-v3.2 coccinelle Signed-off-by: Kexin Sun <[email protected]>
1 parent 028ef9c commit 256e525

4 files changed

Lines changed: 11 additions & 9 deletions

File tree

arch/x86/kernel/kgdb.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,10 +407,11 @@ static void kgdb_disable_hw_debug(struct pt_regs *regs)
407407
* kgdb_roundup_cpus - Get other CPUs into a holding pattern
408408
*
409409
* On SMP systems, we need to get the attention of the other CPUs
410-
* and get them be in a known state. This should do what is needed
411-
* to get the other CPUs to call kgdb_wait(). Note that on some arches,
412-
* the NMI approach is not used for rounding up all the CPUs. For example,
413-
* in case of MIPS, smp_call_function() is used to roundup CPUs.
410+
* and get them into a known state. This should do what is needed
411+
* to get the other CPUs to call kgdb_handle_exception(). Note that
412+
* on some arches, the NMI approach is not used for rounding up all
413+
* the CPUs. For example, in case of MIPS, smp_call_function() is
414+
* used to roundup CPUs.
414415
*
415416
* On non-SMP systems, this is not called.
416417
*/

include/linux/kgdb.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,10 @@ extern void kgdb_call_nmi_hook(void *ignored);
202202
*
203203
* On SMP systems, we need to get the attention of the other CPUs
204204
* and get them into a known state. This should do what is needed
205-
* to get the other CPUs to call kgdb_wait(). Note that on some arches,
206-
* the NMI approach is not used for rounding up all the CPUs. Normally
207-
* those architectures can just not implement this and get the default.
205+
* to get the other CPUs to call kgdb_handle_exception(). Note that
206+
* on some arches, the NMI approach is not used for rounding up all
207+
* the CPUs. Normally those architectures can just not implement
208+
* this and get the default.
208209
*
209210
* On non-SMP systems, this is not called.
210211
*/

kernel/debug/debug_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ static int kgdb_cpu_enter(struct kgdb_state *ks, struct pt_regs *regs,
704704
if (ks->send_ready)
705705
atomic_set(ks->send_ready, 1);
706706

707-
/* Signal the other CPUs to enter kgdb_wait() */
707+
/* Signal the other CPUs to enter the debug trap handler */
708708
else if ((!kgdb_single_step) && kgdb_do_roundup)
709709
kgdb_roundup_cpus();
710710
#endif

kernel/debug/gdbstub.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ static void gdb_get_regs_helper(struct kgdb_state *ks)
517517
/*
518518
* All threads that don't have debuggerinfo should be
519519
* in schedule() sleeping, since all other CPUs
520-
* are in kgdb_wait, and thus have debuggerinfo.
520+
* are in kgdb_cpu_enter(), and thus have debuggerinfo.
521521
*/
522522
if (local_debuggerinfo) {
523523
pt_regs_to_gdb_regs(gdb_regs, local_debuggerinfo);

0 commit comments

Comments
 (0)