[src/netbsd-6]: src/sys/dev Pull up following revision(s) (requested by nakay...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/56d687a9ef4d
branches:  netbsd-6
changeset: 776926:56d687a9ef4d
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Mar 24 08:58:29 2015 +0000

description:
Pull up following revision(s) (requested by nakayama in ticket #1267):
        sys/dev/cons.c: revision 1.74 via patch
Fix strange kernel output sequence "\n\r" observed in serial
consoles.  Output '\r' before '\n' in conversion.

diffstat:

 sys/dev/cons.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 2faca7256e85 -r 56d687a9ef4d sys/dev/cons.c
--- a/sys/dev/cons.c    Tue Mar 24 08:54:51 2015 +0000
+++ b/sys/dev/cons.c    Tue Mar 24 08:58:29 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cons.c,v 1.68 2011/02/08 20:20:26 rmind Exp $  */
+/*     $NetBSD: cons.c,v 1.68.10.1 2015/03/24 08:58:29 snj Exp $       */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.68 2011/02/08 20:20:26 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.68.10.1 2015/03/24 08:58:29 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -296,9 +296,9 @@
                return;
 
        if (c) {
-               (*cn_tab->cn_putc)(cn_tab->cn_dev, c);
                if (c == '\n')
                        (*cn_tab->cn_putc)(cn_tab->cn_dev, '\r');
+               (*cn_tab->cn_putc)(cn_tab->cn_dev, c);
        }
 }