kernel/sched: Correct coherence assert

Andy Ross · nashif · commit 1ba741402951 · 2021-02-11T14:47:40.000-05:00
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 &lt;andrew.j.ross@intel.com&gt;
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,7 @@ static void pend(struct k_thread thread, _wait_q_t wait_q,`
`674`	`674`	`k_timeout_t timeout)`
`675`	`675`	`{`
`676`	`676`	`#ifdef CONFIG_KERNEL_COHERENCE`
`677`		`- __ASSERT_NO_MSG(arch_mem_coherent(wait_q));`
	`677`	`+ __ASSERT_NO_MSG(wait_q == NULL \|\| arch_mem_coherent(wait_q));`
`678`	`678`	`#endif`
`679`	`679`
`680`	`680`	`LOCKED(&sched_spinlock) {`