2 files changed, 8 insertions, 3 deletions
diff --git a/src/ipc.c b/src/ipc.c
index d6c3717b9e..3a5a0efa61 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -507,6 +507,9 @@ static rt_err_t _rt_sem_take(rt_sem_t sem, rt_int32_t timeout, int suspend_flag)
 
     RT_OBJECT_HOOK_CALL(rt_object_trytake_hook, (&(sem->parent.parent)));
 
+    /* current context checking */
+    RT_DEBUG_SCHEDULER_AVAILABLE(sem->value == 0 && timeout != 0);
+
     /* disable interrupt */
     level = rt_hw_interrupt_disable();
 
@@ -534,9 +537,6 @@ static rt_err_t _rt_sem_take(rt_sem_t sem, rt_int32_t timeout, int suspend_flag)
         }
         else
         {
-            /* current context checking */
-            RT_DEBUG_SCHEDULER_AVAILABLE(RT_TRUE);
-
             /* semaphore is unavailable, push to suspend list */
             /* get current thread */
             thread = rt_thread_self();
diff --git a/src/irq.c b/src/irq.c
index 0073eaf529..4d431b2194 100644
--- a/src/irq.c
+++ b/src/irq.c
@@ -138,5 +138,10 @@ RTM_EXPORT(rt_interrupt_get_nest);
 RTM_EXPORT(rt_hw_interrupt_disable);
 RTM_EXPORT(rt_hw_interrupt_enable);
 
+rt_weak rt_bool_t rt_hw_interrupt_is_disabled(void)
+{
+    return RT_FALSE;
+}
+RTM_EXPORT(rt_hw_interrupt_is_disabled);
 /**@}*/