Module Name: src
Committed By: tsutsui
Date: Tue May 10 14:45:28 UTC 2011
Modified Files:
src/sys/arch/next68k/next68k: autoconf.c machdep.c
Log Message:
Move isrinit() call from early next68k_init() to cpu_configure(9)
since interrupt service routines would want evcnt(9).
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/next68k/next68k/autoconf.c
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/next68k/next68k/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/next68k/next68k/autoconf.c
diff -u src/sys/arch/next68k/next68k/autoconf.c:1.24 src/sys/arch/next68k/next68k/autoconf.c:1.25
--- src/sys/arch/next68k/next68k/autoconf.c:1.24 Tue Feb 8 20:20:21 2011
+++ src/sys/arch/next68k/next68k/autoconf.c Tue May 10 14:45:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.24 2011/02/08 20:20:21 rmind Exp $ */
+/* $NetBSD: autoconf.c,v 1.25 2011/05/10 14:45:28 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.24 2011/02/08 20:20:21 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.25 2011/05/10 14:45:28 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -96,6 +96,9 @@
booted_device = NULL; /* set by device drivers (if found) */
+ /* Initialize the interrupt handlers. */
+ isrinit();
+
#if 0
dma_rev = ((volatile u_char *)IIOV(NEXT_P_SCR1))[1];
switch (dma_rev) {
Index: src/sys/arch/next68k/next68k/machdep.c
diff -u src/sys/arch/next68k/next68k/machdep.c:1.102 src/sys/arch/next68k/next68k/machdep.c:1.103
--- src/sys/arch/next68k/next68k/machdep.c:1.102 Sat Mar 5 19:04:58 2011
+++ src/sys/arch/next68k/next68k/machdep.c Tue May 10 14:45:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.102 2011/03/05 19:04:58 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.103 2011/05/10 14:45:28 tsutsui Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.102 2011/03/05 19:04:58 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.103 2011/05/10 14:45:28 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -211,9 +211,6 @@
}
}
- /* Initialize the interrupt handlers. */
- isrinit();
-
/* Calibrate the delay loop. */
next68k_calibrate_delay();
