Module Name: src
Committed By: matt
Date: Fri Feb 5 07:39:54 UTC 2010
Modified Files:
src/sys/arch/algor/algor [matt-nb5-mips64]: interrupt.c
src/sys/arch/algor/conf [matt-nb5-mips64]: files.algor
src/sys/arch/arc/arc [matt-nb5-mips64]: interrupt.c
src/sys/arch/arc/conf [matt-nb5-mips64]: files.arc
src/sys/arch/cobalt/cobalt [matt-nb5-mips64]: interrupt.c
src/sys/arch/cobalt/conf [matt-nb5-mips64]: files.cobalt
src/sys/arch/evbmips/conf [matt-nb5-mips64]: WGT624V3 files.adm5120
files.alchemy files.atheros files.malta files.rmixl
src/sys/arch/evbmips/evbmips [matt-nb5-mips64]: interrupt.c
src/sys/arch/ews4800mips/conf [matt-nb5-mips64]: files.ews4800mips
src/sys/arch/ews4800mips/ews4800mips [matt-nb5-mips64]: interrupt.c
src/sys/arch/hpcmips/tx [matt-nb5-mips64]: tx39icu.c
src/sys/arch/hpcmips/vr [matt-nb5-mips64]: vr.c
src/sys/arch/mipsco/include [matt-nb5-mips64]: intr.h
src/sys/arch/mipsco/mipsco [matt-nb5-mips64]: interrupt.c
src/sys/arch/newsmips/conf [matt-nb5-mips64]: files.newsmips
src/sys/arch/newsmips/newsmips [matt-nb5-mips64]: machdep.c
src/sys/arch/pmax/conf [matt-nb5-mips64]: GENERIC files.pmax
src/sys/arch/pmax/pmax [matt-nb5-mips64]: interrupt.c
src/sys/arch/sbmips/conf [matt-nb5-mips64]: files.sbmips
src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: sb1250_icu.c
src/sys/arch/sgimips/sgimips [matt-nb5-mips64]: cpu.c
Log Message:
Change to deal with new method of invoking softints. Remove mips/softintr.c
from config files. Fix SYMTAB_SPACE for WGT62V43
To generate a diff of this commit:
cvs rdiff -u -r1.13.18.1 -r1.13.18.2 src/sys/arch/algor/algor/interrupt.c
cvs rdiff -u -r1.24 -r1.24.28.1 src/sys/arch/algor/conf/files.algor
cvs rdiff -u -r1.4 -r1.4.22.1 src/sys/arch/arc/arc/interrupt.c
cvs rdiff -u -r1.62 -r1.62.28.1 src/sys/arch/arc/conf/files.arc
cvs rdiff -u -r1.3 -r1.3.16.1 src/sys/arch/cobalt/cobalt/interrupt.c
cvs rdiff -u -r1.33 -r1.33.16.1 src/sys/arch/cobalt/conf/files.cobalt
cvs rdiff -u -r1.3.8.1 -r1.3.8.2 src/sys/arch/evbmips/conf/WGT624V3
cvs rdiff -u -r1.5.28.1 -r1.5.28.2 src/sys/arch/evbmips/conf/files.adm5120
cvs rdiff -u -r1.9.28.1 -r1.9.28.2 src/sys/arch/evbmips/conf/files.alchemy
cvs rdiff -u -r1.6.28.1 -r1.6.28.2 src/sys/arch/evbmips/conf/files.atheros
cvs rdiff -u -r1.15.28.2 -r1.15.28.3 src/sys/arch/evbmips/conf/files.malta
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/evbmips/conf/files.rmixl
cvs rdiff -u -r1.11.18.1 -r1.11.18.2 src/sys/arch/evbmips/evbmips/interrupt.c
cvs rdiff -u -r1.3 -r1.3.28.1 src/sys/arch/ews4800mips/conf/files.ews4800mips
cvs rdiff -u -r1.4 -r1.4.18.1 \
src/sys/arch/ews4800mips/ews4800mips/interrupt.c
cvs rdiff -u -r1.25 -r1.25.18.1 src/sys/arch/hpcmips/tx/tx39icu.c
cvs rdiff -u -r1.51 -r1.51.22.1 src/sys/arch/hpcmips/vr/vr.c
cvs rdiff -u -r1.16 -r1.16.36.1 src/sys/arch/mipsco/include/intr.h
cvs rdiff -u -r1.6 -r1.6.18.1 src/sys/arch/mipsco/mipsco/interrupt.c
cvs rdiff -u -r1.26 -r1.26.28.1 src/sys/arch/newsmips/conf/files.newsmips
cvs rdiff -u -r1.98.10.3 -r1.98.10.4 src/sys/arch/newsmips/newsmips/machdep.c
cvs rdiff -u -r1.158 -r1.158.8.1 src/sys/arch/pmax/conf/GENERIC
cvs rdiff -u -r1.111 -r1.111.28.1 src/sys/arch/pmax/conf/files.pmax
cvs rdiff -u -r1.15.18.1 -r1.15.18.2 src/sys/arch/pmax/pmax/interrupt.c
cvs rdiff -u -r1.14.28.1 -r1.14.28.2 src/sys/arch/sbmips/conf/files.sbmips
cvs rdiff -u -r1.9.36.2 -r1.9.36.3 src/sys/arch/sbmips/sbmips/sb1250_icu.c
cvs rdiff -u -r1.21.36.2 -r1.21.36.3 src/sys/arch/sgimips/sgimips/cpu.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/interrupt.c
diff -u src/sys/arch/algor/algor/interrupt.c:1.13.18.1 src/sys/arch/algor/algor/interrupt.c:1.13.18.2
--- src/sys/arch/algor/algor/interrupt.c:1.13.18.1 Thu Dec 31 00:54:08 2009
+++ src/sys/arch/algor/algor/interrupt.c Fri Feb 5 07:39:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.13.18.1 2009/12/31 00:54:08 matt Exp $ */
+/* $NetBSD: interrupt.c,v 1.13.18.2 2010/02/05 07:39:52 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.13.18.1 2009/12/31 00:54:08 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.13.18.2 2010/02/05 07:39:52 matt Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -139,10 +139,9 @@
ci->ci_idepth--;
#ifdef __HAVE_FAST_SOFTINTS
- ipending &= (MIPS_SOFT_INT_MASK_1|MIPS_SOFT_INT_MASK_0);
+ ipending &= MIPS_SOFT_INT_MASK;
if (ipending == 0)
return;
- _clrsoftintr(ipending);
- softintr_dispatch(ipending);
+ softint_process(ipending);
#endif
}
Index: src/sys/arch/algor/conf/files.algor
diff -u src/sys/arch/algor/conf/files.algor:1.24 src/sys/arch/algor/conf/files.algor:1.24.28.1
--- src/sys/arch/algor/conf/files.algor:1.24 Wed Feb 20 21:43:33 2008
+++ src/sys/arch/algor/conf/files.algor Fri Feb 5 07:39:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.algor,v 1.24 2008/02/20 21:43:33 drochner Exp $
+# $NetBSD: files.algor,v 1.24.28.1 2010/02/05 07:39:52 matt Exp $
# Algorithmics evaluation board specific configuration info.
@@ -41,7 +41,6 @@
file arch/algor/algor/machdep.c
file arch/algor/algor/pmon.c
-file arch/mips/mips/softintr.c
file arch/mips/mips/mips3_clock.c
file arch/mips/mips/mips3_clockintr.c
Index: src/sys/arch/arc/arc/interrupt.c
diff -u src/sys/arch/arc/arc/interrupt.c:1.4 src/sys/arch/arc/arc/interrupt.c:1.4.22.1
--- src/sys/arch/arc/arc/interrupt.c:1.4 Fri Mar 14 16:43:27 2008
+++ src/sys/arch/arc/arc/interrupt.c Fri Feb 5 07:39:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.4 2008/03/14 16:43:27 tsutsui Exp $ */
+/* $NetBSD: interrupt.c,v 1.4.22.1 2010/02/05 07:39:52 matt Exp $ */
/* $OpenBSD: trap.c,v 1.22 1999/05/24 23:08:59 jason Exp $ */
/*
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.4 2008/03/14 16:43:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.4.22.1 2010/02/05 07:39:52 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -199,10 +199,9 @@
#ifdef __HAVE_FAST_SOFTINTS
/* software interrupts */
- ipending &= (MIPS_SOFT_INT_MASK_1|MIPS_SOFT_INT_MASK_0);
+ ipending &= MIPS_SOFT_INT_MASK;
if (ipending == 0)
return;
- _clrsoftintr(ipending);
- softintr_dispatch(ipending);
+ softint_process(ipending);
#endif
}
Index: src/sys/arch/arc/conf/files.arc
diff -u src/sys/arch/arc/conf/files.arc:1.62 src/sys/arch/arc/conf/files.arc:1.62.28.1
--- src/sys/arch/arc/conf/files.arc:1.62 Wed Feb 20 21:43:33 2008
+++ src/sys/arch/arc/conf/files.arc Fri Feb 5 07:39:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.arc,v 1.62 2008/02/20 21:43:33 drochner Exp $
+# $NetBSD: files.arc,v 1.62.28.1 2010/02/05 07:39:52 matt Exp $
# $OpenBSD: files.arc,v 1.21 1999/09/11 10:20:20 niklas Exp $
#
# maxpartitions must be first item in files.${ARCH}
@@ -79,7 +79,6 @@
file arch/arc/arc/arcbios.c
file arch/mips/mips/mips3_clock.c
-file arch/mips/mips/softintr.c
##
## Machine-independent ATAPI drivers
Index: src/sys/arch/cobalt/cobalt/interrupt.c
diff -u src/sys/arch/cobalt/cobalt/interrupt.c:1.3 src/sys/arch/cobalt/cobalt/interrupt.c:1.3.16.1
--- src/sys/arch/cobalt/cobalt/interrupt.c:1.3 Wed May 14 13:29:27 2008
+++ src/sys/arch/cobalt/cobalt/interrupt.c Fri Feb 5 07:39:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.3 2008/05/14 13:29:27 tsutsui Exp $ */
+/* $NetBSD: interrupt.c,v 1.3.16.1 2010/02/05 07:39:52 matt Exp $ */
/*-
* Copyright (c) 2006 Izumi Tsutsui. All rights reserved.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.3 2008/05/14 13:29:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.3.16.1 2010/02/05 07:39:52 matt Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -472,11 +472,10 @@
#ifdef __HAVE_FAST_SOFTINTS
/* software interrupt */
- ipending &= (MIPS_SOFT_INT_MASK_1|MIPS_SOFT_INT_MASK_0);
+ ipending &= MIPS_SOFT_INT_MASK;
if (ipending == 0)
return;
- _clrsoftintr(ipending);
- softintr_dispatch(ipending);
+ softint_process(ipending);
#endif
}
Index: src/sys/arch/cobalt/conf/files.cobalt
diff -u src/sys/arch/cobalt/conf/files.cobalt:1.33 src/sys/arch/cobalt/conf/files.cobalt:1.33.16.1
--- src/sys/arch/cobalt/conf/files.cobalt:1.33 Wed May 28 14:05:14 2008
+++ src/sys/arch/cobalt/conf/files.cobalt Fri Feb 5 07:39:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.cobalt,v 1.33 2008/05/28 14:05:14 tsutsui Exp $
+# $NetBSD: files.cobalt,v 1.33.16.1 2010/02/05 07:39:52 matt Exp $
maxpartitions 16
@@ -46,8 +46,6 @@
file arch/cobalt/cobalt/interrupt.c
file arch/cobalt/cobalt/machdep.c
-file arch/mips/mips/softintr.c
-
file dev/md_root.c memory_disk_hooks
file dev/cons.c
Index: src/sys/arch/evbmips/conf/WGT624V3
diff -u src/sys/arch/evbmips/conf/WGT624V3:1.3.8.1 src/sys/arch/evbmips/conf/WGT624V3:1.3.8.2
--- src/sys/arch/evbmips/conf/WGT624V3:1.3.8.1 Fri Jan 29 00:16:58 2010
+++ src/sys/arch/evbmips/conf/WGT624V3 Fri Feb 5 07:39:52 2010
@@ -1,10 +1,10 @@
-# $NetBSD: WGT624V3,v 1.3.8.1 2010/01/29 00:16:58 matt Exp $
+# $NetBSD: WGT624V3,v 1.3.8.2 2010/02/05 07:39:52 matt Exp $
include "arch/evbmips/conf/std.atheros"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "AP30-$Revision: 1.3.8.1 $"
+#ident "AP30-$Revision: 1.3.8.2 $"
maxusers 32
@@ -48,7 +48,7 @@
options DDB # kernel dynamic debugger
options DDB_HISTORY_SIZE=100 # enable history editing in DDB
makeoptions DEBUG="-g" # compile full symbol table
-options SYMTAB_SPACE=150000 # size for embedded symbol table
+options SYMTAB_SPACE=300000 # size for embedded symbol table
# Compatibility options
#options COMPAT_43 # compatibility with 4.3BSD binaries
Index: src/sys/arch/evbmips/conf/files.adm5120
diff -u src/sys/arch/evbmips/conf/files.adm5120:1.5.28.1 src/sys/arch/evbmips/conf/files.adm5120:1.5.28.2
--- src/sys/arch/evbmips/conf/files.adm5120:1.5.28.1 Wed Jan 13 01:53:18 2010
+++ src/sys/arch/evbmips/conf/files.adm5120 Fri Feb 5 07:39:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.adm5120,v 1.5.28.1 2010/01/13 01:53:18 matt Exp $
+# $NetBSD: files.adm5120,v 1.5.28.2 2010/02/05 07:39:52 matt Exp $
file arch/evbmips/adm5120/autoconf.c
file arch/evbmips/adm5120/machdep.c
@@ -9,7 +9,6 @@
file arch/mips/mips/mips3_clock.c
file arch/mips/mips/mips3_clockintr.c
-file arch/mips/mips/softintr.c
# System bus
device mainbus { }: gpiobus
Index: src/sys/arch/evbmips/conf/files.alchemy
diff -u src/sys/arch/evbmips/conf/files.alchemy:1.9.28.1 src/sys/arch/evbmips/conf/files.alchemy:1.9.28.2
--- src/sys/arch/evbmips/conf/files.alchemy:1.9.28.1 Wed Jan 13 01:53:18 2010
+++ src/sys/arch/evbmips/conf/files.alchemy Fri Feb 5 07:39:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.alchemy,v 1.9.28.1 2010/01/13 01:53:18 matt Exp $
+# $NetBSD: files.alchemy,v 1.9.28.2 2010/02/05 07:39:52 matt Exp $
# Platform support - select just one, please
defflag opt_alchemy.h ALCHEMY_GENERIC
@@ -26,7 +26,6 @@
file arch/mips/mips/mips3_clock.c
file arch/mips/mips/mips3_clockintr.c
-file arch/mips/mips/softintr.c
# System bus
device mainbus { }
Index: src/sys/arch/evbmips/conf/files.atheros
diff -u src/sys/arch/evbmips/conf/files.atheros:1.6.28.1 src/sys/arch/evbmips/conf/files.atheros:1.6.28.2
--- src/sys/arch/evbmips/conf/files.atheros:1.6.28.1 Wed Jan 13 01:53:18 2010
+++ src/sys/arch/evbmips/conf/files.atheros Fri Feb 5 07:39:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.atheros,v 1.6.28.1 2010/01/13 01:53:18 matt Exp $
+# $NetBSD: files.atheros,v 1.6.28.2 2010/02/05 07:39:52 matt Exp $
file arch/evbmips/atheros/mach_intr.c
@@ -11,7 +11,6 @@
file arch/mips/mips/mips3_clock.c
file arch/mips/mips/mips3_clockintr.c
-file arch/mips/mips/softintr.c
# System bus
device mainbus { }
Index: src/sys/arch/evbmips/conf/files.malta
diff -u src/sys/arch/evbmips/conf/files.malta:1.15.28.2 src/sys/arch/evbmips/conf/files.malta:1.15.28.3
--- src/sys/arch/evbmips/conf/files.malta:1.15.28.2 Wed Jan 13 01:53:18 2010
+++ src/sys/arch/evbmips/conf/files.malta Fri Feb 5 07:39:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.malta,v 1.15.28.2 2010/01/13 01:53:18 matt Exp $
+# $NetBSD: files.malta,v 1.15.28.3 2010/02/05 07:39:52 matt Exp $
file arch/evbmips/malta/malta_bus_io.c
file arch/evbmips/malta/malta_bus_mem.c
@@ -16,7 +16,6 @@
file arch/mips/mips/mips3_clock.c
file arch/mips/mips/mips3_clockintr.c
-file arch/mips/mips/softintr.c
# The autoconfiguration root.
device mainbus { [addr = -1] }
Index: src/sys/arch/evbmips/conf/files.rmixl
diff -u src/sys/arch/evbmips/conf/files.rmixl:1.1.2.4 src/sys/arch/evbmips/conf/files.rmixl:1.1.2.5
--- src/sys/arch/evbmips/conf/files.rmixl:1.1.2.4 Sat Jan 16 23:49:32 2010
+++ src/sys/arch/evbmips/conf/files.rmixl Fri Feb 5 07:39:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.rmixl,v 1.1.2.4 2010/01/16 23:49:32 cliff Exp $
+# $NetBSD: files.rmixl,v 1.1.2.5 2010/02/05 07:39:52 matt Exp $
file arch/evbmips/rmixl/autoconf.c
file arch/evbmips/rmixl/machdep.c
@@ -9,7 +9,6 @@
file arch/mips/mips/mips3_clock.c
file arch/mips/mips/mips3_clockintr.c
-file arch/mips/mips/softintr.c
# The autoconfiguration root.
device mainbus { [node = -1] }
Index: src/sys/arch/evbmips/evbmips/interrupt.c
diff -u src/sys/arch/evbmips/evbmips/interrupt.c:1.11.18.1 src/sys/arch/evbmips/evbmips/interrupt.c:1.11.18.2
--- src/sys/arch/evbmips/evbmips/interrupt.c:1.11.18.1 Mon Nov 23 23:48:58 2009
+++ src/sys/arch/evbmips/evbmips/interrupt.c Fri Feb 5 07:39:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.11.18.1 2009/11/23 23:48:58 cliff Exp $ */
+/* $NetBSD: interrupt.c,v 1.11.18.2 2010/02/05 07:39:52 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.11.18.1 2009/11/23 23:48:58 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.11.18.2 2010/02/05 07:39:52 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -82,7 +82,6 @@
ipending &= (MIPS_SOFT_INT_MASK_1|MIPS_SOFT_INT_MASK_0);
if (ipending == 0)
return;
- _clrsoftintr(ipending);
- softintr_dispatch(ipending);
+ softint_process(ipending);
#endif
}
Index: src/sys/arch/ews4800mips/conf/files.ews4800mips
diff -u src/sys/arch/ews4800mips/conf/files.ews4800mips:1.3 src/sys/arch/ews4800mips/conf/files.ews4800mips:1.3.28.1
--- src/sys/arch/ews4800mips/conf/files.ews4800mips:1.3 Wed Feb 20 21:43:34 2008
+++ src/sys/arch/ews4800mips/conf/files.ews4800mips Fri Feb 5 07:39:53 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.ews4800mips,v 1.3 2008/02/20 21:43:34 drochner Exp $
+# $NetBSD: files.ews4800mips,v 1.3.28.1 2010/02/05 07:39:53 matt Exp $
maxpartitions 16
@@ -6,7 +6,6 @@
include "arch/ews4800mips/conf/majors.ews4800mips"
-file arch/mips/mips/softintr.c
file arch/mips/mips/mips3_clock.c
file arch/ews4800mips/ews4800mips/autoconf.c
Index: src/sys/arch/ews4800mips/ews4800mips/interrupt.c
diff -u src/sys/arch/ews4800mips/ews4800mips/interrupt.c:1.4 src/sys/arch/ews4800mips/ews4800mips/interrupt.c:1.4.18.1
--- src/sys/arch/ews4800mips/ews4800mips/interrupt.c:1.4 Mon Apr 28 20:23:18 2008
+++ src/sys/arch/ews4800mips/ews4800mips/interrupt.c Fri Feb 5 07:39:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.4 2008/04/28 20:23:18 martin Exp $ */
+/* $NetBSD: interrupt.c,v 1.4.18.1 2010/02/05 07:39:53 matt Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.4 2008/04/28 20:23:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.4.18.1 2010/02/05 07:39:53 matt Exp $");
#include <sys/param.h>
#include <sys/intr.h>
@@ -77,10 +77,9 @@
ci->ci_idepth--;
#ifdef __HAVE_FAST_SOFTINTS
- ipending &= (MIPS_SOFT_INT_MASK_1 | MIPS_SOFT_INT_MASK_0);
+ ipending &= MIPS_SOFT_INT_MASK;
if (ipending == 0)
return;
- _clrsoftintr(ipending);
- softintr_dispatch(ipending);
+ softint_process(ipending);
#endif
}
Index: src/sys/arch/hpcmips/tx/tx39icu.c
diff -u src/sys/arch/hpcmips/tx/tx39icu.c:1.25 src/sys/arch/hpcmips/tx/tx39icu.c:1.25.18.1
--- src/sys/arch/hpcmips/tx/tx39icu.c:1.25 Mon Apr 28 20:23:21 2008
+++ src/sys/arch/hpcmips/tx/tx39icu.c Fri Feb 5 07:39:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tx39icu.c,v 1.25 2008/04/28 20:23:21 martin Exp $ */
+/* $NetBSD: tx39icu.c,v 1.25.18.1 2010/02/05 07:39:53 matt Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tx39icu.c,v 1.25 2008/04/28 20:23:21 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tx39icu.c,v 1.25.18.1 2010/02/05 07:39:53 matt Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -304,7 +304,7 @@
}
void
-TX_INTR(u_int32_t status, u_int32_t cause, u_int32_t pc, u_int32_t ipending)
+TX_INTR(u_int32_t status, u_int32_t cause, vaddr_t pc, u_int32_t ipending)
{
struct tx39icu_softc *sc;
tx_chipset_tag_t tc;
@@ -416,8 +416,10 @@
#endif
ci->ci_idepth--;
#ifdef __HAVE_FAST_SOFTINTS
- _splset((status & ~cause & MIPS_HARD_INT_MASK) | MIPS_SR_INT_IE);
- softintr(ipending);
+ ipending &= MIPS_SOFT_INT_MASK;
+ if (ipending == 0)
+ return;
+ softint_process(ipending);
#endif
}
Index: src/sys/arch/hpcmips/vr/vr.c
diff -u src/sys/arch/hpcmips/vr/vr.c:1.51 src/sys/arch/hpcmips/vr/vr.c:1.51.22.1
--- src/sys/arch/hpcmips/vr/vr.c:1.51 Fri Apr 4 12:36:06 2008
+++ src/sys/arch/hpcmips/vr/vr.c Fri Feb 5 07:39:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vr.c,v 1.51 2008/04/04 12:36:06 tsutsui Exp $ */
+/* $NetBSD: vr.c,v 1.51.22.1 2010/02/05 07:39:53 matt Exp $ */
/*-
* Copyright (c) 1999-2002
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vr.c,v 1.51 2008/04/04 12:36:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vr.c,v 1.51.22.1 2010/02/05 07:39:53 matt Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -560,16 +560,10 @@
ci->ci_idepth--;
#ifdef __HAVE_FAST_SOFTINTS
- if (ipending & MIPS_SOFT_INT_MASK_1) {
- _splset(MIPS_INT_MASK_1|MIPS_INT_MASK_0|MIPS_SR_INT_IE);
- softintr(MIPS_SOFT_INT_MASK_1);
- }
-
- if (ipending & MIPS_SOFT_INT_MASK_0) {
- _splset(MIPS_SOFT_INT_MASK_1|MIPS_INT_MASK_1|MIPS_INT_MASK_0|
- MIPS_SR_INT_IE);
- softintr(MIPS_SOFT_INT_MASK_0);
- }
+ ipending &= MIPS_SOFT_INT_MASK;
+ if (ipending == 0)
+ return;
+ softint_process(ipending);
#endif
}
Index: src/sys/arch/mipsco/include/intr.h
diff -u src/sys/arch/mipsco/include/intr.h:1.16 src/sys/arch/mipsco/include/intr.h:1.16.36.1
--- src/sys/arch/mipsco/include/intr.h:1.16 Mon Dec 3 15:33:56 2007
+++ src/sys/arch/mipsco/include/intr.h Fri Feb 5 07:39:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.16 2007/12/03 15:33:56 ad Exp $ */
+/* $NetBSD: intr.h,v 1.16.36.1 2010/02/05 07:39:54 matt Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -58,19 +58,6 @@
#include <mips/locore.h>
/*
- * software simulated interrupt
- */
-#define setsoft(x) do { \
- extern u_int ssir; \
- int _s; \
- \
- _s = splhigh(); \
- ssir |= 1 << (x); \
- _setsoftintr(MIPS_SOFT_INT_MASK_1); \
- splx(_s); \
-} while (0)
-
-/*
* nesting interrupt masks.
*/
#define MIPS_INT_MASK_SPL_SOFT0 MIPS_SOFT_INT_MASK_0
Index: src/sys/arch/mipsco/mipsco/interrupt.c
diff -u src/sys/arch/mipsco/mipsco/interrupt.c:1.6 src/sys/arch/mipsco/mipsco/interrupt.c:1.6.18.1
--- src/sys/arch/mipsco/mipsco/interrupt.c:1.6 Mon Apr 28 20:23:28 2008
+++ src/sys/arch/mipsco/mipsco/interrupt.c Fri Feb 5 07:39:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.6 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: interrupt.c,v 1.6.18.1 2010/02/05 07:39:54 matt Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.6 2008/04/28 20:23:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.6.18.1 2010/02/05 07:39:54 matt Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -60,11 +60,10 @@
#ifdef __HAVE_FAST_SOFTINTS
/* software simulated interrupt */
- if ((ipending & MIPS_SOFT_INT_MASK_1)
- || (ssir && (status & MIPS_SOFT_INT_MASK_1))) {
- _clrsoftintr(MIPS_SOFT_INT_MASK_1);
- softintr_dispatch();
- }
+ ipending &= MIPS_SOFT_INT_MASK;
+ if (ipending == 0)
+ return;
+ softint_process(ipending);
#endif
}
Index: src/sys/arch/newsmips/conf/files.newsmips
diff -u src/sys/arch/newsmips/conf/files.newsmips:1.26 src/sys/arch/newsmips/conf/files.newsmips:1.26.28.1
--- src/sys/arch/newsmips/conf/files.newsmips:1.26 Wed Feb 20 21:43:34 2008
+++ src/sys/arch/newsmips/conf/files.newsmips Fri Feb 5 07:39:53 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.newsmips,v 1.26 2008/02/20 21:43:34 drochner Exp $
+# $NetBSD: files.newsmips,v 1.26.28.1 2010/02/05 07:39:53 matt Exp $
# NEWSMIPS-specific configuration info
@@ -96,8 +96,6 @@
file arch/newsmips/newsmips/cpu_cons.c
file dev/cons.c
-file arch/mips/mips/softintr.c
-
#
# Machine-independent SCSI driver.
#
Index: src/sys/arch/newsmips/newsmips/machdep.c
diff -u src/sys/arch/newsmips/newsmips/machdep.c:1.98.10.3 src/sys/arch/newsmips/newsmips/machdep.c:1.98.10.4
--- src/sys/arch/newsmips/newsmips/machdep.c:1.98.10.3 Mon Feb 1 04:18:31 2010
+++ src/sys/arch/newsmips/newsmips/machdep.c Fri Feb 5 07:39:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.98.10.3 2010/02/01 04:18:31 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.98.10.4 2010/02/05 07:39:53 matt 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.3 2010/02/01 04:18:31 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98.10.4 2010/02/05 07:39:53 matt Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -611,10 +611,9 @@
#ifdef __HAVE_FAST_SOFTINTS
/* software interrupts */
- ipending &= (MIPS_SOFT_INT_MASK_1|MIPS_SOFT_INT_MASK_0);
+ ipending &= MIPS_SOFT_INT_MASK;
if (ipending == 0)
return;
- _clrsoftintr(ipending);
- softintr_dispatch(ipending);
+ softint_process(ipending);
#endif
}
Index: src/sys/arch/pmax/conf/GENERIC
diff -u src/sys/arch/pmax/conf/GENERIC:1.158 src/sys/arch/pmax/conf/GENERIC:1.158.8.1
--- src/sys/arch/pmax/conf/GENERIC:1.158 Sun Aug 10 15:31:21 2008
+++ src/sys/arch/pmax/conf/GENERIC Fri Feb 5 07:39:53 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.158 2008/08/10 15:31:21 tls Exp $
+# $NetBSD: GENERIC,v 1.158.8.1 2010/02/05 07:39:53 matt Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.158 $"
+#ident "GENERIC-$Revision: 1.158.8.1 $"
maxusers 64
@@ -42,6 +42,7 @@
#options DEC_5500 # DECsystem 5500 (kn220)
#options DEC_5800 # DECsystem 58x0 (kn5800)
+makeoptions DEBUG="-g"
# Standard system options
options DDB # in-kernel debugger
#options DDB_HISTORY_SIZE=100 # enable history editing in DDB
Index: src/sys/arch/pmax/conf/files.pmax
diff -u src/sys/arch/pmax/conf/files.pmax:1.111 src/sys/arch/pmax/conf/files.pmax:1.111.28.1
--- src/sys/arch/pmax/conf/files.pmax:1.111 Wed Feb 20 21:43:35 2008
+++ src/sys/arch/pmax/conf/files.pmax Fri Feb 5 07:39:53 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.pmax,v 1.111 2008/02/20 21:43:35 drochner Exp $
+# $NetBSD: files.pmax,v 1.111.28.1 2010/02/05 07:39:53 matt Exp $
# DECstation-specific configuration info
# maxpartitions must be first item in files.${ARCH}.
@@ -122,8 +122,6 @@
file arch/pmax/stand/common/callvec.c
file dev/cons.c
-file arch/mips/mips/softintr.c
-
#
# Workstation console devices
#
Index: src/sys/arch/pmax/pmax/interrupt.c
diff -u src/sys/arch/pmax/pmax/interrupt.c:1.15.18.1 src/sys/arch/pmax/pmax/interrupt.c:1.15.18.2
--- src/sys/arch/pmax/pmax/interrupt.c:1.15.18.1 Mon Feb 1 06:09:21 2010
+++ src/sys/arch/pmax/pmax/interrupt.c Fri Feb 5 07:39:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.15.18.1 2010/02/01 06:09:21 matt Exp $ */
+/* $NetBSD: interrupt.c,v 1.15.18.2 2010/02/05 07:39:53 matt Exp $ */
/*-
* Copyright (c) 2001, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.15.18.1 2010/02/01 06:09:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.15.18.2 2010/02/05 07:39:53 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -106,13 +106,11 @@
ci->ci_idepth--;
-#ifdef notyet
- /* For __HAVE_FAST_SOFTINTS */
- ipending &= (MIPS_SOFT_INT_MASK_1|MIPS_SOFT_INT_MASK_0);
+#ifdef __HAVE_FAST_SOFTINTS
+ ipending &= MIPS_SOFT_INT_MASK;
if (ipending == 0)
return;
- _clrsoftintr(ipending);
- mips_softint_dispatch(ipending);
+ softint_process(ipending);
#endif
return;
Index: src/sys/arch/sbmips/conf/files.sbmips
diff -u src/sys/arch/sbmips/conf/files.sbmips:1.14.28.1 src/sys/arch/sbmips/conf/files.sbmips:1.14.28.2
--- src/sys/arch/sbmips/conf/files.sbmips:1.14.28.1 Thu Jan 14 00:37:26 2010
+++ src/sys/arch/sbmips/conf/files.sbmips Fri Feb 5 07:39:53 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.sbmips,v 1.14.28.1 2010/01/14 00:37:26 matt Exp $
+# $NetBSD: files.sbmips,v 1.14.28.2 2010/02/05 07:39:53 matt Exp $
maxpartitions 8
@@ -14,7 +14,6 @@
file arch/sbmips/sbmips/sb1250_icu.c
file arch/mips/cfe/cfe_api.c
-file arch/mips/mips/softintr.c
file arch/mips/mips/mips3_clock.c
file arch/mips/mips/bus_dma.c
Index: src/sys/arch/sbmips/sbmips/sb1250_icu.c
diff -u src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.2 src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.3
--- src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.2 Mon Nov 23 18:46:50 2009
+++ src/sys/arch/sbmips/sbmips/sb1250_icu.c Fri Feb 5 07:39:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sb1250_icu.c,v 1.9.36.2 2009/11/23 18:46:50 matt Exp $ */
+/* $NetBSD: sb1250_icu.c,v 1.9.36.3 2010/02/05 07:39:53 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.9.36.2 2009/11/23 18:46:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.9.36.3 2010/02/05 07:39:53 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -144,11 +144,10 @@
_splset(MIPS_SR_INT_IE | ((status & ~cause) & MIPS_HARD_INT_MASK));
#ifdef __HAVE_FAST_SOFTINTS
- ipending &= (MIPS_SOFT_INT_MASK_1|MIPS_SOFT_INT_MASK_0);
+ ipending &= MIPS_SOFT_INT_MASK;
if (ipending == 0)
return;
- _clrsoftintr(ipending);
- softintr_dispatch(ipending);
+ softint_process(ipending);
#endif
}
Index: src/sys/arch/sgimips/sgimips/cpu.c
diff -u src/sys/arch/sgimips/sgimips/cpu.c:1.21.36.2 src/sys/arch/sgimips/sgimips/cpu.c:1.21.36.3
--- src/sys/arch/sgimips/sgimips/cpu.c:1.21.36.2 Mon Feb 1 04:18:32 2010
+++ src/sys/arch/sgimips/sgimips/cpu.c Fri Feb 5 07:39:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.21.36.2 2010/02/01 04:18:32 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.21.36.3 2010/02/05 07:39:54 matt Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.21.36.2 2010/02/01 04:18:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.21.36.3 2010/02/05 07:39:54 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -162,11 +162,10 @@
#ifdef __HAVE_FAST_SOFTINTS
/* software interrupt */
- ipending &= (MIPS_SOFT_INT_MASK_1|MIPS_SOFT_INT_MASK_0);
+ ipending &= MIPS_SOFT_INT_MASK;
if (ipending == 0)
return;
- _clrsoftintr(ipending);
- softintr_dispatch(ipending);
+ softint_process(ipending);
#endif
}
