From ac454def83febc9a63262940cfd66f1a9d7f45be Mon Sep 17 00:00:00 2001
From: TaiJu Wu <tjwu1217@gmail.com>
Date: Fri, 15 Mar 2024 11:34:40 +0000
Subject: [PATCH] build test

---
 include/nuttx/spinlock.h  | 12 ++++++------
 sched/semaphore/sem_rw.c  | 12 ------------
 sched/signal/sig_action.c |  2 ++
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/include/nuttx/spinlock.h b/include/nuttx/spinlock.h
index 380d550c3a8cc..37556f3d7e10a 100644
--- a/include/nuttx/spinlock.h
+++ b/include/nuttx/spinlock.h
@@ -443,20 +443,20 @@ void spin_clrbit(FAR volatile cpu_set_t *set, unsigned int cpu,
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SMP)
+#if defined(CONFIG_SMP) || defined(CONFIG_SPINLOCK)
 irqstate_t spin_lock_irqsave(FAR spinlock_t *lock);
 #else
-#  define spin_lock_irqsave(l) ((void)(l), up_irq_save())
+#  define spin_lock_irqsave(l) up_irq_save()
 #endif
 
 /****************************************************************************
  * Name: spin_lock_irqsave_wo_note
  ****************************************************************************/
 
-#if defined(CONFIG_SMP)
+#if defined(CONFIG_SMP) || defined(CONFIG_SPINLOCK)
 irqstate_t spin_lock_irqsave_wo_note(FAR spinlock_t *lock);
 #else
-#  define spin_lock_irqsave_wo_note(l) ((void)(l), up_irq_save())
+#  define spin_lock_irqsave_wo_note(l) up_irq_save()
 #endif
 
 /****************************************************************************
@@ -488,7 +488,7 @@ irqstate_t spin_lock_irqsave_wo_note(FAR spinlock_t *lock);
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SMP)
+#if defined(CONFIG_SMP) || defined(CONFIG_SPINLOCK)
 void spin_unlock_irqrestore(FAR spinlock_t *lock, irqstate_t flags);
 #else
 #  define spin_unlock_irqrestore(l, f) up_irq_restore(f)
@@ -498,7 +498,7 @@ void spin_unlock_irqrestore(FAR spinlock_t *lock, irqstate_t flags);
  * Name: spin_unlock_irqrestore_wo_note
  ****************************************************************************/
 
-#if defined(CONFIG_SMP)
+#if defined(CONFIG_SMP) || defined(CONFIG_SPINLOCK)
 void spin_unlock_irqrestore_wo_note(FAR spinlock_t *lock, irqstate_t flags);
 #else
 #  define spin_unlock_irqrestore_wo_note(l, f) up_irq_restore(f)
diff --git a/sched/semaphore/sem_rw.c b/sched/semaphore/sem_rw.c
index f449441151109..9ee3eab1fdfa8 100644
--- a/sched/semaphore/sem_rw.c
+++ b/sched/semaphore/sem_rw.c
@@ -26,18 +26,6 @@
 #include <nuttx/irq.h>
 #include <assert.h>
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#undef spin_lock_irqsave
-#undef spin_unlock_irqrestore
-
-#if !defined(CONFIG_SPINLOCK) || !defined(CONFIG_SMP)
-  #define spin_lock_irqsave(lock) up_irq_save()
-  #define spin_unlock_irqrestore(lock, flags) up_irq_restore(flags)
-#endif
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
diff --git a/sched/signal/sig_action.c b/sched/signal/sig_action.c
index 934a668224527..ac4adc76e3e6a 100644
--- a/sched/signal/sig_action.c
+++ b/sched/signal/sig_action.c
@@ -44,7 +44,9 @@
  * Private Data
  ****************************************************************************/
 
+#ifdef CONFIG_SPINLOCK
 static spinlock_t g_sigaction_spin;
+#endif
 
 /****************************************************************************
  * Private Functions