Commit 38ee6e1f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kgdb-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux 

Pull kgdb update from Daniel Thompson:
 "Only a very small update for kgdb this cycle: a single patch from
  Kexin Sun that fixes some outdated comments"

* tag 'kgdb-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux:
  kgdb: update outdated references to kgdb_wait()
parents 87d03777 256e5254

arch/x86/kernel/kgdb.c

+5 −4
Original line number Diff line number Diff line
@@ -407,10 +407,11 @@ static void kgdb_disable_hw_debug(struct pt_regs *regs) 
 *	kgdb_roundup_cpus - Get other CPUs into a holding pattern

 *

 *	On SMP systems, we need to get the attention of the other CPUs

 *	and get them be in a known state.  This should do what is needed

 *	to get the other CPUs to call kgdb_wait(). Note that on some arches,

 *	the NMI approach is not used for rounding up all the CPUs. For example,

 *	in case of MIPS, smp_call_function() is used to roundup CPUs.

 *	and get them into a known state.  This should do what is needed

 *	to get the other CPUs to call kgdb_handle_exception().  Note that

 *	on some arches, the NMI approach is not used for rounding up all

 *	the CPUs.  For example, in case of MIPS, smp_call_function() is

 *	used to roundup CPUs.

 *

 *	On non-SMP systems, this is not called.

 */

include/linux/kgdb.h

+4 −3
Original line number Diff line number Diff line
@@ -202,9 +202,10 @@ extern void kgdb_call_nmi_hook(void *ignored); 
 *

 *	On SMP systems, we need to get the attention of the other CPUs

 *	and get them into a known state.  This should do what is needed

 *	to get the other CPUs to call kgdb_wait(). Note that on some arches,

 *	the NMI approach is not used for rounding up all the CPUs.  Normally

 *	those architectures can just not implement this and get the default.

 *	to get the other CPUs to call kgdb_handle_exception().  Note that

 *	on some arches, the NMI approach is not used for rounding up all

 *	the CPUs.  Normally those architectures can just not implement

 *	this and get the default.

 *

 *	On non-SMP systems, this is not called.

 */

kernel/debug/debug_core.c

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ static int kgdb_cpu_enter(struct kgdb_state *ks, struct pt_regs *regs, 
	if (ks->send_ready)

		atomic_set(ks->send_ready, 1);



	/* Signal the other CPUs to enter kgdb_wait() */

	/* Signal the other CPUs to enter the debug trap handler */

	else if ((!kgdb_single_step) && kgdb_do_roundup)

		kgdb_roundup_cpus();

#endif

kernel/debug/gdbstub.c

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ static void gdb_get_regs_helper(struct kgdb_state *ks) 
	/*

	 * All threads that don't have debuggerinfo should be

	 * in schedule() sleeping, since all other CPUs

	 * are in kgdb_wait, and thus have debuggerinfo.

	 * are in kgdb_cpu_enter(), and thus have debuggerinfo.

	 */

	if (local_debuggerinfo) {

		pt_regs_to_gdb_regs(gdb_regs, local_debuggerinfo);