summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/include/intr.h3
-rw-r--r--sys/arch/amd64/include/intr.h7
-rw-r--r--sys/arch/arm/footbridge/footbridge_intr.h3
-rw-r--r--sys/arch/hp300/include/intr.h3
-rw-r--r--sys/arch/hppa/include/intr.h3
-rw-r--r--sys/arch/hppa64/include/cpu.h3
-rw-r--r--sys/arch/i386/include/intr.h6
-rw-r--r--sys/arch/m88k/include/intr.h3
-rw-r--r--sys/arch/mvme68k/include/intr.h3
-rw-r--r--sys/arch/powerpc/include/intr.h3
-rw-r--r--sys/arch/sgi/include/intr.h3
-rw-r--r--sys/arch/sparc/include/psl.h3
-rw-r--r--sys/arch/sparc64/include/psl.h5
-rw-r--r--sys/arch/vax/include/param.h3
-rw-r--r--sys/arch/zaurus/include/intr.h3
15 files changed, 15 insertions, 39 deletions
diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h
index 7b6713debfa..ca437f2b76f 100644
--- a/sys/arch/alpha/include/intr.h
+++ b/sys/arch/alpha/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.19 2004/08/16 16:43:52 art Exp $ */
+/* $OpenBSD: intr.h,v 1.20 2005/04/19 15:29:47 mickey Exp $ */
/* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */
/*-
@@ -115,7 +115,6 @@
/* IPL-lowering/restoring macros */
#define splx(s) \
((s) == ALPHA_PSL_IPL_0 ? spl0() : alpha_pal_swpipl(s))
-#define spllowersoftclock() alpha_pal_swpipl(ALPHA_PSL_IPL_SOFT)
/* IPL-raising functions/macros */
int _splraise(int);
diff --git a/sys/arch/amd64/include/intr.h b/sys/arch/amd64/include/intr.h
index cba5f9e11f1..40eb7e73049 100644
--- a/sys/arch/amd64/include/intr.h
+++ b/sys/arch/amd64/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.5 2004/06/28 01:52:26 deraadt Exp $ */
+/* $OpenBSD: intr.h,v 1.6 2005/04/19 15:29:47 mickey Exp $ */
/* $NetBSD: intr.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $ */
/*-
@@ -150,12 +150,7 @@ void softintr(int);
/*
* Software interrupt masks
- *
- * NOTE: spllowersoftclock() is used by hardclock() to lower the priority from
- * clock to softclock before it calls softclock().
*/
-#define spllowersoftclock() spllower(IPL_SOFTCLOCK)
-
#define splsoftclock() splraise(IPL_SOFTCLOCK)
#define splsoftnet() splraise(IPL_SOFTNET)
#define splsoftserial() splraise(IPL_SOFTSERIAL)
diff --git a/sys/arch/arm/footbridge/footbridge_intr.h b/sys/arch/arm/footbridge/footbridge_intr.h
index 5aeb85abbdc..da4d9b87970 100644
--- a/sys/arch/arm/footbridge/footbridge_intr.h
+++ b/sys/arch/arm/footbridge/footbridge_intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: footbridge_intr.h,v 1.3 2004/08/17 19:40:45 drahn Exp $ */
+/* $OpenBSD: footbridge_intr.h,v 1.4 2005/04/19 15:29:47 mickey Exp $ */
/* $NetBSD: footbridge_intr.h,v 1.4 2003/01/03 00:56:00 thorpej Exp $ */
/*
@@ -181,7 +181,6 @@ void _setsoftintr(int);
#define splserial() _splraise(IPL_SERIAL)
#define spl0() (void)_spllower(IPL_NONE)
-#define spllowersoftclock() (void)_spllower(IPL_SOFTCLOCK)
#define splsched() splhigh()
#define spllock() splhigh()
diff --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h
index 0b17340d699..4b97d69e245 100644
--- a/sys/arch/hp300/include/intr.h
+++ b/sys/arch/hp300/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.14 2005/01/14 22:39:29 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.15 2005/04/19 15:29:47 mickey Exp $ */
/* $NetBSD: intr.h,v 1.2 1997/07/24 05:43:08 scottr Exp $ */
/*-
@@ -126,7 +126,6 @@ extern unsigned short hp300_impipl;
#define IPL_HIGH 7
/* These spl calls are used by machine-independent code. */
-#define spllowersoftclock() spl1()
#define splsoftclock() spl1()
#define splsoftnet() spl1()
#define splbio() _splraise(hp300_bioipl)
diff --git a/sys/arch/hppa/include/intr.h b/sys/arch/hppa/include/intr.h
index 9f58301fc70..84aca5a71dc 100644
--- a/sys/arch/hppa/include/intr.h
+++ b/sys/arch/hppa/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.18 2004/09/15 21:28:34 mickey Exp $ */
+/* $OpenBSD: intr.h,v 1.19 2005/04/19 15:29:47 mickey Exp $ */
/*
* Copyright (c) 2002-2004 Michael Shalayeff
@@ -103,7 +103,6 @@ splx(int ncpl)
(void)spllower(ncpl);
}
-#define spllowersoftclock() spllower(IPL_SOFTCLOCK)
#define splsoftclock() splraise(IPL_SOFTCLOCK)
#define splsoftnet() splraise(IPL_SOFTNET)
#define splbio() splraise(IPL_BIO)
diff --git a/sys/arch/hppa64/include/cpu.h b/sys/arch/hppa64/include/cpu.h
index 41aec18205d..8de00e76eb8 100644
--- a/sys/arch/hppa64/include/cpu.h
+++ b/sys/arch/hppa64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.1 2005/04/01 10:40:48 mickey Exp $ */
+/* $OpenBSD: cpu.h,v 1.2 2005/04/19 15:29:48 mickey Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -94,7 +94,6 @@
#define IST_EDGE 2
#define IST_LEVEL 3
-#define spllowersoftclock() spllower(IPL_SOFTCLOCK)
#define splsoftclock() splraise(IPL_SOFTCLOCK)
#define splsoftnet() splraise(IPL_SOFTNET)
#define splbio() splraise(IPL_BIO)
diff --git a/sys/arch/i386/include/intr.h b/sys/arch/i386/include/intr.h
index f076a9eb48a..a2484b9051b 100644
--- a/sys/arch/i386/include/intr.h
+++ b/sys/arch/i386/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.24 2005/01/07 02:03:17 pascoe Exp $ */
+/* $OpenBSD: intr.h,v 1.25 2005/04/19 15:29:47 mickey Exp $ */
/* $NetBSD: intr.h,v 1.5 1996/05/13 06:11:28 mycroft Exp $ */
/*
@@ -115,11 +115,7 @@ void splassert_check(int, const char *);
/*
* Software interrupt masks
- *
- * NOTE: spllowersoftclock() is used by hardclock() to lower the priority from
- * clock to softclock before it calls softclock().
*/
-#define spllowersoftclock() spllower(IPL_SOFTCLOCK)
#define splsoftclock() splraise(IPL_SOFTCLOCK)
#define splsoftnet() splraise(IPL_SOFTNET)
#define splsofttty() splraise(IPL_SOFTTTY)
diff --git a/sys/arch/m88k/include/intr.h b/sys/arch/m88k/include/intr.h
index bd0592858b9..59871103575 100644
--- a/sys/arch/m88k/include/intr.h
+++ b/sys/arch/m88k/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.1 2004/04/26 12:34:05 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.2 2005/04/19 15:29:47 mickey Exp $ */
/*
* Copyright (C) 2000 Steve Murphree, Jr.
* All rights reserved.
@@ -66,7 +66,6 @@ void splassert_check(int, const char *);
#define spl7() setipl(7)
#define splnone spl0
-#define spllowersoftclock() setipl(IPL_SOFTCLOCK)
#define splsoftclock() setipl(IPL_SOFTCLOCK)
#define splsoftnet() setipl(IPL_SOFTNET)
#define splbio() raiseipl(IPL_BIO)
diff --git a/sys/arch/mvme68k/include/intr.h b/sys/arch/mvme68k/include/intr.h
index 22bac12390e..6e2e10726a0 100644
--- a/sys/arch/mvme68k/include/intr.h
+++ b/sys/arch/mvme68k/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.10 2004/01/11 23:51:49 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.11 2005/04/19 15:29:47 mickey Exp $ */
/*
* Copyright (C) 2000 Steve Murphree, Jr.
* All rights reserved.
@@ -101,7 +101,6 @@ u_long allocate_sir(void (*proc)(void *), void *arg);
#define IPL_STATCLOCK 5
#define IPL_HIGH 7
-#define spllowersoftclock() spl1()
#define splsoftclock() spl1()
#define splsoftnet() spl1()
#define splbio() _splraise(PSL_S|PSL_IPL2)
diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h
index b25f69bc436..c93af460b72 100644
--- a/sys/arch/powerpc/include/intr.h
+++ b/sys/arch/powerpc/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.28 2004/12/24 22:50:30 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.29 2005/04/19 15:29:48 mickey Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA.
@@ -142,7 +142,6 @@ set_sint(int pending)
#define splclock() splraise(imask[IPL_CLOCK])
#define splvm() splraise(imask[IPL_IMP])
#define splstatclock() splhigh()
-#define spllowersoftclock() spllower(SINT_CLOCK)
#define splsoftclock() splraise(SINT_CLOCK)
#define splsoftnet() splraise(SINT_NET|SINT_CLOCK)
#define splsofttty() splraise(SINT_TTY|SINT_NET|SINT_CLOCK)
diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h
index 082114a92c1..aadd18b1fed 100644
--- a/sys/arch/sgi/include/intr.h
+++ b/sys/arch/sgi/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.12 2005/01/31 21:35:50 grange Exp $ */
+/* $OpenBSD: intr.h,v 1.13 2005/04/19 15:29:48 mickey Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -106,7 +106,6 @@
#define splstatclock() splhigh()
#define splhigh() splraise(-1)
#define spl0() spllower(0)
-#define spllowersoftclock() spllower(SINT_CLOCKMASK)
#define setsoftclock() set_ipending(SINT_CLOCKMASK);
diff --git a/sys/arch/sparc/include/psl.h b/sys/arch/sparc/include/psl.h
index af175bba370..356d2460355 100644
--- a/sys/arch/sparc/include/psl.h
+++ b/sys/arch/sparc/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.19 2004/06/13 21:49:20 niklas Exp $ */
+/* $OpenBSD: psl.h,v 1.20 2005/04/19 15:29:48 mickey Exp $ */
/* $NetBSD: psl.h,v 1.12 1997/03/10 21:49:11 pk Exp $ */
/*
@@ -216,7 +216,6 @@ static __inline int name() \
SPLHOLD(splsoftint, IPL_SOFTINT)
#define splsoftclock splsoftint
#define splsoftnet splsoftint
-SPL(spllowersoftclock, IPL_SOFTCLOCK)
SPLHOLD(splausoft, IPL_AUSOFT)
SPLHOLD(splfdsoft, IPL_FDSOFT)
SPLHOLD(splbio, IPL_BIO)
diff --git a/sys/arch/sparc64/include/psl.h b/sys/arch/sparc64/include/psl.h
index 87560347353..32a36b71ec2 100644
--- a/sys/arch/sparc64/include/psl.h
+++ b/sys/arch/sparc64/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.12 2005/01/05 18:42:28 fgsch Exp $ */
+/* $OpenBSD: psl.h,v 1.13 2005/04/19 15:29:48 mickey Exp $ */
/* $NetBSD: psl.h,v 1.20 2001/04/13 23:30:05 thorpej Exp $ */
/*
@@ -405,8 +405,6 @@ extern __inline int name() \
SPL(spl0, 0)
-SPL(spllowersoftclock, 1)
-
SPLHOLD(splsoftint, 1)
#define splsoftclock splsoftint
#define splsoftnet splsoftint
@@ -459,7 +457,6 @@ SPLHOLD(splhigh, PIL_HIGH)
#ifdef SPLDEBUG
#define spl0() spl0X(__FILE__, __LINE__)
-#define spllowersoftclock() spllowersoftclockX(__FILE__, __LINE__)
#define splsoftint() splsoftintX(__FILE__, __LINE__)
#define splausoft() splausoftX(__FILE__, __LINE__)
#define splfdsoft() splfdsoftX(__FILE__, __LINE__)
diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h
index ccaa04871e1..3b380234330 100644
--- a/sys/arch/vax/include/param.h
+++ b/sys/arch/vax/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.27 2004/08/06 22:31:31 mickey Exp $ */
+/* $OpenBSD: param.h,v 1.28 2005/04/19 15:29:48 mickey Exp $ */
/* $NetBSD: param.h,v 1.39 1999/10/22 21:14:34 ragge Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -183,7 +183,6 @@
#endif
#define spl0() splx(0) /* IPL0 */
-#define spllowersoftclock() splx(8) /* IPL08 */
#define splsoftclock() _splraise(8) /* IPL08 */
#define splsoftnet() _splraise(0xc) /* IPL0C */
#define splddb() _splraise(0xf) /* IPL0F */
diff --git a/sys/arch/zaurus/include/intr.h b/sys/arch/zaurus/include/intr.h
index 8d70145b75e..67c1f10f752 100644
--- a/sys/arch/zaurus/include/intr.h
+++ b/sys/arch/zaurus/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.2 2005/01/02 19:43:07 drahn Exp $ */
+/* $OpenBSD: intr.h,v 1.3 2005/04/19 15:29:48 mickey Exp $ */
/* $NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $ */
/*
@@ -141,7 +141,6 @@ void _setsoftintr(int);
#define splserial() _splraise(IPL_SERIAL)
#define spl0() _spllower(IPL_NONE)
-#define spllowersoftclock() _spllower(IPL_SOFTCLOCK)
#define splsched() splhigh()
#define spllock() splhigh()
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 15:18:49 +0000