Module Name: src
Committed By: martin
Date: Tue Jul 31 13:35:48 UTC 2012
Modified Files:
src/sys/arch/sparc64/dev: consinit.c
src/sys/arch/sparc64/sparc64: autoconf.c
Log Message:
Set up cn_tab in bootstrap() instead of initializing it statically.
Fixes -Wno-common fallout, idea from tsutsui.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sparc64/dev/consinit.c
cvs rdiff -u -r1.188 -r1.189 src/sys/arch/sparc64/sparc64/autoconf.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/sparc64/dev/consinit.c
diff -u src/sys/arch/sparc64/dev/consinit.c:1.25 src/sys/arch/sparc64/dev/consinit.c:1.26
--- src/sys/arch/sparc64/dev/consinit.c:1.25 Wed Mar 18 10:22:36 2009
+++ src/sys/arch/sparc64/dev/consinit.c Tue Jul 31 13:35:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.25 2009/03/18 10:22:36 cegger Exp $ */
+/* $NetBSD: consinit.c,v 1.26 2012/07/31 13:35:48 martin Exp $ */
/*-
* Copyright (c) 1999 Eduardo E. Horvath
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.25 2009/03/18 10:22:36 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.26 2012/07/31 13:35:48 martin Exp $");
#include "opt_ddb.h"
#include "pcons.h"
@@ -81,13 +81,6 @@ struct consdev consdev_prom = {
.cn_pollc = prom_cnpollc,
};
-/*
- * The console table pointer is statically initialized
- * to point to the PROM (output only) table, so that
- * early calls to printf will work.
- */
-struct consdev *cn_tab = &consdev_prom;
-
void
prom_cnprobe(struct consdev *cd)
{
Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.188 src/sys/arch/sparc64/sparc64/autoconf.c:1.189
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.188 Sun Jul 29 18:05:46 2012
+++ src/sys/arch/sparc64/sparc64/autoconf.c Tue Jul 31 13:35:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.188 2012/07/29 18:05:46 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.189 2012/07/31 13:35:48 martin Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.188 2012/07/29 18:05:46 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.189 2012/07/31 13:35:48 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -280,6 +280,7 @@ bootstrap(void *o0, void *bootargs, void
extern void* get_romtba(void);
extern void OF_val2sym32(void *);
extern void OF_sym2val32(void *);
+ extern struct consdev consdev_prom;
/* Save OpenFrimware entry point */
romp = ofw;
@@ -290,6 +291,7 @@ bootstrap(void *o0, void *bootargs, void
console_node = OF_instance_to_package(promops.po_stdout);
/* Initialize the PROM console so printf will not panic */
+ cn_tab = &consdev_prom;
(*cn_tab->cn_init)(cn_tab);
DPRINTF(ACDB_BOOTARGS,
