diff --git a/arch/xtensa/include/irq.h b/arch/xtensa/include/irq.h
index 2a2cdff965b..d06e06fc575 100644
--- a/arch/xtensa/include/irq.h
+++ b/arch/xtensa/include/irq.h
@@ -258,6 +258,33 @@ static inline void up_irq_disable(void)
 #endif
 }
 
+/****************************************************************************
+ * Name: xtensa_disable_all
+ ****************************************************************************/
+
+static inline void xtensa_disable_all(void)
+{
+  __asm__ __volatile__
+  (
+    "movi a2, 0\n"
+    "xsr a2, INTENABLE\n"
+    : : : "a2"
+  );
+}
+
+/****************************************************************************
+ * Name: xtensa_intclear
+ ****************************************************************************/
+
+static inline void xtensa_intclear(uint32_t mask)
+{
+  __asm__ __volatile__
+  (
+    "wsr %0, INTCLEAR\n"
+    : "=r"(mask) : :
+  );
+}
+
 /****************************************************************************
  * Public Data
  ****************************************************************************/
diff --git a/arch/xtensa/src/esp32/esp32_irq.c b/arch/xtensa/src/esp32/esp32_irq.c
index afca982cd7e..01999fea07c 100644
--- a/arch/xtensa/src/esp32/esp32_irq.c
+++ b/arch/xtensa/src/esp32/esp32_irq.c
@@ -216,33 +216,6 @@ static inline void xtensa_attach_fromcpu1_interrupt(void)
 }
 #endif
 
-/****************************************************************************
- * Name: xtensa_disable_all
- ****************************************************************************/
-
-static inline void xtensa_disable_all(void)
-{
-  __asm__ __volatile__
-  (
-    "movi a2, 0\n"
-    "xsr a2, INTENABLE\n"
-    : : : "a2"
-  );
-}
-
-/****************************************************************************
- * Name: xtensa_intclear
- ****************************************************************************/
-
-static inline void xtensa_intclear(uint32_t mask)
-{
-  __asm__ __volatile__
-  (
-    "wsr %0, INTCLEAR\n"
-    : "=r"(mask) : :
-  );
-}
-
 /****************************************************************************
  * Name: esp32_intinfo
  *
diff --git a/arch/xtensa/src/esp32s2/esp32s2_cpuint.c b/arch/xtensa/src/esp32s2/esp32s2_cpuint.c
index ce1c3447b35..c22c38f2a8d 100644
--- a/arch/xtensa/src/esp32s2/esp32s2_cpuint.c
+++ b/arch/xtensa/src/esp32s2/esp32s2_cpuint.c
@@ -206,23 +206,6 @@ static const uint32_t g_priority[5] =
  * Private Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: xtensa_disable_all
- *
- * Description:
- *  Disable all CPU interrupts.
- ****************************************************************************/
-
-static inline void xtensa_disable_all(void)
-{
-  __asm__ __volatile__
-  (
-    "movi a2, 0\n"
-    "xsr a2, INTENABLE\n"
-    : : : "a2"
-  );
-}
-
 /****************************************************************************
  * Name:  esp32s2_alloc_cpuint
  *
diff --git a/arch/xtensa/src/esp32s2/esp32s2_intdecode.c b/arch/xtensa/src/esp32s2/esp32s2_intdecode.c
index 5f6ac7e05b6..6e7e0d618eb 100644
--- a/arch/xtensa/src/esp32s2/esp32s2_intdecode.c
+++ b/arch/xtensa/src/esp32s2/esp32s2_intdecode.c
@@ -37,19 +37,6 @@
  * Private Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: xtensa_intclear
- ****************************************************************************/
-
-static inline void xtensa_intclear(uint32_t mask)
-{
-  __asm__ __volatile__
-  (
-    "wsr %0, INTCLEAR\n"
-    : "=r"(mask) : :
-  );
-}
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/