diff options
-rw-r--r-- | sys/arch/alpha/include/intr.h | 5 | ||||
-rw-r--r-- | sys/arch/amiga/include/psl.h | 6 | ||||
-rw-r--r-- | sys/arch/hp300/include/intr.h | 5 | ||||
-rw-r--r-- | sys/arch/hppa/include/intr.h | 6 | ||||
-rw-r--r-- | sys/arch/i386/include/intr.h | 5 | ||||
-rw-r--r-- | sys/arch/mac68k/include/intr.h | 5 | ||||
-rw-r--r-- | sys/arch/mvme68k/include/intr.h | 5 | ||||
-rw-r--r-- | sys/arch/mvme88k/include/intr.h | 5 | ||||
-rw-r--r-- | sys/arch/powerpc/include/intr.h | 5 | ||||
-rw-r--r-- | sys/arch/sparc/include/psl.h | 5 | ||||
-rw-r--r-- | sys/arch/sparc64/include/psl.h | 5 | ||||
-rw-r--r-- | sys/arch/sun3/include/psl.h | 5 | ||||
-rw-r--r-- | sys/arch/vax/include/param.h | 6 |
13 files changed, 55 insertions, 13 deletions
diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h index f030a102889..b6953c946e3 100644 --- a/sys/arch/alpha/include/intr.h +++ b/sys/arch/alpha/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.14 2002/03/14 03:15:50 millert Exp $ */ +/* $OpenBSD: intr.h,v 1.15 2002/04/29 07:35:13 miod Exp $ */ /* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */ /*- @@ -107,6 +107,9 @@ #ifdef _KERNEL +/* SPL asserts */ +#define splassert(wantipl) /* nothing */ + /* IPL-lowering/restoring macros */ #define splx(s) \ ((s) == ALPHA_PSL_IPL_0 ? spl0() : alpha_pal_swpipl(s)) diff --git a/sys/arch/amiga/include/psl.h b/sys/arch/amiga/include/psl.h index fc63d5523ac..25bc0dff687 100644 --- a/sys/arch/amiga/include/psl.h +++ b/sys/arch/amiga/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.13 2002/03/14 01:26:29 millert Exp $ */ +/* $OpenBSD: psl.h,v 1.14 2002/04/29 07:35:17 miod Exp $ */ /* $NetBSD: psl.h,v 1.11 1996/11/30 00:33:49 is Exp $ */ #ifndef _MACHINE_PSL_H_ @@ -7,6 +7,10 @@ #include <m68k/psl.h> #if defined(_KERNEL) && !defined(_LOCORE) + +/* SPL asserts */ +#define splassert(wantipl) /* nothing */ + static __inline int splraise(int); static __inline int splexact(int); static __inline void splx(int); diff --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h index 9465fbacf27..2a8b23a9bbb 100644 --- a/sys/arch/hp300/include/intr.h +++ b/sys/arch/hp300/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.8 2002/03/14 03:15:52 millert Exp $ */ +/* $OpenBSD: intr.h,v 1.9 2002/04/29 07:35:17 miod Exp $ */ /* $NetBSD: intr.h,v 1.2 1997/07/24 05:43:08 scottr Exp $ */ /*- @@ -88,6 +88,9 @@ struct isr { * spl functions; all but spl0 are done in-line */ +/* SPL asserts */ +#define splassert(wantipl) /* nothing */ + #define _spl(s) \ ({ \ register int _spl_r; \ diff --git a/sys/arch/hppa/include/intr.h b/sys/arch/hppa/include/intr.h index 26c7e01ca1a..c9502ba5106 100644 --- a/sys/arch/hppa/include/intr.h +++ b/sys/arch/hppa/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.12 2002/02/05 05:12:27 mickey Exp $ */ +/* $OpenBSD: intr.h,v 1.13 2002/04/29 07:35:18 miod Exp $ */ /* * Copyright (c) 1990,1991,1992,1994 The University of Utah and @@ -46,6 +46,10 @@ #define IST_LEVEL 3 #if !defined(_LOCORE) + +/* SPL asserts */ +#define splassert(wantipl) /* nothing */ + /* * Define the machine-independent SPL routines in terms of splx(). */ diff --git a/sys/arch/i386/include/intr.h b/sys/arch/i386/include/intr.h index c496a25c097..368b86a6c5e 100644 --- a/sys/arch/i386/include/intr.h +++ b/sys/arch/i386/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.13 2002/03/14 01:26:33 millert Exp $ */ +/* $OpenBSD: intr.h,v 1.14 2002/04/29 07:35:18 miod Exp $ */ /* $NetBSD: intr.h,v 1.5 1996/05/13 06:11:28 mycroft Exp $ */ /* @@ -111,6 +111,9 @@ static __inline int spllower(int); #define SPLX_DECL void splx(int); static __inline void softintr(int); +/* SPL asserts */ +#define splassert(wantipl) /* nothing */ + /* * Raise current interrupt priority level, and return the old one. */ diff --git a/sys/arch/mac68k/include/intr.h b/sys/arch/mac68k/include/intr.h index b69cc1d41d4..7c6a80913fb 100644 --- a/sys/arch/mac68k/include/intr.h +++ b/sys/arch/mac68k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.6 2002/03/14 01:26:35 millert Exp $ */ +/* $OpenBSD: intr.h,v 1.7 2002/04/29 07:35:19 miod Exp $ */ /* $NetBSD: intr.h,v 1.8 1997/11/07 07:33:18 scottr Exp $ */ /* @@ -36,6 +36,9 @@ * spl functions; all but spl0 are done in-line */ +/* SPL asserts */ +#define splassert(wantipl) /* nothing */ + #define _spl(s) \ ({ \ register int _spl_r; \ diff --git a/sys/arch/mvme68k/include/intr.h b/sys/arch/mvme68k/include/intr.h index a395d966625..6d23bd50158 100644 --- a/sys/arch/mvme68k/include/intr.h +++ b/sys/arch/mvme68k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.7 2002/04/27 23:21:05 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.8 2002/04/29 07:35:20 miod Exp $ */ /* * Copyright (C) 2000 Steve Murphree, Jr. * All rights reserved. @@ -44,6 +44,9 @@ extern unsigned char ssir; #define setsoftclock() ssir |= SIR_CLOCK u_long allocate_sir(void (*proc)(void *), void *arg); +/* SPL asserts */ +#define splassert(wantipl) /* nothing */ + #define _spl(s) \ ({ \ register int _spl_r; \ diff --git a/sys/arch/mvme88k/include/intr.h b/sys/arch/mvme88k/include/intr.h index 1fd9dca3ea6..8b520af881e 100644 --- a/sys/arch/mvme88k/include/intr.h +++ b/sys/arch/mvme88k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.8 2002/03/14 01:26:39 millert Exp $ */ +/* $OpenBSD: intr.h,v 1.9 2002/04/29 07:35:20 miod Exp $ */ /* * Copyright (C) 2000 Steve Murphree, Jr. * All rights reserved. @@ -91,6 +91,9 @@ int spl0(void); /* needs major cleanup - XXX nivas */ +/* SPL asserts */ +#define splassert(wantipl) /* nothing */ + #if 0 spl0 is a function by itself. I really am serious about the clean up above... diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h index 3ef30d354f7..2daaaf1a71c 100644 --- a/sys/arch/powerpc/include/intr.h +++ b/sys/arch/powerpc/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.17 2002/03/14 01:26:42 millert Exp $ */ +/* $OpenBSD: intr.h,v 1.18 2002/04/29 07:35:22 miod Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA. @@ -67,6 +67,9 @@ void do_pending_int(void); volatile extern int cpl, ipending, astpending, tickspending; extern int imask[7]; +/* SPL asserts */ +#define splassert(wantipl) /* nothing */ + /* * Reorder protection in the following inline functions is * achived with an empty asm volatile statement. the compiler diff --git a/sys/arch/sparc/include/psl.h b/sys/arch/sparc/include/psl.h index 65df0b5218f..6d3e4c56248 100644 --- a/sys/arch/sparc/include/psl.h +++ b/sys/arch/sparc/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.10 2002/04/28 03:51:19 art Exp $ */ +/* $OpenBSD: psl.h,v 1.11 2002/04/29 07:35:22 miod Exp $ */ /* $NetBSD: psl.h,v 1.12 1997/03/10 21:49:11 pk Exp $ */ /* @@ -107,6 +107,9 @@ static __inline int splhigh(void); static __inline void splx(int); static __inline int getmid(void); +/* SPL asserts */ +#define splassert(wantipl) /* nothing */ + /* * GCC pseudo-functions for manipulating PSR (primarily PIL field). */ diff --git a/sys/arch/sparc64/include/psl.h b/sys/arch/sparc64/include/psl.h index 520087e4af7..8e9447cb65e 100644 --- a/sys/arch/sparc64/include/psl.h +++ b/sys/arch/sparc64/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.4 2002/03/14 03:16:01 millert Exp $ */ +/* $OpenBSD: psl.h,v 1.5 2002/04/29 07:35:23 miod Exp $ */ /* $NetBSD: psl.h,v 1.20 2001/04/13 23:30:05 thorpej Exp $ */ /* @@ -262,6 +262,9 @@ static __inline void splx(int); #endif static __inline u_int64_t getver(void); +/* SPL asserts */ +#define splassert(wantipl) /* nothing */ + /* * GCC pseudo-functions for manipulating privileged registers */ diff --git a/sys/arch/sun3/include/psl.h b/sys/arch/sun3/include/psl.h index d6a5029747f..1cff44edf50 100644 --- a/sys/arch/sun3/include/psl.h +++ b/sys/arch/sun3/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.12 2002/03/14 01:26:46 millert Exp $ */ +/* $OpenBSD: psl.h,v 1.13 2002/04/29 07:35:23 miod Exp $ */ /* $NetBSD: psl.h,v 1.14 1998/11/24 17:07:54 kleink Exp $ */ /*- @@ -65,6 +65,9 @@ static __inline int _getsr(void); static __inline int _spl(int); static __inline int _splraise(int); +/* SPL asserts */ +#define splassert(wantipl) /* nothing */ + /* Get current sr value. */ static __inline int _getsr(void) diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h index ec5c128ed04..5fe6a8e1c51 100644 --- a/sys/arch/vax/include/param.h +++ b/sys/arch/vax/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.22 2002/03/14 01:26:48 millert Exp $ */ +/* $OpenBSD: param.h,v 1.23 2002/04/29 07:35:24 miod 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. @@ -164,6 +164,10 @@ #define ovbcopy(x,y,z) bcopy(x, y, z) #ifdef _KERNEL + +/* SPL asserts */ +#define splassert(wantipl) /* nothing */ + #ifndef lint #define splx(reg) \ ({ \ |