diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 01:36:41 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 01:36:41 -0700 |
| commit | c70ba0b1799cd1c3a2f027238851149ecdb79da6 (patch) | |
| tree | 693cbeda7444a624731b8b2c0616365ed5ab7335 /kernel/printk.c | |
| parent | fa791cecfb6dcf223d81c2e0aac2cd1f93d7c911 (diff) | |
| parent | a88f9e27498afaea615ad3e93af4f26df1f84987 (diff) | |
Merge commit 'a88f9e27498afaea615ad3e93af4f26df1f84987' into after-upstream-android
Conflicts:
arch/arm/common/Kconfig
arch/arm/mm/Makefile
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
drivers/input/Kconfig
drivers/input/Makefile
drivers/power/Kconfig
kernel/futex.c
Diffstat (limited to 'kernel/printk.c')
| -rw-r--r-- | kernel/printk.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index d37d45c90ae6..c67162c05ea3 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -51,6 +51,10 @@ #define CREATE_TRACE_POINTS #include <trace/events/printk.h> +#ifdef CONFIG_DEBUG_LL +extern void printascii(char *); +#endif + /* printk's without a loglevel use this.. */ #define DEFAULT_MESSAGE_LOGLEVEL CONFIG_DEFAULT_MESSAGE_LOGLEVEL @@ -1552,6 +1556,10 @@ asmlinkage int vprintk_emit(int facility, int level, */ text_len = vscnprintf(text, sizeof(textbuf), fmt, args); +#ifdef CONFIG_DEBUG_LL + printascii(text); +#endif + /* mark and strip a trailing newline */ if (text_len && text[text_len-1] == '\n') { text_len--; |