Module Name: src
Committed By: tsutsui
Date: Tue May 10 14:41:55 UTC 2011
Modified Files:
src/sys/arch/news68k/news68k: autoconf.c machdep.c
Log Message:
Move isrinit() call from early news68k_init() to cpu_configure(9)
since interrupt service routines would want evcnt(9).
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/news68k/news68k/autoconf.c
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/news68k/news68k/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/news68k/news68k/autoconf.c
diff -u src/sys/arch/news68k/news68k/autoconf.c:1.19 src/sys/arch/news68k/news68k/autoconf.c:1.20
--- src/sys/arch/news68k/news68k/autoconf.c:1.19 Tue Feb 8 20:20:20 2011
+++ src/sys/arch/news68k/news68k/autoconf.c Tue May 10 14:41:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.19 2011/02/08 20:20:20 rmind Exp $ */
+/* $NetBSD: autoconf.c,v 1.20 2011/05/10 14:41:55 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2011/02/08 20:20:20 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2011/05/10 14:41:55 tsutsui Exp $");
#include "scsibus.h"
@@ -68,6 +68,8 @@
#include <machine/romcall.h>
#include <machine/autoconf.h>
+#include <news68k/news68k/isr.h>
+
/*
* The following several variables are related to
* the configuration process, and are used in initializing
@@ -91,6 +93,9 @@
*/
(void) splhigh();
+ /* Initialize the interrupt handlers. */
+ isrinit();
+
if (config_rootfound("mainbus", NULL) == NULL)
panic("autoconfig failed, no root");
Index: src/sys/arch/news68k/news68k/machdep.c
diff -u src/sys/arch/news68k/news68k/machdep.c:1.91 src/sys/arch/news68k/news68k/machdep.c:1.92
--- src/sys/arch/news68k/news68k/machdep.c:1.91 Sun Mar 6 14:54:47 2011
+++ src/sys/arch/news68k/news68k/machdep.c Tue May 10 14:41:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.91 2011/03/06 14:54:47 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.92 2011/05/10 14:41:55 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.91 2011/03/06 14:54:47 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.92 2011/05/10 14:41:55 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -186,8 +186,6 @@
panic("impossible system type");
}
- isrinit();
-
/*
* Initialize error message buffer (at end of core).
* avail_end was pre-decremented in pmap_bootstrap to compensate.
