summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/include/intr.h4
-rw-r--r--sys/arch/amd64/include/intr.h6
-rw-r--r--sys/arch/arm/s3c2xx0/s3c2xx0_intr.h4
-rw-r--r--sys/arch/arm/xscale/pxa2x0_intr.h4
-rw-r--r--sys/arch/armish/include/armish_intr.h4
-rw-r--r--sys/arch/hppa/include/intr.h6
-rw-r--r--sys/arch/hppa64/include/cpu.h6
-rw-r--r--sys/arch/i386/include/intr.h6
-rw-r--r--sys/arch/landisk/include/intr.h4
-rw-r--r--sys/arch/m68k/include/psl.h4
-rw-r--r--sys/arch/m88k/include/intr.h4
-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.h6
-rw-r--r--sys/arch/sparc64/include/psl.h6
-rw-r--r--sys/arch/vax/include/intr.h4
16 files changed, 52 insertions, 22 deletions
diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h
index 51b2242527f..42f0794e9c2 100644
--- a/sys/arch/alpha/include/intr.h
+++ b/sys/arch/alpha/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.30 2009/03/07 15:31:43 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.31 2009/03/15 19:40:38 miod Exp $ */
/* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */
/*-
@@ -152,8 +152,10 @@ void splassert_check(int, const char *);
splassert_check(__wantipl, __func__); \
} \
} while (0)
+#define splsoftassert(wantipl) splassert(IPL_SOFTINT)
#else
#define splassert(wantipl) do { /* nothing */ } while (0)
+#define splsoftassert(wantipl) do { /* nothing */ } while (0)
#endif
/* IPL-lowering/restoring macros */
diff --git a/sys/arch/amd64/include/intr.h b/sys/arch/amd64/include/intr.h
index 86c63ceb283..f3076a10d35 100644
--- a/sys/arch/amd64/include/intr.h
+++ b/sys/arch/amd64/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.15 2008/12/06 19:59:38 tedu Exp $ */
+/* $OpenBSD: intr.h,v 1.16 2009/03/15 19:40:40 miod Exp $ */
/* $NetBSD: intr.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $ */
/*-
@@ -170,8 +170,10 @@ void splassert_check(int, const char *);
splassert_check(__wantipl, __func__); \
} \
} while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
#else
-#define splassert(wantipl) do { /* nada */ } while (0)
+#define splassert(wantipl) do { /* nada */ } while (0)
+#define splsoftassert(wantipl) do { /* nada */ } while (0)
#endif
/*
diff --git a/sys/arch/arm/s3c2xx0/s3c2xx0_intr.h b/sys/arch/arm/s3c2xx0/s3c2xx0_intr.h
index db6bbec75d8..a68d8b97c8a 100644
--- a/sys/arch/arm/s3c2xx0/s3c2xx0_intr.h
+++ b/sys/arch/arm/s3c2xx0/s3c2xx0_intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3c2xx0_intr.h,v 1.2 2008/12/08 20:50:20 drahn Exp $ */
+/* $OpenBSD: s3c2xx0_intr.h,v 1.3 2009/03/15 19:40:40 miod Exp $ */
/* $NetBSD: s3c2xx0_intr.h,v 1.13 2008/11/19 06:35:55 matt Exp $ */
/*
@@ -158,8 +158,10 @@ void pxa2x0_splassert_check(int, const char *);
pxa2x0_splassert_check(__wantipl, __func__); \
} \
} while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
#else
#define splassert(wantipl) do { /* nothing */ } while (0)
+#define splsoftassert(wantipl) do { /* nothing */ } while (0)
#endif
diff --git a/sys/arch/arm/xscale/pxa2x0_intr.h b/sys/arch/arm/xscale/pxa2x0_intr.h
index 589f97763d0..6c6d15fee20 100644
--- a/sys/arch/arm/xscale/pxa2x0_intr.h
+++ b/sys/arch/arm/xscale/pxa2x0_intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxa2x0_intr.h,v 1.11 2007/05/19 15:47:16 miod Exp $ */
+/* $OpenBSD: pxa2x0_intr.h,v 1.12 2009/03/15 19:40:40 miod Exp $ */
/* $NetBSD: pxa2x0_intr.h,v 1.4 2003/07/05 06:53:08 dogcow Exp $ */
/* Derived from i80321_intr.h */
@@ -116,8 +116,10 @@ void pxa2x0_splassert_check(int, const char *);
pxa2x0_splassert_check(__wantipl, __func__); \
} \
} while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
#else
#define splassert(wantipl) do { /* nothing */ } while (0)
+#define splsoftassert(wantipl) do { /* nothing */ } while (0)
#endif
#endif /* ! _LOCORE */
diff --git a/sys/arch/armish/include/armish_intr.h b/sys/arch/armish/include/armish_intr.h
index 62477bdaf18..9add69a76d7 100644
--- a/sys/arch/armish/include/armish_intr.h
+++ b/sys/arch/armish/include/armish_intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: armish_intr.h,v 1.4 2007/05/19 15:47:18 miod Exp $ */
+/* $OpenBSD: armish_intr.h,v 1.5 2009/03/15 19:40:40 miod Exp $ */
/* $NetBSD: i80321_intr.h,v 1.4 2003/07/05 06:53:08 dogcow Exp $ */
/*
@@ -108,8 +108,10 @@ void i80321_splassert_check(int, const char *);
i80321_splassert_check(__wantipl, __func__); \
} \
} while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
#else
#define splassert(wantipl) do { /* nothing */ } while (0)
+#define splsoftassert(wantipl) do { /* nothing */ } while (0)
#endif
#endif /* ! _LOCORE */
diff --git a/sys/arch/hppa/include/intr.h b/sys/arch/hppa/include/intr.h
index 7586fc83f00..74efdabd14b 100644
--- a/sys/arch/hppa/include/intr.h
+++ b/sys/arch/hppa/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.24 2008/04/27 14:36:38 kettenis Exp $ */
+/* $OpenBSD: intr.h,v 1.25 2009/03/15 19:40:40 miod Exp $ */
/*
* Copyright (c) 2002-2004 Michael Shalayeff
@@ -70,8 +70,10 @@ void splassert_check(int, const char *);
splassert_check(__wantipl, __func__); \
} \
} while (0)
+#define splsoftassert(__wantipl) splassert(__wantipl)
#else
-#define splassert(__wantipl) do { /* nada */ } while (0)
+#define splassert(__wantipl) do { /* nada */ } while (0)
+#define splsoftassert(__wantipl) do { /* nada */ } while (0)
#endif /* DIAGNOSTIC */
void cpu_intr_init(void);
diff --git a/sys/arch/hppa64/include/cpu.h b/sys/arch/hppa64/include/cpu.h
index f7c52306250..f8d7841ee39 100644
--- a/sys/arch/hppa64/include/cpu.h
+++ b/sys/arch/hppa64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.14 2008/10/10 08:36:28 art Exp $ */
+/* $OpenBSD: cpu.h,v 1.15 2009/03/15 19:40:40 miod Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -155,8 +155,10 @@ void splassert_check(int, const char *);
splassert_check(__wantipl, __func__); \
} \
} while (0)
+#define splsoftassert(__wantipl) splassert(__wantipl)
#else
-#define splassert(__wantipl) do { /* nada */ } while (0)
+#define splassert(__wantipl) do { /* nada */ } while (0)
+#define splsoftassert(__wantipl) do { /* nada */ } while (0)
#endif /* DIAGNOSTIC */
/* types */
diff --git a/sys/arch/i386/include/intr.h b/sys/arch/i386/include/intr.h
index f549f8f38c0..812af4d74d1 100644
--- a/sys/arch/i386/include/intr.h
+++ b/sys/arch/i386/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.36 2008/09/28 20:43:31 brad Exp $ */
+/* $OpenBSD: intr.h,v 1.37 2009/03/15 19:40:40 miod Exp $ */
/* $NetBSD: intr.h,v 1.5 1996/05/13 06:11:28 mycroft Exp $ */
/*
@@ -77,8 +77,10 @@ void splassert_check(int, const char *);
splassert_check(__wantipl, __func__); \
} \
} while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
#else
-#define splassert(wantipl) do { /* nada */ } while (0)
+#define splassert(wantipl) do { /* nada */ } while (0)
+#define splsoftassert(wantipl) do { /* nada */ } while (0)
#endif
/*
diff --git a/sys/arch/landisk/include/intr.h b/sys/arch/landisk/include/intr.h
index 01dbf8d7c3d..6fb05efaccf 100644
--- a/sys/arch/landisk/include/intr.h
+++ b/sys/arch/landisk/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.8 2008/06/26 05:42:11 ray Exp $ */
+/* $OpenBSD: intr.h,v 1.9 2009/03/15 19:40:40 miod Exp $ */
/* $NetBSD: intr.h,v 1.1 2006/09/01 21:26:18 uwe Exp $ */
/*-
@@ -76,8 +76,10 @@ do { \
splassert_check(__wantipl, __func__); \
} \
} while (0)
+#define splsoftassert(__wantipl) splassert(__wantipl)
#else
#define splassert(wantipl) do { /* nothing yet */ } while (0)
+#define splsoftassert(wantipl) do { /* nothing yet */ } while (0)
#endif
void intr_init(void);
diff --git a/sys/arch/m68k/include/psl.h b/sys/arch/m68k/include/psl.h
index 309f470622b..f27c0ef0d8b 100644
--- a/sys/arch/m68k/include/psl.h
+++ b/sys/arch/m68k/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.7 2007/11/09 17:28:29 miod Exp $ */
+/* $OpenBSD: psl.h,v 1.8 2009/03/15 19:40:40 miod Exp $ */
/* $NetBSD: psl.h,v 1.5 1994/10/26 07:50:50 cgd Exp $ */
/*
@@ -87,8 +87,10 @@ do { \
splassert_check(__wantipl, __func__); \
} \
} while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
#else
#define splassert(wantipl) do { /* nothing */ } while (0)
+#define splsoftassert(wantipl) do { /* nothing */ } while (0)
#endif
/*
diff --git a/sys/arch/m88k/include/intr.h b/sys/arch/m88k/include/intr.h
index 1ee0ea48731..1853e9372ca 100644
--- a/sys/arch/m88k/include/intr.h
+++ b/sys/arch/m88k/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.9 2007/11/17 05:32:05 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.10 2009/03/15 19:40:40 miod Exp $ */
/*
* Copyright (C) 2000 Steve Murphree, Jr.
* All rights reserved.
@@ -50,8 +50,10 @@ void splassert_check(int, const char *);
splassert_check(__wantipl, __func__); \
} \
} while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
#else
#define splassert(wantipl) do { /* nothing */ } while (0)
+#define splsoftassert(wantipl) do { /* nothing */ } while (0)
#endif
#endif /* _LOCORE */
diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h
index c7bd5410c40..d2f85d51aaf 100644
--- a/sys/arch/powerpc/include/intr.h
+++ b/sys/arch/powerpc/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.38 2008/11/21 17:35:52 deraadt Exp $ */
+/* $OpenBSD: intr.h,v 1.39 2009/03/15 19:40:40 miod Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA.
@@ -77,6 +77,7 @@ extern int imask[IPL_NUM];
/* SPL asserts */
#define splassert(wantipl) /* nothing */
+#define splsoftassert(wantipl) /* nothing */
#define set_sint(p) atomic_setbits_int(&curcpu()->ci_ipending, p)
diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h
index 14a0d2870c5..aa41ab264e7 100644
--- a/sys/arch/sgi/include/intr.h
+++ b/sys/arch/sgi/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.20 2007/12/06 12:34:39 jsing Exp $ */
+/* $OpenBSD: intr.h,v 1.21 2009/03/15 19:40:40 miod Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -104,6 +104,7 @@
void splinit(void);
#define splassert(X)
+#define splsoftassert(X)
/*
* Schedule prioritys for base interrupts (CPU)
diff --git a/sys/arch/sparc/include/psl.h b/sys/arch/sparc/include/psl.h
index 1cd1b561797..cb9fc9022f4 100644
--- a/sys/arch/sparc/include/psl.h
+++ b/sys/arch/sparc/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.23 2007/05/16 19:37:06 thib Exp $ */
+/* $OpenBSD: psl.h,v 1.24 2009/03/15 19:40:40 miod Exp $ */
/* $NetBSD: psl.h,v 1.12 1997/03/10 21:49:11 pk Exp $ */
/*
@@ -173,8 +173,10 @@ void splassert_check(int, const char *);
splassert_check(__wantipl, __func__); \
} \
} while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
#else
-#define splassert(wantipl) do { /* nada */ } while (0)
+#define splassert(wantipl) do { /* nada */ } while (0)
+#define splsoftassert(wantipl) do { /* nada */ } while (0)
#endif
/*
diff --git a/sys/arch/sparc64/include/psl.h b/sys/arch/sparc64/include/psl.h
index d477b9c0caa..a84cea7791e 100644
--- a/sys/arch/sparc64/include/psl.h
+++ b/sys/arch/sparc64/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.25 2008/07/05 20:53:33 kettenis Exp $ */
+/* $OpenBSD: psl.h,v 1.26 2009/03/15 19:40:40 miod Exp $ */
/* $NetBSD: psl.h,v 1.20 2001/04/13 23:30:05 thorpej Exp $ */
/*
@@ -249,8 +249,10 @@ void splassert_check(int, const char *);
splassert_check(__wantipl, __func__); \
} \
} while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
#else
-#define splassert(wantipl) do { /* nada */ } while (0)
+#define splassert(wantipl) do { /* nada */ } while (0)
+#define splsoftassert(wantipl) do { /* nada */ } while (0)
#endif
/*
diff --git a/sys/arch/vax/include/intr.h b/sys/arch/vax/include/intr.h
index 5f225fdaf9e..cc135ccf42f 100644
--- a/sys/arch/vax/include/intr.h
+++ b/sys/arch/vax/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.9 2008/08/18 23:08:55 miod Exp $ */
+/* $OpenBSD: intr.h,v 1.10 2009/03/15 19:40:40 miod Exp $ */
/* $NetBSD: intr.h,v 1.1 1998/08/18 23:55:00 matt Exp $ */
/*
@@ -115,8 +115,10 @@ void splassert_check(int, const char *);
splassert_check(__wantipl, __func__); \
} \
} while (0)
+#define splsoftassert(wantipl) splassert(wantipl)
#else
#define splassert(wantipl) do { /* nothing */ } while (0)
+#define splsoftassert(wantipl) do { /* nothing */ } while (0)
#endif
#endif /* _VAX_INTR_H */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 07:50:06 +0000