Module Name: src
Committed By: martin
Date: Tue Jul 31 14:23:34 UTC 2012
Modified Files:
src/sys/arch/sparc/sparc: autoconf.c machdep.c
Log Message:
Move cn_tab initialization to bootstrap()
To generate a diff of this commit:
cvs rdiff -u -r1.244 -r1.245 src/sys/arch/sparc/sparc/autoconf.c
cvs rdiff -u -r1.322 -r1.323 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/sparc/autoconf.c
diff -u src/sys/arch/sparc/sparc/autoconf.c:1.244 src/sys/arch/sparc/sparc/autoconf.c:1.245
--- src/sys/arch/sparc/sparc/autoconf.c:1.244 Sun Jul 29 18:05:46 2012
+++ src/sys/arch/sparc/sparc/autoconf.c Tue Jul 31 14:23:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.244 2012/07/29 18:05:46 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.245 2012/07/31 14:23:33 martin Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.244 2012/07/29 18:05:46 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.245 2012/07/31 14:23:33 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -266,6 +266,8 @@ void
bootstrap(void)
{
extern uint8_t u0[];
+ extern struct consdev consdev_prom;
+
#if NKSYMS || defined(DDB) || defined(MODULAR)
struct btinfo_symtab *bi_sym;
#else
@@ -273,6 +275,7 @@ bootstrap(void)
#endif
struct btinfo_boothowto *bi_howto;
+ cn_tab = &consdev_prom;
prom_init();
/* Find the number of CPUs as early as possible */
Index: src/sys/arch/sparc/sparc/machdep.c
diff -u src/sys/arch/sparc/sparc/machdep.c:1.322 src/sys/arch/sparc/sparc/machdep.c:1.323
--- src/sys/arch/sparc/sparc/machdep.c:1.322 Mon Jul 30 17:29:55 2012
+++ src/sys/arch/sparc/sparc/machdep.c Tue Jul 31 14:23:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.322 2012/07/30 17:29:55 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.323 2012/07/31 14:23:34 martin 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.322 2012/07/30 17:29:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.323 2012/07/31 14:23:34 martin Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_sunos.h"
@@ -152,8 +152,6 @@ struct extent *dvmamap24;
void dumpsys(void);
void stackdump(void);
-extern struct consdev *cn_tab, consdev_prom;
-
/*
* Machine-dependent startup code
*/
@@ -169,7 +167,6 @@ cpu_startup(void)
paddr_t pa;
char pbuf[9];
- cn_tab = &consdev_prom;
#ifdef DEBUG
pmapdebug = 0;
#endif
