From 1ba741402951df5f694ae2d2e46607d2aa7149aa Mon Sep 17 00:00:00 2001 From: Andy Ross Date: Tue, 9 Feb 2021 13:48:25 -0800 Subject: [PATCH] kernel/sched: Correct coherence assert Some legacy spots in our IPC layer (legally) pass a NULL wait queue to pend(). Allow this in the coherence assertion. Signed-off-by: Andy Ross --- kernel/sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched.c b/kernel/sched.c index b06acfd5a69..86fb585e386 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -674,7 +674,7 @@ static void pend(struct k_thread *thread, _wait_q_t *wait_q, k_timeout_t timeout) { #ifdef CONFIG_KERNEL_COHERENCE - __ASSERT_NO_MSG(arch_mem_coherent(wait_q)); + __ASSERT_NO_MSG(wait_q == NULL || arch_mem_coherent(wait_q)); #endif LOCKED(&sched_spinlock) {