D13212.id35659.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D13212.id35659.diff
View Options

	Index: sys/ddb/db_command.c
	===================================================================
	--- sys/ddb/db_command.c
	+++ sys/ddb/db_command.c
	@@ -556,6 +556,7 @@
	if (s)
	db_printf("%s", s);
	db_flush_lex();
	+ kdb_reenter_silent = 1;
	kdb_reenter();
	}

	Index: sys/kern/subr_kdb.c
	===================================================================
	--- sys/kern/subr_kdb.c
	+++ sys/kern/subr_kdb.c
	@@ -501,8 +501,11 @@
	if (!kdb_active \|\| kdb_jmpbufp == NULL)
	return;

	- printf("KDB: reentering\n");
	- kdb_backtrace();
	+ if (!kdb_reenter_silent) {
	+ kdb_reenter_silent = 0;
	+ printf("KDB: reentering\n");
	+ kdb_backtrace();
	+ }
	longjmp(kdb_jmpbufp, 1);
	/* NOTREACHED */
	}
	Index: sys/sys/kdb.h
	===================================================================
	--- sys/sys/kdb.h
	+++ sys/sys/kdb.h
	@@ -60,6 +60,7 @@
	DATA_SET(kdb_dbbe_set, name##_dbbe)

	extern u_char kdb_active; /* Non-zero while in debugger. */
	+extern u_char kdb_reenter_silent; /* Make kdb_reenter(9) silent. */
	extern int debugger_on_panic; /* enter the debugger on panic. */
	extern struct kdb_dbbe kdb_dbbe; / Default debugger backend or NULL. */
	extern struct trapframe kdb_frame; / Frame to kdb_trap(). */