summaryrefslogtreecommitdiffstats
path: root/kernel/debug/kdb/kdb_main.c
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2010-05-20 21:04:27 -0500
committerJason Wessel <jason.wessel@windriver.com>2010-05-20 21:04:27 -0500
commitd37d39ae3b4a8f9a21114921fb344fe7cadb1abd (patch)
tree2c20219725a12c343429758ec378b5c9d08b04bd /kernel/debug/kdb/kdb_main.c
parentefe2f29e324fd20e0449bcd6dc6dbe4734c2ba94 (diff)
downloadop-kernel-dev-d37d39ae3b4a8f9a21114921fb344fe7cadb1abd.zip
op-kernel-dev-d37d39ae3b4a8f9a21114921fb344fe7cadb1abd.tar.gz
printk,kdb: capture printk() when in kdb shell
Certain calls from the kdb shell will call out to printk(), and any of these calls should get vectored back to the kdb_printf() so that the kdb pager and processing can be used, as well as to properly channel I/O to the polled I/O devices. CC: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Acked-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'kernel/debug/kdb/kdb_main.c')
-rw-r--r--kernel/debug/kdb/kdb_main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index 64ef9ac..b724c79 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -1056,7 +1056,9 @@ static void kdb_dumpregs(struct pt_regs *regs)
{
int old_lvl = console_loglevel;
console_loglevel = 15;
+ kdb_trap_printk++;
show_regs(regs);
+ kdb_trap_printk--;
kdb_printf("\n");
console_loglevel = old_lvl;
}
@@ -1819,7 +1821,9 @@ static int kdb_sr(int argc, const char **argv)
if (argc != 1)
return KDB_ARGCOUNT;
sysrq_toggle_support(1);
+ kdb_trap_printk++;
handle_sysrq(*argv[1], NULL);
+ kdb_trap_printk--;
return 0;
}
OpenPOWER on IntegriCloud