d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

introduce cngrab/cnungrab stub calls in some places where they make sense

Browse Source 
MFC after:	2 months
This commit is contained in:
avg 2011-12-17 15:11:22 +00:00
parent f6def40e18
commit d062f5e7d8
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/kern/kern_cons.c
View File

@ -427,8 +427,10 @@ cnputc(int c)
if (console_pausing && c == '\n' && !kdb_active) {
for (cp = console_pausestr; *cp != '\0'; cp++)
cnputc(*cp);
cngrab();
if (cngetc() == '.')
console_pausing = 0;
cnungrab();
cnputc('\r');
for (cp = console_pausestr; *cp != '\0'; cp++)
cnputc(' ');

3
sys/kern/kern_shutdown.c
View File

@ -443,6 +443,8 @@ kern_reboot(int howto)
print_uptime();
cngrab();
/*
* Ok, now do things that assume all filesystem activity has
* been completed.
@ -613,6 +615,7 @@ panic(const char *fmt, ...)
if (newpanic) {
(void)vsnprintf(buf, sizeof(buf), fmt, ap);
panicstr = buf;
cngrab();
printf("panic: %s\n", buf);
} else {
printf("panic: ");

5
sys/kern/subr_kdb.c
View File

@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/cons.h>
#include <sys/kdb.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
@ -622,6 +623,8 @@ kdb_trap(int type, int code, struct trapframe *tf)
makectx(tf, &kdb_pcb);
kdb_thr_select(curthread);
cngrab();
for (;;) {
handled = be->dbbe_trap(type, code);
if (be == kdb_dbbe)
@ -632,6 +635,8 @@ kdb_trap(int type, int code, struct trapframe *tf)
printf("Switching to %s back-end\n", be->dbbe_name);
}
cnungrab();
kdb_active--;
#ifdef SMP