Module Name: src
Committed By: cliff
Date: Thu Jun 10 00:35:18 UTC 2010
Modified Files:
src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: machdep.c
Log Message:
- set mips_locoresw.lsw_bus_error = sibyte_bus_watch_check
- call sb1250_ipl_map_init() to set the ipl_sr_map for sbmips.
To generate a diff of this commit:
cvs rdiff -u -r1.38.10.8 -r1.38.10.9 src/sys/arch/sbmips/sbmips/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/sbmips/sbmips/machdep.c
diff -u src/sys/arch/sbmips/sbmips/machdep.c:1.38.10.8 src/sys/arch/sbmips/sbmips/machdep.c:1.38.10.9
--- src/sys/arch/sbmips/sbmips/machdep.c:1.38.10.8 Sun Mar 21 17:38:35 2010
+++ src/sys/arch/sbmips/sbmips/machdep.c Thu Jun 10 00:35:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.38.10.8 2010/03/21 17:38:35 cliff Exp $ */
+/* $NetBSD: machdep.c,v 1.38.10.9 2010/06/10 00:35:18 cliff Exp $ */
/*
* Copyright 2000, 2001
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38.10.8 2010/03/21 17:38:35 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38.10.9 2010/06/10 00:35:18 cliff Exp $");
#include "opt_ddb.h"
#include "opt_ddbparam.h" /* for SYMTAB_SPACE */
@@ -101,6 +101,8 @@
#endif /* XXXCGD */
#include <machine/leds.h>
+#include <mips/sibyte/dev/sbbuswatchvar.h>
+
#include "ksyms.h"
#if NKSYMS || defined(DDB) || defined(LKM)
@@ -219,6 +221,10 @@
*/
mips_vector_init(NULL);
+ mips_locoresw.lsw_bus_error = sibyte_bus_watch_check;
+
+ sb1250_ipl_map_init();
+
#ifdef DEBUG
printf("fwhandle=%08X magic=%08X bootdata=%08X reserved=%08X\n",
(u_int)fwhandle, (u_int)magic, (u_int)bootdata, (u_int)reserved);
