[src/netbsd-7]: src/sys/arch/x86/x86 Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/f2a1ad38826f
branches:  netbsd-7
changeset: 798912:f2a1ad38826f
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Jan 28 11:13:02 2015 +0000

description:
Pull up following revision(s) (requested by is in ticket #462):
        sys/arch/x86/x86/consinit.c: revision 1.28
Add support for the (cobalt) nullcons to amd64 and i386.

diffstat:

 sys/arch/x86/x86/consinit.c |  15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diffs (43 lines):

diff -r 455145883d9f -r f2a1ad38826f sys/arch/x86/x86/consinit.c
--- a/sys/arch/x86/x86/consinit.c       Tue Jan 27 13:41:09 2015 +0000
+++ b/sys/arch/x86/x86/consinit.c       Wed Jan 28 11:13:02 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: consinit.c,v 1.27 2014/03/12 12:54:33 martin Exp $     */
+/*     $NetBSD: consinit.c,v 1.27.4.1 2015/01/28 11:13:02 martin Exp $ */
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.27 2014/03/12 12:54:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.27.4.1 2015/01/28 11:13:02 martin Exp $");
 
 #include "opt_kgdb.h"
 #include "opt_puc.h"
@@ -39,6 +39,9 @@
 #include <machine/bootinfo.h>
 #include <arch/x86/include/genfb_machdep.h>
 
+#include <dev/cons.h>
+
+#include "nullcons.h"
 #include "genfb.h"
 #include "vga.h"
 #include "ega.h"
@@ -235,6 +238,14 @@
                return;
        }
 #endif
+#if (NNULLCONS > 0)
+       if (!strcmp(consinfo->devname, "nullcons")) {
+               void nullcninit(struct consdev *cn);
+
+               nullcninit(0);
+               return;
+       }
+#endif
        panic("invalid console device %s", consinfo->devname);
 }