Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Make sure everybody has an splvm() and equate it wi...
details: https://anonhg.NetBSD.org/src/rev/f3f23fcf4f5e
branches: trunk
changeset: 502221:f3f23fcf4f5e
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sun Jan 14 02:00:37 2001 +0000
description:
Make sure everybody has an splvm() and equate it with splimp() (splimp()
is the historical name for this interrupt level, and the historical name
is going to go away in the near future).
diffstat:
sys/arch/alpha/include/intr.h | 3 ++-
sys/arch/amiga/include/psl.h | 5 ++---
sys/arch/amigappc/include/intr.h | 3 ++-
sys/arch/arc/include/intr.h | 4 ++--
sys/arch/arm26/include/intr.h | 3 ++-
sys/arch/arm32/include/psl.h | 3 ++-
sys/arch/atari/include/intr.h | 4 ++--
sys/arch/bebox/include/intr.h | 3 ++-
sys/arch/cobalt/include/intr.h | 3 ++-
sys/arch/hp300/include/intr.h | 3 ++-
sys/arch/hpcmips/include/intr.h | 4 ++--
sys/arch/i386/include/intr.h | 3 ++-
sys/arch/mac68k/include/intr.h | 3 ++-
sys/arch/macppc/include/intr.h | 3 ++-
sys/arch/mipsco/include/intr.h | 5 +++--
sys/arch/mvme68k/include/intr.h | 4 ++--
sys/arch/news68k/include/intr.h | 4 ++--
sys/arch/newsmips/include/intr.h | 3 ++-
sys/arch/next68k/include/intr.h | 3 ++-
sys/arch/ofppc/include/cpu.h | 3 ++-
sys/arch/pc532/include/psl.h | 3 ++-
sys/arch/pmax/include/intr.h | 4 ++--
sys/arch/prep/include/intr.h | 3 ++-
sys/arch/sgimips/include/intr.h | 3 ++-
sys/arch/sh3/include/intr.h | 3 ++-
sys/arch/sparc/include/psl.h | 4 ++--
sys/arch/sparc64/include/psl.h | 6 +++---
sys/arch/sun3/include/psl.h | 5 +++--
sys/arch/vax/include/intr.h | 3 ++-
sys/arch/x68k/include/intr.h | 6 +++---
30 files changed, 64 insertions(+), 45 deletions(-)
diffs (truncated from 566 to 300 lines):
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/alpha/include/intr.h
--- a/sys/arch/alpha/include/intr.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/alpha/include/intr.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.37 2000/11/22 08:39:53 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.38 2001/01/14 02:00:37 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -140,6 +140,7 @@
#define splnet() _splraise(ALPHA_PSL_IPL_IO)
#define splbio() _splraise(ALPHA_PSL_IPL_IO)
#define splimp() _splraise(ALPHA_PSL_IPL_IO)
+#define splvm() _splraise(ALPHA_PSL_IPL_IO)
#define spltty() _splraise(ALPHA_PSL_IPL_IO)
#define splserial() _splraise(ALPHA_PSL_IPL_IO)
#define splclock() _splraise(ALPHA_PSL_IPL_CLOCK)
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/amiga/include/psl.h
--- a/sys/arch/amiga/include/psl.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/amiga/include/psl.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.15 2000/08/22 19:46:27 thorpej Exp $ */
+/* $NetBSD: psl.h,v 1.16 2001/01/14 02:00:38 thorpej Exp $ */
#ifndef _MACHINE_PSL_H_
#define _MACHINE_PSL_H_
@@ -34,18 +34,17 @@
#define splserial() _splraise(amiga_serialspl)
#define spltty() splraise4()
#define splimp() spltty() /* XXX for the full story, see i386 */
+#define splvm() splimp()
#ifndef LEV6_DEFER
#define splclock() splraise6()
#define splstatclock() splraise6()
-#define splvm() splraise6()
#define splhigh() spl7()
#define splsched() spl7()
#define spllock() spl7()
#else
#define splclock() splraise4()
#define splstatclock() splraise4()
-#define splvm() splraise4()
#define splhigh() splraise4()
#define splsched() splraise4()
#define spllock() splraise4()
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/amigappc/include/intr.h
--- a/sys/arch/amigappc/include/intr.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/amigappc/include/intr.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.3 2000/08/22 19:46:31 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.4 2001/01/14 02:00:38 thorpej Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -226,6 +226,7 @@
* Miscellaneous
*/
#define splimp() splraise(imask[IPL_IMP])
+#define splvm() splraise(imask[IPL_IMP])
#define splhigh() splraise(imask[IPL_HIGH])
#define splsched() splhigh()
#define spllock() splhigh()
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/arc/include/intr.h
--- a/sys/arch/arc/include/intr.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/arc/include/intr.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.6 2000/08/22 19:46:27 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.7 2001/01/14 02:00:38 thorpej Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -97,7 +97,7 @@
#define splnet() (_splraise(splvec.splnet))
#define spltty() (_splraise(splvec.spltty))
#define splimp() (_splraise(splvec.splimp))
-#define splpmap() (_splraise(splvec.splimp))
+#define splvm() (_splraise(splvec.splimp))
#define splclock() (_splraise(splvec.splclock))
#define splstatclock() (_splraise(splvec.splstatclock))
#define splhigh() _splraise(MIPS_INT_MASK_SPLHIGH)
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/arm26/include/intr.h
--- a/sys/arch/arm26/include/intr.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/arm26/include/intr.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.4 2000/08/25 16:43:47 bjh21 Exp $ */
+/* $NetBSD: intr.h,v 1.5 2001/01/14 02:00:38 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2000 Ben Harris
* All rights reserved.
@@ -70,6 +70,7 @@
#define spltty() raisespl(IPL_TTY)
#define spllpt() raisespl(IPL_LPT)
#define splimp() raisespl(IPL_IMP)
+#define splvm() raisespl(IPL_IMP)
#define splaudio() raisespl(IPL_AUDIO)
#define splserial() raisespl(IPL_SERIAL)
#define splclock() raisespl(IPL_CLOCK)
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/arm32/include/psl.h
--- a/sys/arch/arm32/include/psl.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/arm32/include/psl.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.14 2000/08/22 19:46:28 thorpej Exp $ */
+/* $NetBSD: psl.h,v 1.15 2001/01/14 02:00:39 thorpej Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -76,6 +76,7 @@
#define spltty() raisespl(_SPL_TTY)
#define spllpt() spltty()
#define splimp() raisespl(_SPL_IMP)
+#define splvm() raisespl(_SPL_IMP)
#define splaudio() raisespl(_SPL_AUDIO)
#define splclock() raisespl(_SPL_CLOCK)
#define splstatclock() raisespl(_SPL_CLOCK)
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/atari/include/intr.h
--- a/sys/arch/atari/include/intr.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/atari/include/intr.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.9 2000/08/22 19:46:28 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.10 2001/01/14 02:00:39 thorpej Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -66,12 +66,12 @@
#define splnet() _splraise(PSL_S|PSL_IPL3)
#define spltty() _splraise(PSL_S|PSL_IPL4)
#define splimp() _splraise(PSL_S|PSL_IPL4)
+#define splvm() _splraise(PSL_S|PSL_IPL4)
#define spllpt() spltty()
#define splclock() splraise6()
#define splstatclock() splraise6()
-#define splvm() splraise6()
#define splhigh() spl7()
#define splsched() spl7()
#define spllock() spl7()
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/bebox/include/intr.h
--- a/sys/arch/bebox/include/intr.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/bebox/include/intr.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.11 2000/08/22 19:46:28 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.12 2001/01/14 02:00:39 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -176,6 +176,7 @@
#define spltty() splraise(imask[IPL_TTY])
#define splclock() splraise(imask[IPL_CLOCK])
#define splimp() splraise(imask[IPL_IMP])
+#define splvm() splraise(imask[IPL_IMP])
#define splserial() splraise(imask[IPL_SERIAL])
#define splstatclock() splclock()
#define spllowersoftclock() spllower(imask[IPL_SOFTCLOCK])
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/cobalt/include/intr.h
--- a/sys/arch/cobalt/include/intr.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/cobalt/include/intr.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.8 2000/08/22 19:46:28 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.9 2001/01/14 02:00:39 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -79,6 +79,7 @@
#define spltty() _splraise(SPLTTY)
#define splclock() _splraise(SPLCLOCK)
#define splimp() splclock()
+#define splvm() splclock()
#define splstatclock() splclock()
#define splsoftclock() _splraise(MIPS_SOFT_INT_MASK_0)
#define splsoftnet() _splraise(MIPS_SOFT_INT_MASK_0|MIPS_SOFT_INT_MASK_1)
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/hp300/include/intr.h
--- a/sys/arch/hp300/include/intr.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/hp300/include/intr.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.9 2000/08/22 19:46:29 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.10 2001/01/14 02:00:39 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999 The NetBSD Foundation, Inc.
@@ -113,6 +113,7 @@
#define splnet() _splraise(hp300_ipls[HP300_IPL_NET])
#define spltty() _splraise(hp300_ipls[HP300_IPL_TTY])
#define splimp() _splraise(hp300_ipls[HP300_IPL_IMP])
+#define splvm() _splraise(hp300_ipls[HP300_IPL_IMP])
#define splclock() spl6()
#define splstatclock() splclock()
#define splhigh() spl7()
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/hpcmips/include/intr.h
--- a/sys/arch/hpcmips/include/intr.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/hpcmips/include/intr.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.7 2000/08/22 19:46:29 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.8 2001/01/14 02:00:40 thorpej Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -71,7 +71,7 @@
#define splnet() (_splraise(splvec.splnet))
#define spltty() (_splraise(splvec.spltty))
#define splimp() (_splraise(splvec.splimp))
-#define splpmap() (_splraise(splvec.splimp))
+#define splvm() (_splraise(splvec.splimp))
#define splclock() (_splraise(splvec.splclock))
#define splstatclock() (_splraise(splvec.splstatclock))
#define spllowersoftclock() _spllower(MIPS_SOFT_INT_MASK_0)
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/i386/include/intr.h
--- a/sys/arch/i386/include/intr.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/i386/include/intr.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.16 2000/08/22 19:46:29 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.17 2001/01/14 02:00:40 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -134,6 +134,7 @@
* Miscellaneous
*/
#define splimp() splraise(imask[IPL_IMP])
+#define splvm() splraise(imask[IPL_IMP])
#define splhigh() splraise(imask[IPL_HIGH])
#define splsched() splhigh()
#define spllock() splhigh()
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/mac68k/include/intr.h
--- a/sys/arch/mac68k/include/intr.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/mac68k/include/intr.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.18 2000/08/22 19:46:29 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.19 2001/01/14 02:00:40 thorpej Exp $ */
/*
* Copyright (C) 1997 Scott Reynolds
@@ -72,6 +72,7 @@
#define splbio() _splraise(mac68k_ipls[MAC68K_IPL_BIO])
#define splnet() _splraise(mac68k_ipls[MAC68K_IPL_NET])
#define splimp() _splraise(mac68k_ipls[MAC68K_IPL_IMP])
+#define splvm() _splraise(mac68k_ipls[MAC68K_IPL_IMP])
#define splaudio() _splraise(mac68k_ipls[MAC68K_IPL_AUDIO])
#define splclock() _splraise(mac68k_ipls[MAC68K_IPL_CLOCK])
#define splstatclock() _splraise(mac68k_ipls[MAC68K_IPL_STATCLOCK])
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/macppc/include/intr.h
--- a/sys/arch/macppc/include/intr.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/macppc/include/intr.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.9 2000/11/29 17:55:52 tsubai Exp $ */
+/* $NetBSD: intr.h,v 1.10 2001/01/14 02:00:40 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -126,6 +126,7 @@
* Miscellaneous
*/
#define splimp() splraise(imask[IPL_IMP])
+#define splvm() splraise(imask[IPL_IMP])
#define splhigh() splraise(imask[IPL_HIGH])
#define splsched() splhigh()
#define spllock() splhigh()
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/mipsco/include/intr.h
--- a/sys/arch/mipsco/include/intr.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/mipsco/include/intr.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.4 2000/08/22 19:46:31 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.5 2001/01/14 02:00:40 thorpej Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -102,7 +102,8 @@
#define splbio() _splraise(MIPS_INT_MASK_SPL1)
#define splnet() _splraise(MIPS_INT_MASK_SPL0)
#define spltty() _splraise(MIPS_INT_MASK_SPL0)
-#define splimp() _splraise(MIPS_INT_MASK_SPL0)
+#define splimp() _splraise(MIPS_INT_MASK_SPL2)
+#define splvm() _splraise(MIPS_INT_MASK_SPL2)
#define splclock() _splraise(MIPS_INT_MASK_SPL2)
#define splstatclock() _splraise(MIPS_INT_MASK_SPL2)
#define splhigh() _splraise(MIPS_INT_MASK_SPL2)
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/mvme68k/include/intr.h
--- a/sys/arch/mvme68k/include/intr.h Sun Jan 14 01:44:22 2001 +0000
+++ b/sys/arch/mvme68k/include/intr.h Sun Jan 14 02:00:37 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.6 2000/12/10 18:43:02 scw Exp $ */
+/* $NetBSD: intr.h,v 1.7 2001/01/14 02:00:40 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -82,10 +82,10 @@
#define splnet() splraise3()
#define spltty() splraise3()
#define splimp() splraise3()
+#define splvm() splraise3()
#define splserial() splraise4()
#define splclock() splraise5()
#define splstatclock() splraise5()
-#define splvm() splraise5()
#define splhigh() spl7()
#define splsched() spl7()
#define spllock() spl7()
diff -r 406f289702b4 -r f3f23fcf4f5e sys/arch/news68k/include/intr.h
--- a/sys/arch/news68k/include/intr.h Sun Jan 14 01:44:22 2001 +0000
Home |
Main Index |
Thread Index |
Old Index