1 files changed, 10 insertions, 8 deletions
diff --git a/src/thread.c b/src/thread.c
index 8d4752409d..1369b7560a 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -355,20 +355,22 @@ RTM_EXPORT(rt_thread_init);
  */
 rt_thread_t rt_thread_self(void)
 {
-#ifdef RT_USING_SMP
-    rt_base_t lock;
+#ifndef RT_USING_SMP
+    return rt_cpu_self()->current_thread;
+
+#elif defined (ARCH_USING_HW_THREAD_SELF)
+    return rt_hw_thread_self();
+
+#else /* !ARCH_USING_HW_THREAD_SELF */
     rt_thread_t self;
+    rt_base_t lock;
 
     lock = rt_hw_local_irq_disable();
     self = rt_cpu_self()->current_thread;
     rt_hw_local_irq_enable(lock);
-    return self;
-
-#else /* !RT_USING_SMP */
-    extern rt_thread_t rt_current_thread;
 
-    return rt_current_thread;
-#endif /* RT_USING_SMP */
+    return self;
+#endif /* ARCH_USING_HW_THREAD_SELF */
 }
 RTM_EXPORT(rt_thread_self);