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

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

details:   https://anonhg.NetBSD.org/src/rev/4a6106dd752b
branches:  netbsd-7
changeset: 799063:4a6106dd752b
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Mar 09 08:00:46 2015 +0000

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

diffstat:

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

diffs (32 lines):

diff -r f016c9a2bf29 -r 4a6106dd752b sys/dev/cons.c
--- a/sys/dev/cons.c    Mon Mar 09 07:58:34 2015 +0000
+++ b/sys/dev/cons.c    Mon Mar 09 08:00:46 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cons.c,v 1.72 2014/07/25 08:10:35 dholland Exp $       */
+/*     $NetBSD: cons.c,v 1.72.2.1 2015/03/09 08:00:46 snj Exp $        */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.72 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.72.2.1 2015/03/09 08:00:46 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -314,11 +314,11 @@
                return;
 
        if (c) {
-               (*cn_tab->cn_putc)(cn_tab->cn_dev, c);
                if (c == '\n') {
+                       (*cn_tab->cn_putc)(cn_tab->cn_dev, '\r');
                        docritpollhooks();
-                       (*cn_tab->cn_putc)(cn_tab->cn_dev, '\r');
                }
+               (*cn_tab->cn_putc)(cn_tab->cn_dev, c);
        }
 }