Module Name: src
Committed By: tsutsui
Date: Tue May 10 14:38:08 UTC 2011
Modified Files:
src/sys/arch/hp300/hp300: autoconf.c machdep.c
Log Message:
Move intr_init() call from early hp300_init() to cpu_configure(9)
since interrupt functions would want evcnt(9).
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/hp300/hp300/autoconf.c
cvs rdiff -u -r1.219 -r1.220 src/sys/arch/hp300/hp300/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/hp300/hp300/autoconf.c
diff -u src/sys/arch/hp300/hp300/autoconf.c:1.97 src/sys/arch/hp300/hp300/autoconf.c:1.98
--- src/sys/arch/hp300/hp300/autoconf.c:1.97 Sat Feb 12 05:08:40 2011
+++ src/sys/arch/hp300/hp300/autoconf.c Tue May 10 14:38:08 2011
@@ -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 @@
/* Kick off autoconfiguration. */
(void)splhigh();
+ /* Initialize the interrupt handlers. */
+ intr_init();
+
if (config_rootfound("mainbus", NULL) == NULL)
panic("no mainbus found");
Index: src/sys/arch/hp300/hp300/machdep.c
diff -u src/sys/arch/hp300/hp300/machdep.c:1.219 src/sys/arch/hp300/hp300/machdep.c:1.220
--- src/sys/arch/hp300/hp300/machdep.c:1.219 Fri Mar 4 22:25:25 2011
+++ src/sys/arch/hp300/hp300/machdep.c Tue May 10 14:38:08 2011
@@ -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 @@
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();
