summaryrefslogtreecommitdiff
path: root/kern/turnstile.h
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2017-12-03 15:11:23 +0100
committerRichard Braun <rbraun@sceen.net>2017-12-03 15:11:23 +0100
commitc7d2507fc455421429a531d722947ab415259c77 (patch)
tree52609a956ec9e3bd1f1274aa9d799597866bfcd1 /kern/turnstile.h
parent303ed5305f8dae17ab46aa1e0dc6086d4277808c (diff)
Revert "Make assert have no side effects"
This reverts commit d18d0e85596f90e0bd597b33d58209d0b3973c95.
Diffstat (limited to 'kern/turnstile.h')
-rw-r--r--kern/turnstile.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/kern/turnstile.h b/kern/turnstile.h
index f7ba0847..e7b4a5e3 100644
--- a/kern/turnstile.h
+++ b/kern/turnstile.h
@@ -43,6 +43,8 @@ struct turnstile;
*/
struct turnstile_td;
+#define turnstile_td_assert_lock(td) spinlock_assert_locked(&(td)->lock)
+
/*
* Initialize turnstile thread data.
*/
@@ -60,12 +62,6 @@ turnstile_td_init(struct turnstile_td *td)
* Turnstile thread data locking functions.
*/
-static inline bool
-turnstile_td_locked(struct turnstile_td *td)
-{
- return spinlock_locked(&(td)->lock);
-}
-
static inline void
turnstile_td_lock(struct turnstile_td *td)
{