diff options
| author | Frank Rowand <frank.rowand@am.sony.com> | 2012-05-16 18:05:53 -0700 |
|---|---|---|
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2012-09-17 23:23:57 -0400 |
| commit | 8ea772c229e68c8e5fec618881389c8d1d3e99cd (patch) | |
| tree | aa362cf415f88bae958fba1b4d914f5b26864654 /drivers/tty/serial/cpm_uart/cpm_uart_core.c | |
| parent | 510502ba54a5b9fa8fb9e382eb173a14e698e0e3 (diff) | |
fix printk flush of messages
Reverse preempt-rt-allow-immediate-magic-sysrq-output-for-preempt_rt_full.patch
The problem addressed by that patch does not exist after applying
console-make-rt-friendly-update.patch
Signed-off-by: Frank Rowand <frank.rowand@am.sony.com>
Link: http://lkml.kernel.org/r/4FB44EF1.9050809@am.sony.com
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'drivers/tty/serial/cpm_uart/cpm_uart_core.c')
| -rw-r--r-- | drivers/tty/serial/cpm_uart/cpm_uart_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c index a8b05594e468..b418947b7107 100644 --- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c @@ -1226,7 +1226,7 @@ static void cpm_uart_console_write(struct console *co, const char *s, { struct uart_cpm_port *pinfo = &cpm_uart_ports[co->index]; unsigned long flags; - int nolock = oops_in_progress || sysrq_in_progress; + int nolock = oops_in_progress; if (unlikely(nolock)) { local_irq_save(flags); |