Merge remote-tracking branch 'upstream/master'

3 files changed, 10 insertions, 2 deletions

diff --git a/src/cpu.c b/src/cpu.c
index ef6dce1787..3e2d65dfb9 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -86,6 +86,6 @@ void rt_cpus_lock_status_restore(struct rt_thread *thread)
         rt_hw_spin_unlock(&_cpus_lock);
     }
 }
-RTM_EXPORT(rt_post_switch);
+RTM_EXPORT(rt_cpus_lock_status_restore);
 
 #endif
diff --git a/src/memheap.c b/src/memheap.c
index eb5d710029..aef56e1a74 100644
--- a/src/memheap.c
+++ b/src/memheap.c
@@ -34,7 +34,7 @@
 #define RT_MEMHEAP_MINIALLOC    12
 
 #define RT_MEMHEAP_SIZE         RT_ALIGN(sizeof(struct rt_memheap_item), RT_ALIGN_SIZE)
-#define MEMITEM_SIZE(item)      ((rt_uint32_t)item->next - (rt_uint32_t)item - RT_MEMHEAP_SIZE)
+#define MEMITEM_SIZE(item)      ((rt_ubase_t)item->next - (rt_ubase_t)item - RT_MEMHEAP_SIZE)
 
 /*
  * The initialized memory pool will be:
diff --git a/src/scheduler.c b/src/scheduler.c
index e177bde6b7..aafa1f4529 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -99,11 +99,19 @@ static void _rt_scheduler_stack_check(struct rt_thread *thread)
         level = rt_hw_interrupt_disable();
         while (level);
     }
+#if defined(ARCH_CPU_STACK_GROWS_UPWARD)
+    else if ((rt_ubase_t)thread->sp > ((rt_ubase_t)thread->stack_addr + thread->stack_size))
+    {
+        rt_kprintf("warning: %s stack is close to the top of stack address.\n",
+                   thread->name);
+    }
+#else
     else if ((rt_ubase_t)thread->sp <= ((rt_ubase_t)thread->stack_addr + 32))
     {
         rt_kprintf("warning: %s stack is close to end of stack address.\n",
                    thread->name);
     }
+#endif
 }
 #endif