From 963a1b6c306c06b16a4067e1247164572821a16d Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Mon, 14 Feb 2000 06:11:53 +0000
Subject: [PATCH] Fix is_splxxx() warnings when not compiled with
 INVARIANT_SUPPORT.

Approved by:	jkh
---
 sys/i386/isa/ipl_funcs.c | 30 ++++++++++++++----------------
 1 file 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 */