Commit fb329400 authored by Andreas Schwab's avatar Andreas Schwab Committed by David Mosberger

ia64: Fix staircase effect on Altix serial console

Serial console output on Altix didn't convert NL to CRNL.
parent ebcfd1a5
...@@ -952,6 +952,7 @@ static void ...@@ -952,6 +952,7 @@ static void
sn_sal_console_write(struct console *co, const char *s, unsigned count) sn_sal_console_write(struct console *co, const char *s, unsigned count)
{ {
unsigned long flags; unsigned long flags;
const char *s1;
BUG_ON(!sn_sal_is_asynch); BUG_ON(!sn_sal_is_asynch);
...@@ -959,15 +960,36 @@ sn_sal_console_write(struct console *co, const char *s, unsigned count) ...@@ -959,15 +960,36 @@ sn_sal_console_write(struct console *co, const char *s, unsigned count)
* oops, kdb, panic, etc. make sure they get it. */ * oops, kdb, panic, etc. make sure they get it. */
if (spin_is_locked(&sn_sal_lock)) { if (spin_is_locked(&sn_sal_lock)) {
synch_flush_xmit(); synch_flush_xmit();
/* Output '\r' before each '\n' */
while ((s1 = memchr(s, '\n', count)) != NULL) {
sn_func->sal_puts(s, s1 - s);
sn_func->sal_puts("\r\n", 2);
count -= s1 + 1 - s;
s = s1 + 1;
}
sn_func->sal_puts(s, count); sn_func->sal_puts(s, count);
} }
else if (in_interrupt()) { else if (in_interrupt()) {
spin_lock_irqsave(&sn_sal_lock, flags); spin_lock_irqsave(&sn_sal_lock, flags);
synch_flush_xmit(); synch_flush_xmit();
spin_unlock_irqrestore(&sn_sal_lock, flags); spin_unlock_irqrestore(&sn_sal_lock, flags);
/* Output '\r' before each '\n' */
while ((s1 = memchr(s, '\n', count)) != NULL) {
sn_func->sal_puts(s, s1 - s);
sn_func->sal_puts("\r\n", 2);
count -= s1 + 1 - s;
s = s1 + 1;
}
sn_func->sal_puts(s, count); sn_func->sal_puts(s, count);
} }
else else
/* Output '\r' before each '\n' */
while ((s1 = memchr(s, '\n', count)) != NULL) {
sn_sal_write(NULL, 0, s, s1 - s);
sn_sal_write(NULL, 0, "\r\n", 2);
count -= s1 + 1 - s;
s = s1 + 1;
}
sn_sal_write(NULL, 0, s, count); sn_sal_write(NULL, 0, s, count);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment