diff --git a/arch/xtensa/src/common/xtensa_cpenable.c b/arch/xtensa/src/common/xtensa_cpenable.c
index 3372700b35a..c2be1c1c115 100644
--- a/arch/xtensa/src/common/xtensa_cpenable.c
+++ b/arch/xtensa/src/common/xtensa_cpenable.c
@@ -26,7 +26,7 @@
 
 #include <nuttx/config.h>
 
-#include <nuttx/irq.h>
+#include <nuttx/spinlock.h>
 #include <nuttx/sched.h>
 
 #include <arch/xtensa/xtensa_coproc.h>
@@ -36,6 +36,12 @@
 
 #if XCHAL_CP_NUM > 0
 
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static spinlock_t g_lock = SP_UNLOCKED;
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -63,7 +69,7 @@ void xtensa_coproc_enable(int cpset)
 
   /* These operations must be atomic */
 
-  flags = enter_critical_section();
+  flags = spin_lock_irqsave(&g_lock);
 
   if (cpset != 0)
     {
@@ -74,7 +80,7 @@ void xtensa_coproc_enable(int cpset)
       xtensa_set_cpenable(cpenable);
     }
 
-  leave_critical_section(flags);
+  spin_unlock_irqrestore(&g_lock, flags);
 }
 
 /****************************************************************************
@@ -100,7 +106,7 @@ void xtensa_coproc_disable(int cpset)
 
   /* These operations must be atomic */
 
-  flags = enter_critical_section();
+  flags = spin_lock_irqsave(&g_lock);
 
   if (cpset != 0)
     {
@@ -111,7 +117,7 @@ void xtensa_coproc_disable(int cpset)
       xtensa_set_cpenable(cpenable);
     }
 
-  leave_critical_section(flags);
+  spin_unlock_irqrestore(&g_lock, flags);
 }
 
 #endif /* XCHAL_CP_NUM */
diff --git a/arch/xtensa/src/common/xtensa_oneshot.c b/arch/xtensa/src/common/xtensa_oneshot.c
index c3bf1b151c8..577314a7538 100644
--- a/arch/xtensa/src/common/xtensa_oneshot.c
+++ b/arch/xtensa/src/common/xtensa_oneshot.c
@@ -27,7 +27,7 @@
 #include <nuttx/config.h>
 
 #include <assert.h>
-#include <nuttx/irq.h>
+#include <nuttx/spinlock.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/timers/oneshot.h>
 
@@ -48,6 +48,7 @@ struct xoneshot_lowerhalf_s
   struct oneshot_lowerhalf_s lh;       /* Lower half operations */
   uint32_t                   freq;     /* Timer working clock frequency(Hz) */
   uint32_t                   irq;
+  spinlock_t                 lock;     /* Lock to protect oneshot state */
 };
 
 /****************************************************************************
@@ -99,7 +100,7 @@ static int xtensa_oneshot_start(struct oneshot_lowerhalf_s *lower_,
   uint32_t count;
   irqstate_t flags;
 
-  flags = enter_critical_section();
+  flags = spin_lock_irqsave(&lower->lock);
 
   count = sec_to_count((uint64_t)ts->tv_sec, lower->freq) +
           nsec_to_count((uint64_t)ts->tv_nsec, lower->freq);
@@ -109,7 +110,7 @@ static int xtensa_oneshot_start(struct oneshot_lowerhalf_s *lower_,
 
   up_enable_irq(lower->irq);
 
-  leave_critical_section(flags);
+  spin_unlock_irqrestore(&lower->lock, flags);
 
   return 0;
 }
@@ -121,11 +122,11 @@ static int xtensa_oneshot_cancel(struct oneshot_lowerhalf_s *lower_,
     (struct xoneshot_lowerhalf_s *)lower_;
   irqstate_t flags;
 
-  flags = enter_critical_section();
+  flags = spin_lock_irqsave(&lower->lock);
 
   up_disable_irq(lower->irq);
 
-  leave_critical_section(flags);
+  spin_unlock_irqrestore(&lower->lock, flags);
 
   return 0;
 }
@@ -173,6 +174,7 @@ xtensa_oneshot_initialize(uint32_t irq, uint32_t freq)
   lower->freq   = freq;
   lower->irq    = irq;
 
+  spin_lock_init(&lower->lock);
   irq_attach(irq, xtensa_oneshot_interrupt, lower);
 
   return (struct oneshot_lowerhalf_s *)lower;