diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-09-06 15:15:22 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-09-06 15:15:22 +1000 |
| commit | d6e8fa1a5a6f593ab3e206d1545cd7a23caa938e (patch) | |
| tree | 25766271c8bc56abecf526ecdb5d7aeaf941231d /kernel | |
| parent | 55281cac3ba8075133a6d6ffaa90f1983ed13c7a (diff) | |
| parent | e284f3493206d4268267db4557c7ee6f89ed2314 (diff) | |
Merge remote-tracking branch 'bcon/master'
Conflicts:
drivers/block/Kconfig
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk/printk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index b4e8500afdb3..1cba1ea01eaa 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1267,8 +1267,6 @@ static void call_console_drivers(int level, const char *text, size_t len) trace_console(text, len); - if (level >= console_loglevel && !ignore_loglevel) - return; if (!console_drivers) return; @@ -1282,6 +1280,9 @@ static void call_console_drivers(int level, const char *text, size_t len) if (!cpu_online(smp_processor_id()) && !(con->flags & CON_ANYTIME)) continue; + if (level >= console_loglevel && !ignore_loglevel && + !(con->flags & CON_ALLDATA)) + continue; con->write(con, text, len); } } |