diff options
| author | thorpej <thorpej@NetBSD.org> | 2001-01-14 02:00:37 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2001-01-14 02:00:37 +0000 |
| commit | d85a75f583feeae50135600d5ea8553e1c1194ff (patch) | |
| tree | 9443935c617b064199c227eb475ac74fa48b23ea | |
| parent | 9d68beeb8ed126018ad4cdc976f915f5d869234c (diff) | |
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).
30 files changed, 64 insertions, 45 deletions
diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h index 77d3202f936..cc2a7536a15 100644 --- a/sys/arch/alpha/include/intr.h +++ b/sys/arch/alpha/include/intr.h @@ -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 @@ _splraise(int s) #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 --git a/sys/arch/amiga/include/psl.h b/sys/arch/amiga/include/psl.h index e8ca0db2e16..316292ea165 100644 --- a/sys/arch/amiga/include/psl.h +++ b/sys/arch/amiga/include/psl.h @@ -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 @@ extern u_int16_t amiga_serialspl; #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 --git a/sys/arch/amigappc/include/intr.h b/sys/arch/amigappc/include/intr.h index 1b7ad1ad595..94885960132 100644 --- a/sys/arch/amigappc/include/intr.h +++ b/sys/arch/amigappc/include/intr.h @@ -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 @@ softintr(ipl) * 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 --git a/sys/arch/arc/include/intr.h b/sys/arch/arc/include/intr.h index 2a240ef5595..76aab1ee1e8 100644 --- a/sys/arch/arc/include/intr.h +++ b/sys/arch/arc/include/intr.h @@ -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 @@ extern void _clrsoftintr __P((int)); #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 --git a/sys/arch/arm26/include/intr.h b/sys/arch/arm26/include/intr.h index eaf4ac42eae..1d1420fda22 100644 --- a/sys/arch/arm26/include/intr.h +++ b/sys/arch/arm26/include/intr.h @@ -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 --git a/sys/arch/arm32/include/psl.h b/sys/arch/arm32/include/psl.h index 70ac4419b85..890f5b35c22 100644 --- a/sys/arch/arm32/include/psl.h +++ b/sys/arch/arm32/include/psl.h @@ -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 --git a/sys/arch/atari/include/intr.h b/sys/arch/atari/include/intr.h index 429e419d804..2d697569380 100644 --- a/sys/arch/atari/include/intr.h +++ b/sys/arch/atari/include/intr.h @@ -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 --git a/sys/arch/bebox/include/intr.h b/sys/arch/bebox/include/intr.h index ec9e86318a4..43813beb76b 100644 --- a/sys/arch/bebox/include/intr.h +++ b/sys/arch/bebox/include/intr.h @@ -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 @@ set_sint(pending) #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 --git a/sys/arch/cobalt/include/intr.h b/sys/arch/cobalt/include/intr.h index 1c986ca37af..53b60624116 100644 --- a/sys/arch/cobalt/include/intr.h +++ b/sys/arch/cobalt/include/intr.h @@ -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 @@ extern void _clrsoftintr(int); #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 --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h index a10f5d2761e..1b86a825603 100644 --- a/sys/arch/hp300/include/intr.h +++ b/sys/arch/hp300/include/intr.h @@ -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 @@ extern unsigned short hp300_ipls[]; #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 --git a/sys/arch/hpcmips/include/intr.h b/sys/arch/hpcmips/include/intr.h index 18ba62d1692..8cab8b817e1 100644 --- a/sys/arch/hpcmips/include/intr.h +++ b/sys/arch/hpcmips/include/intr.h @@ -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 @@ void _clrsoftintr __P((int)); #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 --git a/sys/arch/i386/include/intr.h b/sys/arch/i386/include/intr.h index e643c7a42af..c4b912322bb 100644 --- a/sys/arch/i386/include/intr.h +++ b/sys/arch/i386/include/intr.h @@ -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 @@ spllower(ncpl) * 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 --git a/sys/arch/mac68k/include/intr.h b/sys/arch/mac68k/include/intr.h index 98038be911d..d88b7f81243 100644 --- a/sys/arch/mac68k/include/intr.h +++ b/sys/arch/mac68k/include/intr.h @@ -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 @@ extern unsigned short mac68k_ipls[]; #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 --git a/sys/arch/macppc/include/intr.h b/sys/arch/macppc/include/intr.h index e7d2b604824..e34f5ab0109 100644 --- a/sys/arch/macppc/include/intr.h +++ b/sys/arch/macppc/include/intr.h @@ -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 @@ extern int imask[]; * 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 --git a/sys/arch/mipsco/include/intr.h b/sys/arch/mipsco/include/intr.h index a0c936772b6..4783181d556 100644 --- a/sys/arch/mipsco/include/intr.h +++ b/sys/arch/mipsco/include/intr.h @@ -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 @@ extern void _clrsoftintr __P((int)); #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 --git a/sys/arch/mvme68k/include/intr.h b/sys/arch/mvme68k/include/intr.h index bcb38cd4be3..4d03043ea05 100644 --- a/sys/arch/mvme68k/include/intr.h +++ b/sys/arch/mvme68k/include/intr.h @@ -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 --git a/sys/arch/news68k/include/intr.h b/sys/arch/news68k/include/intr.h index 92b86b2c798..faaafa12948 100644 --- a/sys/arch/news68k/include/intr.h +++ b/sys/arch/news68k/include/intr.h @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.5 2000/11/24 14:08:14 tsutsui Exp $ */ +/* $NetBSD: intr.h,v 1.6 2001/01/14 02:00:41 thorpej Exp $ */ /* * @@ -57,10 +57,10 @@ #define splnet() splraise4() #define spltty() splraise5() #define splimp() splraise5() +#define splvm() splraise5() #define splserial() splraise5() #define splclock() splraise6() #define splstatclock() splclock() -#define splvm() spl6() #define splhigh() spl7() #define splsched() spl7() #define spllock() spl7() diff --git a/sys/arch/newsmips/include/intr.h b/sys/arch/newsmips/include/intr.h index ec6f8ced566..a56b8624691 100644 --- a/sys/arch/newsmips/include/intr.h +++ b/sys/arch/newsmips/include/intr.h @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.9 2000/08/22 19:46:30 thorpej Exp $ */ +/* $NetBSD: intr.h,v 1.10 2001/01/14 02:00:41 thorpej Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -92,6 +92,7 @@ extern void _clrsoftintr __P((int)); #define splnet() _splraise(MIPS_INT_MASK_SPL1) #define spltty() _splraise(MIPS_INT_MASK_SPL1) #define splimp() _splraise(MIPS_INT_MASK_SPL1) +#define splvm() _splraise(MIPS_INT_MASK_SPL1) #define splclock() _splraise(MIPS_INT_MASK_SPL2) #define splstatclock() _splraise(MIPS_INT_MASK_SPL2) #define splhigh() _splraise(MIPS_INT_MASK_SPL2) diff --git a/sys/arch/next68k/include/intr.h b/sys/arch/next68k/include/intr.h index 38a04f55016..ff01f804b33 100644 --- a/sys/arch/next68k/include/intr.h +++ b/sys/arch/next68k/include/intr.h @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.8 2000/08/22 19:46:30 thorpej Exp $ */ +/* $NetBSD: intr.h,v 1.9 2001/01/14 02:00:41 thorpej Exp $ */ /* * Copyright (C) 1997 Scott Reynolds @@ -51,6 +51,7 @@ #define splclock() _splraise(PSL_S|PSL_IPL6) #define splstatclock() splclock() #define splimp() _splraise(PSL_S|PSL_IPL6) +#define splvm() _splraise(PSL_S|PSL_IPL6) #define spltty() _splraise(PSL_S|PSL_IPL3) #define splbio() _splraise(PSL_S|PSL_IPL3) #define splnet() _splraise(PSL_S|PSL_IPL3) diff --git a/sys/arch/ofppc/include/cpu.h b/sys/arch/ofppc/include/cpu.h index e097ffb4e08..5172923444b 100644 --- a/sys/arch/ofppc/include/cpu.h +++ b/sys/arch/ofppc/include/cpu.h @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.12 2000/12/14 10:33:42 mycroft Exp $ */ +/* $NetBSD: cpu.h,v 1.13 2001/01/14 02:00:41 thorpej Exp $ */ /* * Copyright (C) 1995-1997 Wolfgang Solfrank. @@ -81,6 +81,7 @@ extern struct machvec machine_interface; #define splnet() ((*machine_interface.splnet)()) #define spltty() ((*machine_interface.spltty)()) #define splimp() ((*machine_interface.splimp)()) +#define splvm() ((*machine_interface.splimp)()) #define splclock() ((*machine_interface.splclock)()) #define spllowersoftclock() ((*machine_interface.spllowersoftclock)()) #define splsoftclock() ((*machine_interface.splsoftclock)()) diff --git a/sys/arch/pc532/include/psl.h b/sys/arch/pc532/include/psl.h index 255dcd0d8f5..52e780744d1 100644 --- a/sys/arch/pc532/include/psl.h +++ b/sys/arch/pc532/include/psl.h @@ -1,4 +1,4 @@ -/* $NetBSD: psl.h,v 1.24 2000/12/19 16:24:43 matthias Exp $ */ +/* $NetBSD: psl.h,v 1.25 2001/01/14 02:00:41 thorpej Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -184,6 +184,7 @@ splx(ncpl) #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 splrtty() splraise(imask[IPL_RTTY]) #define splstatclock() splclock() diff --git a/sys/arch/pmax/include/intr.h b/sys/arch/pmax/include/intr.h index ce146730cd2..51b5a99f05d 100644 --- a/sys/arch/pmax/include/intr.h +++ b/sys/arch/pmax/include/intr.h @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.17 2000/08/22 19:46:31 thorpej Exp $ */ +/* $NetBSD: intr.h,v 1.18 2001/01/14 02:00:41 thorpej Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -63,7 +63,7 @@ void _clrsoftintr __P((int)); #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 --git a/sys/arch/prep/include/intr.h b/sys/arch/prep/include/intr.h index 8010247595f..0983a88119a 100644 --- a/sys/arch/prep/include/intr.h +++ b/sys/arch/prep/include/intr.h @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.5 2000/11/22 08:55:36 matt Exp $ */ +/* $NetBSD: intr.h,v 1.6 2001/01/14 02:00:42 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -172,6 +172,7 @@ set_sint(pending) #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 splaudio() splraise(imask[IPL_AUDIO]) #define splserial() splraise(imask[IPL_SERIAL]) #define splstatclock() splclock() diff --git a/sys/arch/sgimips/include/intr.h b/sys/arch/sgimips/include/intr.h index f8f20c40b31..a83cf014ef9 100644 --- a/sys/arch/sgimips/include/intr.h +++ b/sys/arch/sgimips/include/intr.h @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.4 2000/08/22 19:46:32 thorpej Exp $ */ +/* $NetBSD: intr.h,v 1.5 2001/01/14 02:00:42 thorpej Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang @@ -87,6 +87,7 @@ extern u_int32_t clockmask; #define splnet() _splraise(netmask) #define spltty() _splraise(ttymask) #define splimp() spltty() +#define splvm() spltty() #define splclock() _splraise(clockmask) #define splstatclock() splclock() #define spllowersoftclock() _spllower(MIPS_SOFT_INT_MASK_0) diff --git a/sys/arch/sh3/include/intr.h b/sys/arch/sh3/include/intr.h index 06aec8e5690..9a65f30b69d 100644 --- a/sys/arch/sh3/include/intr.h +++ b/sys/arch/sh3/include/intr.h @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.9 2000/08/22 19:46:31 thorpej Exp $ */ +/* $NetBSD: intr.h,v 1.10 2001/01/14 02:00:42 thorpej Exp $ */ /* * Copyright (c) 1996, 1997 Charles M. Hannum. All rights reserved. @@ -110,6 +110,7 @@ spllower(ncpl) * 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 --git a/sys/arch/sparc/include/psl.h b/sys/arch/sparc/include/psl.h index 49e0406971a..a74a73c4dfd 100644 --- a/sys/arch/sparc/include/psl.h +++ b/sys/arch/sparc/include/psl.h @@ -1,4 +1,4 @@ -/* $NetBSD: psl.h,v 1.23 2000/08/22 19:46:31 thorpej Exp $ */ +/* $NetBSD: psl.h,v 1.24 2001/01/14 02:00:42 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -200,7 +200,7 @@ _SPLRAISE(spltty, PIL_TTY) * Memory allocation (must be as high as highest network, tty, or disk device) */ _SPLRAISE(splimp, 7) -_SPLRAISE(splpmap, 7) +_SPLRAISE(splvm, 7) /* clock interrupts at level 10 */ _SPLRAISE(splclock, PIL_CLOCK) diff --git a/sys/arch/sparc64/include/psl.h b/sys/arch/sparc64/include/psl.h index 2477e92ce96..8e07ef6c694 100644 --- a/sys/arch/sparc64/include/psl.h +++ b/sys/arch/sparc64/include/psl.h @@ -1,4 +1,4 @@ -/* $NetBSD: psl.h,v 1.17 2000/12/29 18:37:05 eeh Exp $ */ +/* $NetBSD: psl.h,v 1.18 2001/01/14 02:00:42 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -388,7 +388,7 @@ SPLHOLD(spllpt, PIL_LPT) * Memory allocation (must be as high as highest network, tty, or disk device) */ SPLHOLD(splimp, PIL_IMP) -SPLHOLD(splpmap, PIL_IMP) +SPLHOLD(splvm, PIL_IMP) SPLHOLD(splclock, PIL_CLOCK) @@ -435,7 +435,7 @@ static __inline void splx(newpil) #define spltty() splttyX(__FILE__, __LINE__) #define spllpt() spllptX(__FILE__, __LINE__) #define splimp() splimpX(__FILE__, __LINE__) -#define splpmap() splpmapX(__FILE__, __LINE__) +#define splvm() splvmX(__FILE__, __LINE__) #define splclock() splclockX(__FILE__, __LINE__) #define splfd() splfdX(__FILE__, __LINE__) #define splzs() splzsX(__FILE__, __LINE__) diff --git a/sys/arch/sun3/include/psl.h b/sys/arch/sun3/include/psl.h index 80db3f6a6fc..106e3492ecf 100644 --- a/sys/arch/sun3/include/psl.h +++ b/sys/arch/sun3/include/psl.h @@ -1,4 +1,4 @@ -/* $NetBSD: psl.h,v 1.16 2000/08/22 19:46:32 thorpej Exp $ */ +/* $NetBSD: psl.h,v 1.17 2001/01/14 02:00:42 thorpej Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -92,12 +92,13 @@ _getsr(void) /* * Requirement: imp >= (highest network, tty, or disk IPL) - * This is used mostly in the VM code. (Why not splvm?) + * This is used mostly in the VM code. * Note that the VM code runs at spl7 during kernel * initialization, and later at spl0, so we have to * use splraise to avoid enabling interrupts early. */ #define splimp() _splraise(PSL_S|PSL_IPL4) +#define splvm() _splraise(PSL_S|PSL_IPL4) /* Intersil clock hardware interrupts (hard-wired at 5) */ #define splclock() splraise5() diff --git a/sys/arch/vax/include/intr.h b/sys/arch/vax/include/intr.h index be5dda0f22f..c910ab8f5b4 100644 --- a/sys/arch/vax/include/intr.h +++ b/sys/arch/vax/include/intr.h @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.7 2000/08/22 19:46:32 thorpej Exp $ */ +/* $NetBSD: intr.h,v 1.8 2001/01/14 02:00:43 thorpej Exp $ */ /* * Copyright (c) 1998 Matt Thomas. @@ -116,6 +116,7 @@ do { \ #define splnet() _splraise(IPL_NET) /* IPL15 */ #define spltty() _splraise(IPL_TTY) /* IPL15 */ #define splimp() _splraise(IPL_IMP) /* IPL17 */ +#define splvm() _splraise(IPL_IMP) /* IPL17 */ #define splclock() _splraise(IPL_CLOCK) /* IPL18 */ #define splhigh() _splraise(IPL_HIGH) /* IPL1F */ #define splstatclock() splclock() diff --git a/sys/arch/x68k/include/intr.h b/sys/arch/x68k/include/intr.h index 2bada961c92..2a60a0edded 100644 --- a/sys/arch/x68k/include/intr.h +++ b/sys/arch/x68k/include/intr.h @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.6 2000/08/22 19:46:32 thorpej Exp $ */ +/* $NetBSD: intr.h,v 1.7 2001/01/14 02:00:43 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -52,12 +52,12 @@ void spl0 __P((void)); #define splsoftnet() splraise1() /* disallow softnet */ #define splnet() _splraise(PSL_S|PSL_IPL4) /* disallow network */ #define splbio() _splraise(PSL_S|PSL_IPL3) /* disallow block I/O */ -#define splimp() _splraise(PSL_S|PSL_IPL4) /* disallow imput */ #define spltty() _splraise(PSL_S|PSL_IPL4) /* disallow tty interrupts */ +#define splimp() _splraise(PSL_S|PSL_IPL4) /* disallow vm */ +#define splvm() _splraise(PSL_S|PSL_IPL4) /* disallow vm */ #define splzs() splraise5() /* disallow serial interrupts */ #define splclock() splraise6() /* disallow clock interrupt */ #define splstatclock() splraise6() /* disallow clock interrupt */ -#define splvm() _splraise(PSL_S|PSL_IPL4) /* disallow virtual memory operations */ #define splhigh() spl7() /* disallow everything */ #define splsched() spl7() /* disallow scheduling */ #define spllock() spl7() /* disallow scheduling */ |
