From 00e36dabb4cdef51095aece46e451f2fab4c13c1 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 12 Feb 2025 02:09:44 +0100 Subject: Use MACRO_BEGIN/END This notably fixes at least a SAVE_HINT call. --- kern/sched_prim.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'kern/sched_prim.c') diff --git a/kern/sched_prim.c b/kern/sched_prim.c index 4f719357..bcbfa160 100644 --- a/kern/sched_prim.c +++ b/kern/sched_prim.c @@ -133,14 +133,16 @@ decl_simple_lock_data(static, wait_lock[NUMQUEUES]) /* Lock for... */ queue_head_t wait_queue[NUMQUEUES]; #ifdef MACH_LDEBUG -#define waitq_lock(wl) do { \ +#define waitq_lock(wl) \ +MACRO_BEGIN \ assert_splsched(); \ simple_lock_nocheck(wl); \ -} while (0) -#define waitq_unlock(wl) do { \ +MACRO_END +#define waitq_unlock(wl) \ +MACRO_BEGIN \ assert_splsched(); \ simple_unlock_nocheck(wl); \ -} while (0) +MACRO_END #else #define waitq_lock(wl) simple_lock_nocheck(wl) #define waitq_unlock(wl) simple_unlock_nocheck(wl) -- cgit v1.2.3