diff options
| author | Jason Wessel <jason.wessel@windriver.com> | 2010-05-21 04:04:27 +0200 |
|---|---|---|
| committer | Jason Wessel <jason.wessel@windriver.com> | 2010-05-21 04:04:27 +0200 |
| commit | d37d39ae3b4a8f9a21114921fb344fe7cadb1abd (patch) | |
| tree | 2c20219725a12c343429758ec378b5c9d08b04bd /kernel/printk.c | |
| parent | kgdboc,kdb: Allow kdb to work on a non open console port (diff) | |
| download | linux-d37d39ae3b4a8f9a21114921fb344fe7cadb1abd.tar.xz linux-d37d39ae3b4a8f9a21114921fb344fe7cadb1abd.zip | |
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/printk.c')
| -rw-r--r-- | kernel/printk.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 9213b8b5bb4f..444b770c9595 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -33,6 +33,7 @@ #include <linux/bootmem.h> #include <linux/syscalls.h> #include <linux/kexec.h> +#include <linux/kdb.h> #include <linux/ratelimit.h> #include <linux/kmsg_dump.h> #include <linux/syslog.h> @@ -602,6 +603,14 @@ asmlinkage int printk(const char *fmt, ...) va_list args; int r; +#ifdef CONFIG_KGDB_KDB + if (unlikely(kdb_trap_printk)) { + va_start(args, fmt); + r = vkdb_printf(fmt, args); + va_end(args); + return r; + } +#endif va_start(args, fmt); r = vprintk(fmt, args); va_end(args); |