summaryrefslogtreecommitdiff
path: root/sys/arch/arm
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2009-03-15 19:40:42 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2009-03-15 19:40:42 +0000
commitbe4afdca2a5b4f0324ddb45bb3f51a9ad4bcbed4 (patch)
tree7cc7f6b3659d4ba09383a2f37552ffbf1c8add07 /sys/arch/arm
parentdb787728ab081e9d84b26e1a98431526e1420c27 (diff)
Introduce splsoftassert(), similar to splassert() but for soft interrupt
levels. This will allow for platforms where soft interrupt levels do not map to real hardware interrupt levels to have soft ipl values overlapping hard ipl values without breaking spl asserts.
Diffstat (limited to 'sys/arch/arm')
-rw-r--r--sys/arch/arm/s3c2xx0/s3c2xx0_intr.h4
-rw-r--r--sys/arch/arm/xscale/pxa2x0_intr.h4
2 files changed, 6 insertions, 2 deletions
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 */