Move intr_init() call from early hp300_init() to cpu_configure(9)

since interrupt functions would want evcnt(9).
This commit is contained in:
tsutsui 2011-05-10 14:38:08 +00:00
parent cd5d7b9351
commit 76e58a69aa
2 changed files with 7 additions and 7 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.97 2011/02/12 05:08:40 tsutsui Exp $ */
/* $NetBSD: autoconf.c,v 1.98 2011/05/10 14:38:08 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 2002 The NetBSD Foundation, Inc.
@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.97 2011/02/12 05:08:40 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.98 2011/05/10 14:38:08 tsutsui Exp $");
#include "dvbox.h"
#include "gbox.h"
@ -282,6 +282,9 @@ cpu_configure(void)
/* Kick off autoconfiguration. */
(void)splhigh();
/* Initialize the interrupt handlers. */
intr_init();
if (config_rootfound("mainbus", NULL) == NULL)
panic("no mainbus found");

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.219 2011/03/04 22:25:25 joerg Exp $ */
/* $NetBSD: machdep.c,v 1.220 2011/05/10 14:38:08 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.219 2011/03/04 22:25:25 joerg Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.220 2011/05/10 14:38:08 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@ -203,9 +203,6 @@ hp300_init(void)
uvm_page_physload(atop(avail_start), atop(avail_end),
atop(avail_start), atop(avail_end), VM_FREELIST_DEFAULT);
/* Initialize the interrupt handlers. */
intr_init();
/* Calibrate the delay loop. */
hp300_calibrate_delay();