From b316611ef0bd616609285c26dbc98fcf83b8aecb Mon Sep 17 00:00:00 2001 From: ligd Date: Fri, 28 Jan 2022 21:29:16 +0800 Subject: [PATCH] Revert "sem: remove limitation of irq context when do sem_trywait" This reverts commit 7c547b3ebdaa1d4d13d0f64b523bbbd8299fc5a4. --- mm/mm_heap/mm_sem.c | 4 ---- sched/semaphore/sem_trywait.c | 2 -- 2 files changed, 6 deletions(-) diff --git a/mm/mm_heap/mm_sem.c b/mm/mm_heap/mm_sem.c index b7c64b7d4c2..a4d4e869c7c 100644 --- a/mm/mm_heap/mm_sem.c +++ b/mm/mm_heap/mm_sem.c @@ -80,13 +80,9 @@ bool mm_takesemaphore(FAR struct mm_heap_s *heap) if (up_interrupt_context()) { -#ifdef CONFIG_DEBUG_MM - return _SEM_TRYWAIT(&heap->mm_semaphore) >= 0; -#else /* Can't take semaphore in the interrupt handler */ return false; -#endif } else #endif diff --git a/sched/semaphore/sem_trywait.c b/sched/semaphore/sem_trywait.c index 506add37f01..2da213907dc 100644 --- a/sched/semaphore/sem_trywait.c +++ b/sched/semaphore/sem_trywait.c @@ -69,11 +69,9 @@ int nxsem_trywait(FAR sem_t *sem) irqstate_t flags; int ret; -#ifndef CONFIG_DEBUG_MM /* This API should not be called from interrupt handlers */ DEBUGASSERT(sem != NULL && up_interrupt_context() == false); -#endif if (sem != NULL) {