Module Name: src
Committed By: christos
Date: Mon Jul 30 17:29:55 UTC 2012
Modified Files:
src/sys/arch/sparc/dev: kd.c
src/sys/arch/sparc/sparc: machdep.c
Log Message:
move cn_tab initializationt to cpu_startup
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sparc/dev/kd.c
cvs rdiff -u -r1.321 -r1.322 src/sys/arch/sparc/sparc/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/dev/kd.c
diff -u src/sys/arch/sparc/dev/kd.c:1.49 src/sys/arch/sparc/dev/kd.c:1.50
--- src/sys/arch/sparc/dev/kd.c:1.49 Sun Apr 24 12:26:57 2011
+++ src/sys/arch/sparc/dev/kd.c Mon Jul 30 13:29:55 2012
@@ -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 @@ struct consdev consdev_prom = {
/*
* 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)
Index: src/sys/arch/sparc/sparc/machdep.c
diff -u src/sys/arch/sparc/sparc/machdep.c:1.321 src/sys/arch/sparc/sparc/machdep.c:1.322
--- src/sys/arch/sparc/sparc/machdep.c:1.321 Sat Jul 28 15:08:25 2012
+++ src/sys/arch/sparc/sparc/machdep.c Mon Jul 30 13:29:55 2012
@@ -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 @@ struct extent *dvmamap24;
void dumpsys(void);
void stackdump(void);
+extern struct consdev *cn_tab, consdev_prom;
+
/*
* Machine-dependent startup code
*/
@@ -167,6 +169,7 @@ cpu_startup(void)
paddr_t pa;
char pbuf[9];
+ cn_tab = &consdev_prom;
#ifdef DEBUG
pmapdebug = 0;
#endif
