Commit c1ef4df1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull kgdb updates from Daniel Thompson:
 "Just two patches for you this time!

   - During a panic, flush the console before entering kgdb.

     This makes things a little easier to comprehend, especially if an
     NMI backtrace was triggered on all CPUs just before we enter the
     panic routines

   - Correcting a couple of misleading (a.k.a. plain wrong) comments"

* tag 'kgdb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux:
  kdb: Corrects comment for kdballocenv
  kgdb: Flush console before entering kgdb on panic
parents d46392bb 23816724

kernel/debug/debug_core.c

+3 −0
Original line number Diff line number Diff line
@@ -1006,6 +1006,9 @@ void kgdb_panic(const char *msg) 
	if (panic_timeout)

		return;



	debug_locks_off();

	console_flush_on_panic(CONSOLE_FLUSH_PENDING);



	if (dbg_kdb_mode)

		kdb_printf("PANIC: %s\n", msg);

kernel/debug/kdb/kdb_main.c

+3 −4
Original line number Diff line number Diff line
@@ -272,11 +272,10 @@ char *kdbgetenv(const char *match) 
 * kdballocenv - This function is used to allocate bytes for

 *	environment entries.

 * Parameters:

 *	match	A character string representing a numeric value

 * Outputs:

 *	*value  the unsigned long representation of the env variable 'match'

 *	bytes	The number of bytes to allocate in the static buffer.

 * Returns:

 *	Zero on success, a kdb diagnostic on failure.

 *	A pointer to the allocated space in the buffer on success.

 *	NULL if bytes > size available in the envbuffer.

 * Remarks:

 *	We use a static environment buffer (envbuffer) to hold the values

 *	of dynamically generated environment variables (see kdb_set).  Buffer