Skip to content

Commit c1ef4df

Browse files
committed
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
2 parents d46392b + 2381672 commit c1ef4df

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

kernel/debug/debug_core.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,6 +1006,9 @@ void kgdb_panic(const char *msg)
10061006
if (panic_timeout)
10071007
return;
10081008

1009+
debug_locks_off();
1010+
console_flush_on_panic(CONSOLE_FLUSH_PENDING);
1011+
10091012
if (dbg_kdb_mode)
10101013
kdb_printf("PANIC: %s\n", msg);
10111014

kernel/debug/kdb/kdb_main.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,10 @@ char *kdbgetenv(const char *match)
272272
* kdballocenv - This function is used to allocate bytes for
273273
* environment entries.
274274
* Parameters:
275-
* match A character string representing a numeric value
276-
* Outputs:
277-
* *value the unsigned long representation of the env variable 'match'
275+
* bytes The number of bytes to allocate in the static buffer.
278276
* Returns:
279-
* Zero on success, a kdb diagnostic on failure.
277+
* A pointer to the allocated space in the buffer on success.
278+
* NULL if bytes > size available in the envbuffer.
280279
* Remarks:
281280
* We use a static environment buffer (envbuffer) to hold the values
282281
* of dynamically generated environment variables (see kdb_set). Buffer

0 commit comments

Comments
 (0)