From 496e2ff03c3f03b91eb62a759db74e10afd1df58 Mon Sep 17 00:00:00 2001
From: chao an <anchao@lixiang.com>
Date: Mon, 14 Oct 2024 10:43:19 +0800
Subject: [PATCH] Revert "pthread: We should not directly include
 arch/spinlock.h as it may cause compilation errors in C++."

This reverts commit 444a9fbcd6b7d6c33fea68187ed81e8729657a2c.
---
 include/nuttx/spinlock.h | 1 +
 include/pthread.h        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/nuttx/spinlock.h b/include/nuttx/spinlock.h
index 8678dbef805f7..bd15818d6a7e7 100644
--- a/include/nuttx/spinlock.h
+++ b/include/nuttx/spinlock.h
@@ -35,6 +35,7 @@
 
 #include <nuttx/compiler.h>
 #include <nuttx/irq.h>
+#include <nuttx/arch.h>
 
 #if defined(CONFIG_TICKET_SPINLOCK) || defined(CONFIG_RW_SPINLOCK)
 #  include <nuttx/atomic.h>
diff --git a/include/pthread.h b/include/pthread.h
index 97eca7a5368ed..0418dfacd0726 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -49,7 +49,7 @@
  * SP_LOCKED and SP_UNLOCKED must constants of type spinlock_t.
  */
 
-#  include <nuttx/spinlock.h>
+#  include <arch/spinlock.h>
 #endif
 
 /****************************************************************************