aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2000-02-14 06:11:53 +0000
committerPeter Wemm <peter@FreeBSD.org>2000-02-14 06:11:53 +0000
commite463cfe7b6b31097b7c1df758dcb8997403b0695 (patch)
tree624a56b37e9a4ba622c97d24ead66e27315b4e3d
parent194a0b6c9797df4220057337ef48301c980b90a5 (diff)
Notes
-rw-r--r--sys/i386/isa/ipl_funcs.c30
1 files changed, 14 insertions, 16 deletions
diff --git a/sys/i386/isa/ipl_funcs.c b/sys/i386/isa/ipl_funcs.c
index 5a305ec7f1d7..14d74c9bffb2 100644
--- a/sys/i386/isa/ipl_funcs.c
+++ b/sys/i386/isa/ipl_funcs.c
@@ -65,6 +65,17 @@ softclockpending(void)
return (ipending & SWI_CLOCK_PENDING);
}
+#ifdef INVARIANT_SUPPORT
+#define GENSPLASSERT(NAME, MODIFIER) \
+int \
+is_##NAME(void) \
+{ \
+ return ((cpl & (MODIFIER)) == (MODIFIER)); \
+}
+#else
+#define GENSPLASSERT(NAME, MODIFIER)
+#endif
+
#ifndef SMP
#define GENSPL(NAME, OP, MODIFIER, PC) \
@@ -76,11 +87,7 @@ unsigned NAME(void) \
cpl OP MODIFIER; \
return (x); \
} \
-int \
-is_##NAME(void) \
-{ \
- return ((cpl & (MODIFIER)) == (MODIFIER)); \
-}
+GENSPLASSERT(NAME, MODIFIER)
void
spl0(void)
@@ -192,11 +199,7 @@ unsigned NAME(void) \
\
return (x); \
} \
-int \
-is_##NAME(void) \
-{ \
- return ((cpl & (MODIFIER)) == (MODIFIER)); \
-}
+GENSPLASSERT(NAME, MODIFIER)
#else /* INTR_SPL */
@@ -213,12 +216,7 @@ unsigned NAME(void) \
\
return (x); \
} \
-int \
-is_##NAME(void) \
-{ \
- return ((cpl & (MODIFIER)) == (MODIFIER)); \
-}
-
+GENSPLASSERT(NAME, MODIFIER)
#endif /* INTR_SPL */