Module Name: src
Committed By: cliff
Date: Sun Mar 21 17:38:35 UTC 2010
Modified Files:
src/sys/arch/algor/algor [matt-nb5-mips64]: machdep.c
src/sys/arch/arc/arc [matt-nb5-mips64]: machdep.c
src/sys/arch/cobalt/cobalt [matt-nb5-mips64]: machdep.c
src/sys/arch/evbmips/adm5120 [matt-nb5-mips64]: machdep.c
src/sys/arch/evbmips/alchemy [matt-nb5-mips64]: machdep.c
src/sys/arch/evbmips/atheros [matt-nb5-mips64]: machdep.c
src/sys/arch/evbmips/malta [matt-nb5-mips64]: machdep.c
src/sys/arch/ews4800mips/ews4800mips [matt-nb5-mips64]: machdep.c
src/sys/arch/hpcmips/hpcmips [matt-nb5-mips64]: machdep.c
src/sys/arch/mips/include [matt-nb5-mips64]: locore.h
src/sys/arch/mips/mips [matt-nb5-mips64]: mips_machdep.c
src/sys/arch/mipsco/mipsco [matt-nb5-mips64]: machdep.c
src/sys/arch/newsmips/newsmips [matt-nb5-mips64]: machdep.c
src/sys/arch/playstation2/playstation2 [matt-nb5-mips64]: machdep.c
src/sys/arch/pmax/pmax [matt-nb5-mips64]: machdep.c
src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: machdep.c
src/sys/arch/sgimips/sgimips [matt-nb5-mips64]: machdep.c
Log Message:
mips_vector_init now takes an argument to specify splsw.
NULL specifies use the default 'std_splsw'
To generate a diff of this commit:
cvs rdiff -u -r1.38.10.6 -r1.38.10.7 src/sys/arch/algor/algor/machdep.c
cvs rdiff -u -r1.112.10.3 -r1.112.10.4 src/sys/arch/arc/arc/machdep.c
cvs rdiff -u -r1.98.10.3 -r1.98.10.4 src/sys/arch/cobalt/cobalt/machdep.c
cvs rdiff -u -r1.6.10.4 -r1.6.10.5 src/sys/arch/evbmips/adm5120/machdep.c
cvs rdiff -u -r1.37.10.4 -r1.37.10.5 src/sys/arch/evbmips/alchemy/machdep.c
cvs rdiff -u -r1.13.10.5 -r1.13.10.6 src/sys/arch/evbmips/atheros/machdep.c
cvs rdiff -u -r1.28.10.7 -r1.28.10.8 src/sys/arch/evbmips/malta/machdep.c
cvs rdiff -u -r1.14.10.3 -r1.14.10.4 \
src/sys/arch/ews4800mips/ews4800mips/machdep.c
cvs rdiff -u -r1.96.10.4 -r1.96.10.5 src/sys/arch/hpcmips/hpcmips/machdep.c
cvs rdiff -u -r1.78.36.1.2.21 -r1.78.36.1.2.22 \
src/sys/arch/mips/include/locore.h
cvs rdiff -u -r1.205.4.1.2.1.2.40 -r1.205.4.1.2.1.2.41 \
src/sys/arch/mips/mips/mips_machdep.c
cvs rdiff -u -r1.58.10.2 -r1.58.10.3 src/sys/arch/mipsco/mipsco/machdep.c
cvs rdiff -u -r1.98.10.4 -r1.98.10.5 src/sys/arch/newsmips/newsmips/machdep.c
cvs rdiff -u -r1.23.10.1 -r1.23.10.2 \
src/sys/arch/playstation2/playstation2/machdep.c
cvs rdiff -u -r1.223.8.1.2.6 -r1.223.8.1.2.7 src/sys/arch/pmax/pmax/machdep.c
cvs rdiff -u -r1.38.10.7 -r1.38.10.8 src/sys/arch/sbmips/sbmips/machdep.c
cvs rdiff -u -r1.121.8.4 -r1.121.8.5 src/sys/arch/sgimips/sgimips/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/algor/algor/machdep.c
diff -u src/sys/arch/algor/algor/machdep.c:1.38.10.6 src/sys/arch/algor/algor/machdep.c:1.38.10.7
--- src/sys/arch/algor/algor/machdep.c:1.38.10.6 Wed Feb 24 00:09:31 2010
+++ src/sys/arch/algor/algor/machdep.c Sun Mar 21 17:38:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.38.10.6 2010/02/24 00:09:31 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.38.10.7 2010/03/21 17:38:32 cliff Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38.10.6 2010/02/24 00:09:31 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38.10.7 2010/03/21 17:38:32 cliff Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -232,7 +232,7 @@
* We can no longer call into PMON after this.
*/
led_display('v', 'e', 'c', 'i');
- mips_vector_init();
+ mips_vector_init(NULL);
/*
* Initialize PAGE_SIZE-dependent variables.
Index: src/sys/arch/arc/arc/machdep.c
diff -u src/sys/arch/arc/arc/machdep.c:1.112.10.3 src/sys/arch/arc/arc/machdep.c:1.112.10.4
--- src/sys/arch/arc/arc/machdep.c:1.112.10.3 Mon Feb 1 04:17:50 2010
+++ src/sys/arch/arc/arc/machdep.c Sun Mar 21 17:38:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.112.10.3 2010/02/01 04:17:50 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.112.10.4 2010/03/21 17:38:33 cliff Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@@ -78,7 +78,7 @@
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.112.10.3 2010/02/01 04:17:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.112.10.4 2010/03/21 17:38:33 cliff Exp $");
#include "fs_mfs.h"
#include "opt_ddb.h"
@@ -378,7 +378,7 @@
*
* This may clobber PTEs needed by the BIOS.
*/
- mips_vector_init();
+ mips_vector_init(NULL);
/*
* Map critical I/O spaces (e.g. for console printf(9)) on KSEG2.
Index: src/sys/arch/cobalt/cobalt/machdep.c
diff -u src/sys/arch/cobalt/cobalt/machdep.c:1.98.10.3 src/sys/arch/cobalt/cobalt/machdep.c:1.98.10.4
--- src/sys/arch/cobalt/cobalt/machdep.c:1.98.10.3 Sun Feb 28 04:04:46 2010
+++ src/sys/arch/cobalt/cobalt/machdep.c Sun Mar 21 17:38:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.98.10.3 2010/02/28 04:04:46 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.98.10.4 2010/03/21 17:38:33 cliff Exp $ */
/*-
* Copyright (c) 2006 Izumi Tsutsui. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98.10.3 2010/02/28 04:04:46 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98.10.4 2010/03/21 17:38:33 cliff Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -261,7 +261,7 @@
* Initialize locore-function vector.
* Clear out the I and D caches.
*/
- mips_vector_init();
+ mips_vector_init(NULL);
/*
* The boot command is passed in the top 512 bytes,
Index: src/sys/arch/evbmips/adm5120/machdep.c
diff -u src/sys/arch/evbmips/adm5120/machdep.c:1.6.10.4 src/sys/arch/evbmips/adm5120/machdep.c:1.6.10.5
--- src/sys/arch/evbmips/adm5120/machdep.c:1.6.10.4 Mon Feb 1 04:17:50 2010
+++ src/sys/arch/evbmips/adm5120/machdep.c Sun Mar 21 17:38:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.6.10.4 2010/02/01 04:17:50 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.6.10.5 2010/03/21 17:38:33 cliff Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.6.10.4 2010/02/01 04:17:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.6.10.5 2010/03/21 17:38:33 cliff Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -327,7 +327,7 @@
* functions called during startup.
* Also clears the I+D caches.
*/
- mips_vector_init();
+ mips_vector_init(NULL);
/*
* Set the VM page size.
Index: src/sys/arch/evbmips/alchemy/machdep.c
diff -u src/sys/arch/evbmips/alchemy/machdep.c:1.37.10.4 src/sys/arch/evbmips/alchemy/machdep.c:1.37.10.5
--- src/sys/arch/evbmips/alchemy/machdep.c:1.37.10.4 Mon Feb 1 04:17:50 2010
+++ src/sys/arch/evbmips/alchemy/machdep.c Sun Mar 21 17:38:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.37.10.4 2010/02/01 04:17:50 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.37.10.5 2010/03/21 17:38:33 cliff Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.37.10.4 2010/02/01 04:17:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.37.10.5 2010/03/21 17:38:33 cliff Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -212,7 +212,7 @@
* functions called during startup.
* Also clears the I+D caches.
*/
- mips_vector_init();
+ mips_vector_init(NULL);
/*
* Set the VM page size.
Index: src/sys/arch/evbmips/atheros/machdep.c
diff -u src/sys/arch/evbmips/atheros/machdep.c:1.13.10.5 src/sys/arch/evbmips/atheros/machdep.c:1.13.10.6
--- src/sys/arch/evbmips/atheros/machdep.c:1.13.10.5 Mon Feb 1 04:17:51 2010
+++ src/sys/arch/evbmips/atheros/machdep.c Sun Mar 21 17:38:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.13.10.5 2010/02/01 04:17:51 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.13.10.6 2010/03/21 17:38:34 cliff Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -147,7 +147,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13.10.5 2010/02/01 04:17:51 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13.10.6 2010/03/21 17:38:34 cliff Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -240,7 +240,7 @@
* functions called during startup.
* Also clears the I+D caches.
*/
- mips_vector_init();
+ mips_vector_init(NULL);
/*
* Calibrate timers.
Index: src/sys/arch/evbmips/malta/machdep.c
diff -u src/sys/arch/evbmips/malta/machdep.c:1.28.10.7 src/sys/arch/evbmips/malta/machdep.c:1.28.10.8
--- src/sys/arch/evbmips/malta/machdep.c:1.28.10.7 Sun Feb 28 23:47:05 2010
+++ src/sys/arch/evbmips/malta/machdep.c Sun Mar 21 17:38:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.28.10.7 2010/02/28 23:47:05 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.28.10.8 2010/03/21 17:38:34 cliff Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28.10.7 2010/02/28 23:47:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28.10.8 2010/03/21 17:38:34 cliff Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -228,7 +228,7 @@
* first printf() after that is called).
* Also clears the I+D caches.
*/
- mips_vector_init();
+ mips_vector_init(NULL);
/* set the VM page size */
uvm_setpagesize();
Index: src/sys/arch/ews4800mips/ews4800mips/machdep.c
diff -u src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.14.10.3 src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.14.10.4
--- src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.14.10.3 Mon Feb 1 04:17:50 2010
+++ src/sys/arch/ews4800mips/ews4800mips/machdep.c Sun Mar 21 17:38:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.14.10.3 2010/02/01 04:17:50 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.14.10.4 2010/03/21 17:38:34 cliff Exp $ */
/*-
* Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14.10.3 2010/02/01 04:17:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14.10.4 2010/03/21 17:38:34 cliff Exp $");
#include "opt_ddb.h"
@@ -137,7 +137,7 @@
*/
cn_tab = NULL;
- mips_vector_init();
+ mips_vector_init(NULL);
memcpy((void *)0x80000200, ews4800mips_nmi_vec, 32); /* NMI */
mips_dcache_wbinv_all();
Index: src/sys/arch/hpcmips/hpcmips/machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.96.10.4 src/sys/arch/hpcmips/hpcmips/machdep.c:1.96.10.5
--- src/sys/arch/hpcmips/hpcmips/machdep.c:1.96.10.4 Mon Feb 1 04:18:30 2010
+++ src/sys/arch/hpcmips/hpcmips/machdep.c Sun Mar 21 17:38:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.96.10.4 2010/02/01 04:18:30 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.96.10.5 2010/03/21 17:38:34 cliff Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -108,7 +108,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.96.10.4 2010/02/01 04:18:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.96.10.5 2010/03/21 17:38:34 cliff Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -368,7 +368,7 @@
* Initialize locore-function vector.
* Clear out the I and D caches.
*/
- mips_vector_init();
+ mips_vector_init(NULL);
intr_init();
#ifdef DEBUG
Index: src/sys/arch/mips/include/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.78.36.1.2.21 src/sys/arch/mips/include/locore.h:1.78.36.1.2.22
--- src/sys/arch/mips/include/locore.h:1.78.36.1.2.21 Mon Mar 1 23:54:49 2010
+++ src/sys/arch/mips/include/locore.h Sun Mar 21 17:38:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.78.36.1.2.21 2010/03/01 23:54:49 matt Exp $ */
+/* $NetBSD: locore.h,v 1.78.36.1.2.22 2010/03/21 17:38:32 cliff Exp $ */
/*
* This file should not be included by MI code!!!
@@ -363,6 +363,7 @@
*/
extern mips_locore_jumpvec_t mips_locore_jumpvec;
extern struct locoresw mips_locoresw;
+extern void mips_vector_init(const struct splsw *);
#if defined(MIPS1) && !defined(MIPS3) && !defined(MIPS32) && !defined(MIPS64)
#define tlb_set_asid mips1_tlb_set_asid
Index: src/sys/arch/mips/mips/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.40 src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.41
--- src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.40 Mon Mar 1 19:29:41 2010
+++ src/sys/arch/mips/mips/mips_machdep.c Sun Mar 21 17:38:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.40 2010/03/01 19:29:41 matt Exp $ */
+/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.41 2010/03/21 17:38:32 cliff Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.40 2010/03/01 19:29:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.41 2010/03/21 17:38:32 cliff Exp $");
#define __INTR_PRIVATE
@@ -184,27 +184,27 @@
#endif
#if defined(MIPS1)
-static void mips1_vector_init(void);
+static void mips1_vector_init(const struct splsw *);
extern const struct locoresw mips1_locoresw;
#endif
#if defined(MIPS3)
#if defined(MIPS3_5900)
-static void r5900_vector_init(void);
+static void r5900_vector_init(const struct splsw *);
extern const struct locoresw mips5900_locoresw;
#else
-static void mips3_vector_init(void);
+static void mips3_vector_init(const struct splsw *);
extern const struct locoresw mips3_locoresw;
#endif
#endif
#if defined(MIPS32)
-static void mips32_vector_init(void);
+static void mips32_vector_init(const struct splsw *);
extern const struct locoresw mips32_locoresw;
#endif
#if defined(MIPS64)
-static void mips64_vector_init(void);
+static void mips64_vector_init(const struct splsw *);
extern const struct locoresw mips64_locoresw;
#endif
@@ -521,7 +521,7 @@
*/
static void
-mips1_vector_init(void)
+mips1_vector_init(const struct splsw *splsw)
{
extern const mips_locore_jumpvec_t mips1_locore_vec;
extern char mips1_utlb_miss[], mips1_utlb_miss_end[];
@@ -555,7 +555,7 @@
#if defined(MIPS3)
static void
-mips3_vector_init(void)
+mips3_vector_init(const struct splsw *splsw)
{
extern const mips_locore_jumpvec_t mips3_locore_vec;
/* r4000 exception handler address and end */
@@ -603,7 +603,7 @@
#if defined(MIPS3_5900) /* XXX */
static void
-r5900_vector_init(void)
+r5900_vector_init(const struct splsw *splsw)
{
extern const mips_locore_jumpvec_t r5900_locore_vec;
extern char mips5900_exception[], mips5900_exception_end[];
@@ -639,7 +639,7 @@
#if defined(MIPS32)
static void
-mips32_vector_init(void)
+mips32_vector_init(const struct splsw *splsw)
{
/* MIPS32 locore function vector */
extern const mips_locore_jumpvec_t mips32_locore_vec;
@@ -691,7 +691,7 @@
#if defined(MIPS64)
static void
-mips64_vector_init(void)
+mips64_vector_init(const struct splsw *splsw)
{
/* MIPS64 locore function vector */
extern const mips_locore_jumpvec_t mips64_locore_vec;
@@ -766,7 +766,7 @@
* of CPU the kernel is running on.
*/
void
-mips_vector_init(void)
+mips_vector_init(const struct splsw *splsw)
{
struct mips_options * const opts = &mips_options;
const struct pridtab *ct;
@@ -878,12 +878,17 @@
#endif
/*
- * Assume standard SPL with COP0 status/cause
+ * if 'splsw' is NULL, use standard SPL with COP0 status/cause
+ * otherwise use chip-specific splsw
*/
- mips_splsw = std_splsw;
+ if (splsw == NULL) {
+ mips_splsw = std_splsw;
#ifdef PARANOIA
- std_splsw_test(); /* only works with std_splsw */
+ std_splsw_test(); /* only works with std_splsw */
#endif
+ } else {
+ mips_splsw = *splsw;
+ }
/*
* Determine cache configuration and initialize our cache
@@ -898,7 +903,7 @@
#if defined(MIPS1)
case CPU_ARCH_MIPS1:
mips1_tlb_invalidate_all();
- mips1_vector_init();
+ mips1_vector_init(splsw);
mips_locoresw = mips1_locoresw;
break;
#endif
@@ -911,7 +916,7 @@
mips3_cp0_wired_write(0);
mips5900_tlb_invalidate_all();
mips3_cp0_wired_write(pmap_tlb0_info.ti_wired);
- r5900_vector_init();
+ r5900_vector_init(splsw);
mips_locoresw = mips5900_locoresw;
#else /* MIPS3_5900 */
#if defined(MIPS3_4100)
@@ -923,7 +928,7 @@
mips3_cp0_wired_write(0);
mips3_tlb_invalidate_all();
mips3_cp0_wired_write(pmap_tlb0_info.ti_wired);
- mips3_vector_init();
+ mips3_vector_init(splsw);
mips_locoresw = mips3_locoresw;
#endif /* MIPS3_5900 */
break;
@@ -935,7 +940,7 @@
mips3_cp0_wired_write(0);
mips32_tlb_invalidate_all();
mips3_cp0_wired_write(pmap_tlb0_info.ti_wired);
- mips32_vector_init();
+ mips32_vector_init(splsw);
mips_locoresw = mips32_locoresw;
break;
#endif
@@ -946,7 +951,7 @@
mips3_cp0_wired_write(0);
mips64_tlb_invalidate_all();
mips3_cp0_wired_write(pmap_tlb0_info.ti_wired);
- mips64_vector_init();
+ mips64_vector_init(splsw);
mips_locoresw = mips64_locoresw;
break;
}
Index: src/sys/arch/mipsco/mipsco/machdep.c
diff -u src/sys/arch/mipsco/mipsco/machdep.c:1.58.10.2 src/sys/arch/mipsco/mipsco/machdep.c:1.58.10.3
--- src/sys/arch/mipsco/mipsco/machdep.c:1.58.10.2 Mon Feb 1 04:18:31 2010
+++ src/sys/arch/mipsco/mipsco/machdep.c Sun Mar 21 17:38:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.58.10.2 2010/02/01 04:18:31 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.58.10.3 2010/03/21 17:38:34 cliff Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.58.10.2 2010/02/01 04:18:31 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.58.10.3 2010/03/21 17:38:34 cliff Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -182,7 +182,7 @@
extern struct user *proc0paddr;
/* locore callback-vector setup */
-extern void mips_vector_init __P((void));
+extern void mips_vector_init __P((const struct splsw *));
extern void prom_init __P((void));
extern void pizazz_init __P((void));
Index: src/sys/arch/newsmips/newsmips/machdep.c
diff -u src/sys/arch/newsmips/newsmips/machdep.c:1.98.10.4 src/sys/arch/newsmips/newsmips/machdep.c:1.98.10.5
--- src/sys/arch/newsmips/newsmips/machdep.c:1.98.10.4 Fri Feb 5 07:39:53 2010
+++ src/sys/arch/newsmips/newsmips/machdep.c Sun Mar 21 17:38:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.98.10.4 2010/02/05 07:39:53 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.98.10.5 2010/03/21 17:38:34 cliff Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98.10.4 2010/02/05 07:39:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98.10.5 2010/03/21 17:38:34 cliff Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -331,7 +331,7 @@
* Initialize locore-function vector.
* Clear out the I and D caches.
*/
- mips_vector_init();
+ mips_vector_init(NULL);
/*
* We know the CPU type now. Initialize our DMA tags (might
Index: src/sys/arch/playstation2/playstation2/machdep.c
diff -u src/sys/arch/playstation2/playstation2/machdep.c:1.23.10.1 src/sys/arch/playstation2/playstation2/machdep.c:1.23.10.2
--- src/sys/arch/playstation2/playstation2/machdep.c:1.23.10.1 Mon Sep 7 23:46:46 2009
+++ src/sys/arch/playstation2/playstation2/machdep.c Sun Mar 21 17:38:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.23.10.1 2009/09/07 23:46:46 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.23.10.2 2010/03/21 17:38:34 cliff Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.23.10.1 2009/09/07 23:46:46 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.23.10.2 2010/03/21 17:38:34 cliff Exp $");
#include "opt_ddb.h"
#include "opt_kloader.h"
@@ -122,7 +122,7 @@
* Initialize locore-function vector.
* Clear out the I and D caches.
*/
- mips_vector_init();
+ mips_vector_init(NULL);
/*
* Load the rest of the available pages into the VM system.
Index: src/sys/arch/pmax/pmax/machdep.c
diff -u src/sys/arch/pmax/pmax/machdep.c:1.223.8.1.2.6 src/sys/arch/pmax/pmax/machdep.c:1.223.8.1.2.7
--- src/sys/arch/pmax/pmax/machdep.c:1.223.8.1.2.6 Mon Feb 1 06:54:35 2010
+++ src/sys/arch/pmax/pmax/machdep.c Sun Mar 21 17:38:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.223.8.1.2.6 2010/02/01 06:54:35 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.223.8.1.2.7 2010/03/21 17:38:34 cliff Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.223.8.1.2.6 2010/02/01 06:54:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.223.8.1.2.7 2010/03/21 17:38:34 cliff Exp $");
#include "fs_mfs.h"
#include "opt_ddb.h"
@@ -285,7 +285,7 @@
* Initialize locore-function vector.
* Clear out the I and D caches.
*/
- mips_vector_init();
+ mips_vector_init(NULL);
/*
* We know the CPU type now. Initialize our DMA tags (might
Index: src/sys/arch/sbmips/sbmips/machdep.c
diff -u src/sys/arch/sbmips/sbmips/machdep.c:1.38.10.7 src/sys/arch/sbmips/sbmips/machdep.c:1.38.10.8
--- src/sys/arch/sbmips/sbmips/machdep.c:1.38.10.7 Sun Feb 28 23:46:18 2010
+++ src/sys/arch/sbmips/sbmips/machdep.c Sun Mar 21 17:38:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.38.10.7 2010/02/28 23:46:18 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.38.10.8 2010/03/21 17:38:35 cliff Exp $ */
/*
* Copyright 2000, 2001
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38.10.7 2010/02/28 23:46:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38.10.8 2010/03/21 17:38:35 cliff Exp $");
#include "opt_ddb.h"
#include "opt_ddbparam.h" /* for SYMTAB_SPACE */
@@ -217,7 +217,7 @@
* Initialize locore-function vector.
* Clear out the I and D caches.
*/
- mips_vector_init();
+ mips_vector_init(NULL);
#ifdef DEBUG
printf("fwhandle=%08X magic=%08X bootdata=%08X reserved=%08X\n",
Index: src/sys/arch/sgimips/sgimips/machdep.c
diff -u src/sys/arch/sgimips/sgimips/machdep.c:1.121.8.4 src/sys/arch/sgimips/sgimips/machdep.c:1.121.8.5
--- src/sys/arch/sgimips/sgimips/machdep.c:1.121.8.4 Mon Feb 1 04:18:32 2010
+++ src/sys/arch/sgimips/sgimips/machdep.c Sun Mar 21 17:38:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.121.8.4 2010/02/01 04:18:32 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.121.8.5 2010/03/21 17:38:35 cliff Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.121.8.4 2010/02/01 04:18:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.121.8.5 2010/03/21 17:38:35 cliff Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -676,7 +676,7 @@
* Initialize locore-function vector.
* Clear out the I and D caches.
*/
- mips_vector_init();
+ mips_vector_init(NULL);
/*
* Initialize error message buffer (at end of core).
