Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/news68k/news68k Move isrinit() call from early news...



details:   https://anonhg.NetBSD.org/src/rev/a1eeb6e5cf82
branches:  trunk
changeset: 764883:a1eeb6e5cf82
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Tue May 10 14:41:55 2011 +0000

description:
Move isrinit() call from early news68k_init() to cpu_configure(9)
since interrupt service routines would want evcnt(9).

diffstat:

 sys/arch/news68k/news68k/autoconf.c |  9 +++++++--
 sys/arch/news68k/news68k/machdep.c  |  6 ++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diffs (64 lines):

diff -r 01e5aa53ae03 -r a1eeb6e5cf82 sys/arch/news68k/news68k/autoconf.c
--- a/sys/arch/news68k/news68k/autoconf.c       Tue May 10 14:38:08 2011 +0000
+++ b/sys/arch/news68k/news68k/autoconf.c       Tue May 10 14:41:55 2011 +0000
@@ -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");
 
diff -r 01e5aa53ae03 -r a1eeb6e5cf82 sys/arch/news68k/news68k/machdep.c
--- a/sys/arch/news68k/news68k/machdep.c        Tue May 10 14:38:08 2011 +0000
+++ b/sys/arch/news68k/news68k/machdep.c        Tue May 10 14:41:55 2011 +0000
@@ -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.



Home | Main Index | Thread Index | Old Index