[src/trunk]: src/sys/arch/sparc/dev Make sure to set ZS_HWFLAG_USE_CONSDEV an...

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

details:   https://anonhg.NetBSD.org/src/rev/60333069aacb
branches:  trunk
changeset: 750867:60333069aacb
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Jan 17 16:23:43 2010 +0000

description:
Make sure to set ZS_HWFLAG_USE_CONSDEV and zs_consdev into zsc_args
passed to child devices even in !(NWSKBD == 0) case so that zs console
functions are actually used rather than the default prom console.
Fixes stray interrupts on MP machines running GENERIC.MP kernel with
zs serial console.

Ok'ed by mrg@.

diffstat:

 sys/arch/sparc/dev/zs.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r d5581743f58c -r 60333069aacb sys/arch/sparc/dev/zs.c
--- a/sys/arch/sparc/dev/zs.c   Sun Jan 17 14:54:43 2010 +0000
+++ b/sys/arch/sparc/dev/zs.c   Sun Jan 17 16:23:43 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zs.c,v 1.116 2009/05/31 17:09:03 martin Exp $  */
+/*     $NetBSD: zs.c,v 1.117 2010/01/17 16:23:43 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.116 2009/05/31 17:09:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.117 2010/01/17 16:23:43 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -464,6 +464,10 @@
                        }
                } else {
                        zsc_args.hwflags = hwflags;
+                       if (zsc_args.hwflags & ZS_HWFLAG_CONSOLE) {
+                               zsc_args.hwflags |= ZS_HWFLAG_USE_CONSDEV;
+                               zsc_args.consdev = &zs_consdev;
+                       }
                }
 #endif
                if ((zsc_args.hwflags & ZS_HWFLAG_CONSOLE_INPUT) != 0) {