Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sparc move cn_tab initializationt to cpu_startup



details:   https://anonhg.NetBSD.org/src/rev/94b7975ceab1
branches:  trunk
changeset: 780591:94b7975ceab1
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jul 30 17:29:55 2012 +0000

description:
move cn_tab initializationt to cpu_startup

diffstat:

 sys/arch/sparc/dev/kd.c        |  7 +++++--
 sys/arch/sparc/sparc/machdep.c |  7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (65 lines):

diff -r 01dabb5894cc -r 94b7975ceab1 sys/arch/sparc/dev/kd.c
--- a/sys/arch/sparc/dev/kd.c   Mon Jul 30 17:29:00 2012 +0000
+++ b/sys/arch/sparc/dev/kd.c   Mon Jul 30 17:29:55 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kd.c,v 1.49 2011/04/24 16:26:57 rmind Exp $    */
+/*     $NetBSD: kd.c,v 1.50 2012/07/30 17:29:55 christos Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.49 2011/04/24 16:26:57 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.50 2012/07/30 17:29:55 christos Exp $");
 
 #include "opt_kgdb.h"
 #include "fb.h"
@@ -533,8 +533,11 @@
 /*
  * The console table pointer is statically initialized
  * to point to the PROM table, so that early calls to printf will work.
+ * this has been moved to cpu_startup()
  */
+#if 0
 struct consdev *cn_tab = &consdev_prom;
+#endif
 
 static void
 prom_cnprobe(struct consdev *cn)
diff -r 01dabb5894cc -r 94b7975ceab1 sys/arch/sparc/sparc/machdep.c
--- a/sys/arch/sparc/sparc/machdep.c    Mon Jul 30 17:29:00 2012 +0000
+++ b/sys/arch/sparc/sparc/machdep.c    Mon Jul 30 17:29:55 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.321 2012/07/28 19:08:25 matt Exp $ */
+/*     $NetBSD: machdep.c,v 1.322 2012/07/30 17:29:55 christos Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.321 2012/07/28 19:08:25 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.322 2012/07/30 17:29:55 christos Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_compat_sunos.h"
@@ -152,6 +152,8 @@
 void   dumpsys(void);
 void   stackdump(void);
 
+extern struct consdev *cn_tab, consdev_prom;
+
 /*
  * Machine-dependent startup code
  */
@@ -167,6 +169,7 @@
        paddr_t pa;
        char pbuf[9];
 
+       cn_tab = &consdev_prom;
 #ifdef DEBUG
        pmapdebug = 0;
 #endif



Home | Main Index | Thread Index | Old Index