diff --git a/arch/arm/src/arm/up_reprioritizertr.c b/arch/arm/src/arm/up_reprioritizertr.c
index 10175b0df51..693db730395 100644
--- a/arch/arm/src/arm/up_reprioritizertr.c
+++ b/arch/arm/src/arm/up_reprioritizertr.c
@@ -88,7 +88,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/arm/src/armv6-m/up_reprioritizertr.c b/arch/arm/src/armv6-m/up_reprioritizertr.c
index 0f99b917407..4e8eab65c2b 100644
--- a/arch/arm/src/armv6-m/up_reprioritizertr.c
+++ b/arch/arm/src/armv6-m/up_reprioritizertr.c
@@ -87,7 +87,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/arm/src/armv7-a/arm_reprioritizertr.c b/arch/arm/src/armv7-a/arm_reprioritizertr.c
index 359392e990b..07582c0925e 100644
--- a/arch/arm/src/armv7-a/arm_reprioritizertr.c
+++ b/arch/arm/src/armv7-a/arm_reprioritizertr.c
@@ -88,7 +88,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/arm/src/armv7-m/up_reprioritizertr.c b/arch/arm/src/armv7-m/up_reprioritizertr.c
index 22c80ed298e..89313e219d2 100644
--- a/arch/arm/src/armv7-m/up_reprioritizertr.c
+++ b/arch/arm/src/armv7-m/up_reprioritizertr.c
@@ -87,7 +87,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/arm/src/armv7-r/arm_reprioritizertr.c b/arch/arm/src/armv7-r/arm_reprioritizertr.c
index 85b8ee22c0c..4ea30b66d75 100644
--- a/arch/arm/src/armv7-r/arm_reprioritizertr.c
+++ b/arch/arm/src/armv7-r/arm_reprioritizertr.c
@@ -88,7 +88,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/arm/src/efm32/efm32_clockconfig.c b/arch/arm/src/efm32/efm32_clockconfig.c
index aeef784326b..2ff0670f510 100644
--- a/arch/arm/src/efm32/efm32_clockconfig.c
+++ b/arch/arm/src/efm32/efm32_clockconfig.c
@@ -303,7 +303,7 @@ static void efm32_setwaitstates(uint32_t hfcoreclk)
 #ifdef MSC_READCTRL_MODE_WS2
   if (hfcoreclk > CMU_MAX_FREQ_2WS)
     {
-      PANIC();
+      DEBUGPANIC();
     }
   else
 #endif
@@ -319,7 +319,7 @@ static void efm32_setwaitstates(uint32_t hfcoreclk)
 #else
       /* No.. this MCU does not support 2 wait states */
 
-      PANIC();
+      DEBUGPANIC();
 #endif
     }
 
@@ -452,7 +452,7 @@ static inline uint32_t efm32_hfclk_config(uint32_t hfclksel, uint32_t hfclkdiv)
 
 #ifdef CONFIG_DEBUG_FEATURES
       default:
-        PANIC();
+        DEBUGPANIC();
 #endif
     }
 
diff --git a/arch/arm/src/lc823450/lc823450_wdt.c b/arch/arm/src/lc823450/lc823450_wdt.c
index fba29d978b7..c1ef03a8064 100644
--- a/arch/arm/src/lc823450/lc823450_wdt.c
+++ b/arch/arm/src/lc823450/lc823450_wdt.c
@@ -194,7 +194,7 @@ static int lc823450_wdt_interrupt(int irq, FAR void *context, FAR void *arg)
 
   if (!(getreg32(WDT_PT0STS) & (1 << WDT_PT0STS_CSTS)))
     {
-      PANIC();
+      DEBUGPANIC();
     }
 
   /* Is there a registered handler? */
diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c
index 3efff3c4235..87a4d1e4a18 100644
--- a/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/arch/arm/src/lpc31xx/lpc31_ehci.c
@@ -3197,7 +3197,7 @@ static inline void lpc31_portsc_bottomhalf(void)
 static inline void lpc31_syserr_bottomhalf(void)
 {
   usbhost_trace1(EHCI_TRACE1_SYSERR_INTR, 0);
-  PANIC();
+  DEBUGPANIC();
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c
index 7fcef5bc383..91f6886710d 100644
--- a/arch/arm/src/lpc43xx/lpc43_ehci.c
+++ b/arch/arm/src/lpc43xx/lpc43_ehci.c
@@ -3034,7 +3034,7 @@ static inline void lpc43_portsc_bottomhalf(void)
 static inline void lpc43_syserr_bottomhalf(void)
 {
   usbhost_trace1(EHCI_TRACE1_SYSERR_INTR, 0);
-  PANIC();
+  DEBUGPANIC();
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/sam34/sam4cm_tickless.c b/arch/arm/src/sam34/sam4cm_tickless.c
index 396a8fda888..118c41b1843 100644
--- a/arch/arm/src/sam34/sam4cm_tickless.c
+++ b/arch/arm/src/sam34/sam4cm_tickless.c
@@ -245,7 +245,7 @@ void arm_timer_initialize(void)
   if (ret < 0)
     {
       tmrerr("ERROR: sam_oneshot_initialize failed\n");
-      PANIC();
+      DEBUGPANIC();
     }
 
   DEBUGASSERT(ONESHOT_INITIALIZED(&g_tickless.oneshot));
@@ -257,7 +257,7 @@ void arm_timer_initialize(void)
   if (ret < 0)
     {
       tmrerr("ERROR: sam_oneshot_max_delay failed\n");
-      PANIC();
+      DEBUGPANIC();
     }
 
   /* Convert this to configured clock ticks for use by the OS timer logic */
@@ -281,7 +281,7 @@ void arm_timer_initialize(void)
   if (ret < 0)
     {
       tmrerr("ERROR: sam_freerun_initialize failed\n");
-      PANIC();
+      DEBUGPANIC();
     }
 
   DEBUGASSERT(FREERUN_INITIALIZED(&g_tickless.freerun));
diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c
index 10e942dcad7..304351cc70e 100644
--- a/arch/arm/src/sama5/sam_ehci.c
+++ b/arch/arm/src/sama5/sam_ehci.c
@@ -3007,7 +3007,7 @@ static inline void sam_portsc_bottomhalf(void)
 static inline void sam_syserr_bottomhalf(void)
 {
   usbhost_trace1(EHCI_TRACE1_SYSERR_INTR, 0);
-  PANIC();
+  DEBUGPANIC();
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/sama5/sam_tickless.c b/arch/arm/src/sama5/sam_tickless.c
index e77a96b3046..30d1830787c 100644
--- a/arch/arm/src/sama5/sam_tickless.c
+++ b/arch/arm/src/sama5/sam_tickless.c
@@ -257,7 +257,7 @@ void arm_timer_initialize(void)
   if (ret < 0)
     {
       tmrerr("ERROR: sam_oneshot_initialize failed\n");
-      PANIC();
+      DEBUGPANIC();
     }
 
   DEBUGASSERT(ONESHOT_INITIALIZED(&g_tickless.oneshot));
@@ -269,7 +269,7 @@ void arm_timer_initialize(void)
   if (ret < 0)
     {
       tmrerr("ERROR: sam_oneshot_max_delay failed\n");
-      PANIC();
+      DEBUGPANIC();
     }
 
   /* Convert this to configured clock ticks for use by the OS timer logic */
@@ -293,7 +293,7 @@ void arm_timer_initialize(void)
   if (ret < 0)
     {
       tmrerr("ERROR: sam_freerun_initialize failed\n");
-      PANIC();
+      DEBUGPANIC();
     }
 
   DEBUGASSERT(FREERUN_INITIALIZED(&g_tickless.freerun));
diff --git a/arch/arm/src/samv7/sam_tickless.c b/arch/arm/src/samv7/sam_tickless.c
index b1b101455e4..d6ddd2aabf6 100644
--- a/arch/arm/src/samv7/sam_tickless.c
+++ b/arch/arm/src/samv7/sam_tickless.c
@@ -266,7 +266,7 @@ void arm_timer_initialize(void)
   if (ret < 0)
     {
       tmrerr("ERROR: sam_oneshot_initialize failed\n");
-      PANIC();
+      DEBUGPANIC();
     }
 
   DEBUGASSERT(ONESHOT_INITIALIZED(&g_tickless.oneshot));
@@ -279,7 +279,7 @@ void arm_timer_initialize(void)
   if (ret < 0)
     {
       tmrerr("ERROR: sam_freerun_initialize failed\n");
-      PANIC();
+      DEBUGPANIC();
     }
 
   DEBUGASSERT(FREERUN_INITIALIZED(&g_tickless.freerun));
diff --git a/arch/arm/src/stm32/stm32f10xxx_dma.c b/arch/arm/src/stm32/stm32f10xxx_dma.c
index 72da836ad1b..e080fdd2b8e 100644
--- a/arch/arm/src/stm32/stm32f10xxx_dma.c
+++ b/arch/arm/src/stm32/stm32f10xxx_dma.c
@@ -307,7 +307,7 @@ static int stm32_dmainterrupt(int irq, void *context, FAR void *arg)
   else
 #endif
     {
-      PANIC();
+      DEBUGPANIC();
     }
   dmach = &g_dma[chndx];
 
diff --git a/arch/arm/src/stm32/stm32f20xxx_dma.c b/arch/arm/src/stm32/stm32f20xxx_dma.c
index 86b95f7f137..5f7fb72f513 100644
--- a/arch/arm/src/stm32/stm32f20xxx_dma.c
+++ b/arch/arm/src/stm32/stm32f20xxx_dma.c
@@ -410,7 +410,7 @@ static int stm32_dmainterrupt(int irq, void *context, FAR void *arg)
   else
 #endif
     {
-      PANIC();
+      DEBUGPANIC();
     }
 
   /* Get the stream structure from the stream and controller numbers */
diff --git a/arch/arm/src/stm32/stm32f33xxx_dma.c b/arch/arm/src/stm32/stm32f33xxx_dma.c
index 1c0c626e601..81cee7b23b5 100644
--- a/arch/arm/src/stm32/stm32f33xxx_dma.c
+++ b/arch/arm/src/stm32/stm32f33xxx_dma.c
@@ -255,7 +255,7 @@ static int stm32_dmainterrupt(int irq, void *context, FAR void *arg)
     }
   else
     {
-      PANIC();
+      DEBUGPANIC();
     }
   dmach = &g_dma[chndx];
 
diff --git a/arch/arm/src/stm32/stm32f40xxx_dma.c b/arch/arm/src/stm32/stm32f40xxx_dma.c
index 7f528f1a330..608204d92d7 100644
--- a/arch/arm/src/stm32/stm32f40xxx_dma.c
+++ b/arch/arm/src/stm32/stm32f40xxx_dma.c
@@ -409,7 +409,7 @@ static int stm32_dmainterrupt(int irq, void *context, void *arg)
   else
 #endif
     {
-      PANIC();
+      DEBUGPANIC();
     }
 
   /* Get the stream structure from the stream and controller numbers */
diff --git a/arch/arm/src/stm32f7/stm32_dma.c b/arch/arm/src/stm32f7/stm32_dma.c
index 7a083e3239c..eb0fab35caa 100644
--- a/arch/arm/src/stm32f7/stm32_dma.c
+++ b/arch/arm/src/stm32f7/stm32_dma.c
@@ -411,7 +411,7 @@ static int stm32_dmainterrupt(int irq, void *context, FAR void *arg)
   else
 #endif
     {
-      PANIC();
+      DEBUGPANIC();
     }
 
   /* Get the stream structure from the stream and controller numbers */
diff --git a/arch/arm/src/stm32l4/stm32l4_i2c.c b/arch/arm/src/stm32l4/stm32l4_i2c.c
index a50bc0aaa69..389bfcd7395 100644
--- a/arch/arm/src/stm32l4/stm32l4_i2c.c
+++ b/arch/arm/src/stm32l4/stm32l4_i2c.c
@@ -1495,7 +1495,7 @@ static void stm32l4_i2c_setclock(FAR struct stm32l4_i2c_priv_s *priv,
 #endif
       else
         {
-          PANIC();
+          DEBUGPANIC();
         }
 
       uint32_t timingr =
diff --git a/arch/arm/src/stm32l4/stm32l4_tickless.c b/arch/arm/src/stm32l4/stm32l4_tickless.c
index ad4a55e7055..11c3caeccbb 100644
--- a/arch/arm/src/stm32l4/stm32l4_tickless.c
+++ b/arch/arm/src/stm32l4/stm32l4_tickless.c
@@ -202,7 +202,7 @@ void arm_timer_initialize(void)
   if (ret < 0)
     {
       tmrerr("ERROR: stm32l4_oneshot_initialize failed\n");
-      PANIC();
+      DEBUGPANIC();
     }
 
 #ifdef CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP
@@ -212,7 +212,7 @@ void arm_timer_initialize(void)
   if (ret < 0)
     {
       tmrerr("ERROR: stm32l4_oneshot_max_delay failed\n");
-      PANIC();
+      DEBUGPANIC();
     }
 
   /* Convert this to configured clock ticks for use by the OS timer logic */
@@ -236,7 +236,7 @@ void arm_timer_initialize(void)
   if (ret < 0)
     {
       tmrerr("ERROR: stm32l4_freerun_initialize failed\n");
-      PANIC();
+      DEBUGPANIC();
     }
 }
 
diff --git a/arch/arm/src/stm32l4/stm32l4x6xx_dma.c b/arch/arm/src/stm32l4/stm32l4x6xx_dma.c
index d727be752b8..0d4dec44988 100644
--- a/arch/arm/src/stm32l4/stm32l4x6xx_dma.c
+++ b/arch/arm/src/stm32l4/stm32l4x6xx_dma.c
@@ -305,7 +305,7 @@ static int stm32l4_dmainterrupt(int irq, void *context, FAR void *arg)
 #endif
   else
     {
-      PANIC();
+      DEBUGPANIC();
     }
   dmach = &g_dma[chndx];
 
diff --git a/arch/arm/src/str71x/str71x_decodeirq.c b/arch/arm/src/str71x/str71x_decodeirq.c
index 88751c80c14..402539e33c3 100644
--- a/arch/arm/src/str71x/str71x_decodeirq.c
+++ b/arch/arm/src/str71x/str71x_decodeirq.c
@@ -135,7 +135,7 @@ void up_decodeirq(uint32_t *regs)
 #ifdef CONFIG_DEBUG_FEATURES
   else
     {
-      PANIC(); /* Normally never happens */
+      DEBUGPANIC(); /* Normally never happens */
     }
 #endif
   board_autoled_off(LED_INIRQ);
diff --git a/arch/arm/src/tiva/tiva_adclow.c b/arch/arm/src/tiva/tiva_adclow.c
index 806adbd0b30..8b681d7b033 100644
--- a/arch/arm/src/tiva/tiva_adclow.c
+++ b/arch/arm/src/tiva/tiva_adclow.c
@@ -685,7 +685,7 @@ static void tiva_adc_read(void *arg)
        */
 
       aerr("ERROR: Invalid ADC device number given %d\n", sse->adc);
-      PANIC();
+      DEBUGPANIC();
       return;
     }
 
diff --git a/arch/arm/src/tms570/tms570_serial.c b/arch/arm/src/tms570/tms570_serial.c
index 469074e4942..9c36ac56c26 100644
--- a/arch/arm/src/tms570/tms570_serial.c
+++ b/arch/arm/src/tms570/tms570_serial.c
@@ -499,7 +499,7 @@ static int tms570_interrupt(int irq, void *context, FAR void *arg)
           case SCI_INTVECT_TIMEOUT: /* Timeout interrupt */
 
           default:
-            PANIC();
+            DEBUGPANIC();
         }
     }
 
diff --git a/arch/avr/src/avr/up_reprioritizertr.c b/arch/avr/src/avr/up_reprioritizertr.c
index 28323ffbb73..abf985707f4 100644
--- a/arch/avr/src/avr/up_reprioritizertr.c
+++ b/arch/avr/src/avr/up_reprioritizertr.c
@@ -87,7 +87,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/avr/src/avr32/up_reprioritizertr.c b/arch/avr/src/avr32/up_reprioritizertr.c
index eb8023d7208..a40c623c552 100644
--- a/arch/avr/src/avr32/up_reprioritizertr.c
+++ b/arch/avr/src/avr32/up_reprioritizertr.c
@@ -88,7 +88,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/hc/src/common/up_reprioritizertr.c b/arch/hc/src/common/up_reprioritizertr.c
index 757f2ad05cd..1cd72b38d03 100644
--- a/arch/hc/src/common/up_reprioritizertr.c
+++ b/arch/hc/src/common/up_reprioritizertr.c
@@ -88,7 +88,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/mips/src/common/up_exit.c b/arch/mips/src/common/up_exit.c
index d21a27e064d..936cf4f11ae 100644
--- a/arch/mips/src/common/up_exit.c
+++ b/arch/mips/src/common/up_exit.c
@@ -189,6 +189,6 @@ void _exit(int status)
    * interrupts are disabled.
    */
 
-  PANIC();
+  DEBUGPANIC();
 }
 
diff --git a/arch/mips/src/mips32/up_reprioritizertr.c b/arch/mips/src/mips32/up_reprioritizertr.c
index cae6ed3af5e..d8da73bfbd1 100644
--- a/arch/mips/src/mips32/up_reprioritizertr.c
+++ b/arch/mips/src/mips32/up_reprioritizertr.c
@@ -90,7 +90,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/mips/src/mips32/up_sigdeliver.c b/arch/mips/src/mips32/up_sigdeliver.c
index 4c986d42354..23fce54143e 100644
--- a/arch/mips/src/mips32/up_sigdeliver.c
+++ b/arch/mips/src/mips32/up_sigdeliver.c
@@ -147,7 +147,7 @@ void up_sigdeliver(void)
    * interrupts are disabled.
    */
 
-  PANIC();
+  DEBUGPANIC();
 }
 
 #endif /* !CONFIG_DISABLE_SIGNALS */
diff --git a/arch/misoc/src/lm32/lm32_reprioritizertr.c b/arch/misoc/src/lm32/lm32_reprioritizertr.c
index 735b69ced74..3d33b1b0081 100644
--- a/arch/misoc/src/lm32/lm32_reprioritizertr.c
+++ b/arch/misoc/src/lm32/lm32_reprioritizertr.c
@@ -90,7 +90,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/misoc/src/lm32/lm32_sigdeliver.c b/arch/misoc/src/lm32/lm32_sigdeliver.c
index 8b96ae47d7f..60d5e5f6afa 100644
--- a/arch/misoc/src/lm32/lm32_sigdeliver.c
+++ b/arch/misoc/src/lm32/lm32_sigdeliver.c
@@ -134,7 +134,7 @@ void lm32_sigdeliver(void)
    * interrupts are disabled.
    */
 
-  PANIC();
+  DEBUGPANIC();
 }
 
 #endif /* !CONFIG_DISABLE_SIGNALS */
diff --git a/arch/or1k/src/common/up_reprioritizertr.c b/arch/or1k/src/common/up_reprioritizertr.c
index a49849b75c4..8cac15b8169 100644
--- a/arch/or1k/src/common/up_reprioritizertr.c
+++ b/arch/or1k/src/common/up_reprioritizertr.c
@@ -88,7 +88,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/renesas/src/common/up_reprioritizertr.c b/arch/renesas/src/common/up_reprioritizertr.c
index 2733ecb8d97..463e9c8e9b7 100644
--- a/arch/renesas/src/common/up_reprioritizertr.c
+++ b/arch/renesas/src/common/up_reprioritizertr.c
@@ -88,7 +88,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/risc-v/src/common/up_exit.c b/arch/risc-v/src/common/up_exit.c
index 5456012aeee..0f4b56e7ef8 100644
--- a/arch/risc-v/src/common/up_exit.c
+++ b/arch/risc-v/src/common/up_exit.c
@@ -189,6 +189,6 @@ void _exit(int status)
    * interrupts are disabled.
    */
 
-  PANIC();
+  DEBUGPANIC();
 }
 
diff --git a/arch/risc-v/src/rv32im/up_reprioritizertr.c b/arch/risc-v/src/rv32im/up_reprioritizertr.c
index e286d5026ec..f525ab4791c 100644
--- a/arch/risc-v/src/rv32im/up_reprioritizertr.c
+++ b/arch/risc-v/src/rv32im/up_reprioritizertr.c
@@ -90,7 +90,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/risc-v/src/rv32im/up_sigdeliver.c b/arch/risc-v/src/rv32im/up_sigdeliver.c
index 73ecbcb2273..ccd12cf4942 100644
--- a/arch/risc-v/src/rv32im/up_sigdeliver.c
+++ b/arch/risc-v/src/rv32im/up_sigdeliver.c
@@ -140,7 +140,7 @@ void up_sigdeliver(void)
    * interrupts are disabled.
    */
 
-  PANIC();
+  DEBUGPANIC();
 }
 
 #endif /* !CONFIG_DISABLE_SIGNALS */
diff --git a/arch/sim/src/up_reprioritizertr.c b/arch/sim/src/up_reprioritizertr.c
index 36e34230477..a0edf12db09 100644
--- a/arch/sim/src/up_reprioritizertr.c
+++ b/arch/sim/src/up_reprioritizertr.c
@@ -88,7 +88,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/sim/src/up_smphook.c b/arch/sim/src/up_smphook.c
index e871c42f0fb..2b979aefcc8 100644
--- a/arch/sim/src/up_smphook.c
+++ b/arch/sim/src/up_smphook.c
@@ -79,7 +79,7 @@ void sim_smp_hook(void)
 
   /* That function should not return. */
 
-  PANIC();
+  DEBUGPANIC();
 }
 
 #endif /* CONFIG_SMP */
diff --git a/arch/x86/src/common/up_reprioritizertr.c b/arch/x86/src/common/up_reprioritizertr.c
index 75428b84c98..92cd1f20bcc 100644
--- a/arch/x86/src/common/up_reprioritizertr.c
+++ b/arch/x86/src/common/up_reprioritizertr.c
@@ -88,7 +88,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/xtensa/src/common/xtensa_exit.c b/arch/xtensa/src/common/xtensa_exit.c
index d8dafeb20c9..6d063c7ce32 100644
--- a/arch/xtensa/src/common/xtensa_exit.c
+++ b/arch/xtensa/src/common/xtensa_exit.c
@@ -202,5 +202,5 @@ void _exit(int status)
    * interrupts are disabled.
    */
 
-  PANIC();
+  DEBUGPANIC();
 }
diff --git a/arch/xtensa/src/common/xtensa_reprioritizertr.c b/arch/xtensa/src/common/xtensa_reprioritizertr.c
index 617bb50c619..a531c714480 100644
--- a/arch/xtensa/src/common/xtensa_reprioritizertr.c
+++ b/arch/xtensa/src/common/xtensa_reprioritizertr.c
@@ -90,7 +90,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/z16/src/common/up_reprioritizertr.c b/arch/z16/src/common/up_reprioritizertr.c
index 588ec4d68fd..76fe4a1f5da 100644
--- a/arch/z16/src/common/up_reprioritizertr.c
+++ b/arch/z16/src/common/up_reprioritizertr.c
@@ -89,7 +89,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/arch/z80/src/common/up_reprioritizertr.c b/arch/z80/src/common/up_reprioritizertr.c
index 118ed179c5d..1af19ded1fc 100644
--- a/arch/z80/src/common/up_reprioritizertr.c
+++ b/arch/z80/src/common/up_reprioritizertr.c
@@ -91,7 +91,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority)
 #endif
     )
     {
-       PANIC();
+       DEBUGPANIC();
     }
   else
     {
diff --git a/drivers/wireless/ieee80211/bcmf_sdio.c b/drivers/wireless/ieee80211/bcmf_sdio.c
index 24fe0f5cf07..d507bf7492c 100644
--- a/drivers/wireless/ieee80211/bcmf_sdio.c
+++ b/drivers/wireless/ieee80211/bcmf_sdio.c
@@ -945,7 +945,7 @@ struct bcmf_sdio_frame *bcmf_sdio_allocate_frame(FAR struct bcmf_dev_s *priv,
     {
       if (nxsem_wait(&sbus->queue_mutex) < 0)
         {
-          PANIC();
+          DEBUGPANIC();
         }
 
 #if 0
@@ -995,7 +995,7 @@ void bcmf_sdio_free_frame(FAR struct bcmf_dev_s *priv,
 
   if (nxsem_wait(&sbus->queue_mutex) < 0)
     {
-      PANIC();
+      DEBUGPANIC();
     }
 
   bcmf_dqueue_push(&sbus->free_queue, &sframe->list_entry);
diff --git a/drivers/wireless/ieee80211/bcmf_sdpcm.c b/drivers/wireless/ieee80211/bcmf_sdpcm.c
index 90b7a31e8ef..bede09fb300 100644
--- a/drivers/wireless/ieee80211/bcmf_sdpcm.c
+++ b/drivers/wireless/ieee80211/bcmf_sdpcm.c
@@ -258,7 +258,7 @@ int bcmf_sdpcm_readframe(FAR struct bcmf_dev_s *priv)
 
         if (nxsem_wait(&sbus->queue_mutex) < 0)
           {
-            PANIC();
+            DEBUGPANIC();
           }
 
         bcmf_dqueue_push(&sbus->rx_queue, &sframe->list_entry);
@@ -313,7 +313,7 @@ int bcmf_sdpcm_sendframe(FAR struct bcmf_dev_s *priv)
 
   if (nxsem_wait(&sbus->queue_mutex) < 0)
     {
-      PANIC();
+      DEBUGPANIC();
     }
 
   entry = sbus->tx_queue.tail;
@@ -397,7 +397,7 @@ int bcmf_sdpcm_queue_frame(FAR struct bcmf_dev_s *priv,
 
   if (nxsem_wait(&sbus->queue_mutex) < 0)
     {
-      PANIC();
+      DEBUGPANIC();
     }
 
   bcmf_dqueue_push(&sbus->tx_queue, &sframe->list_entry);
@@ -459,7 +459,7 @@ struct bcmf_frame_s *bcmf_sdpcm_get_rx_frame(FAR struct bcmf_dev_s *priv)
 
   if (nxsem_wait(&sbus->queue_mutex) < 0)
     {
-      PANIC();
+      DEBUGPANIC();
     }
 
   entry = bcmf_dqueue_pop_tail(&sbus->rx_queue);
diff --git a/libs/libc/stdio/lib_setvbuf.c b/libs/libc/stdio/lib_setvbuf.c
index de776e57a18..f5d33d0e738 100644
--- a/libs/libc/stdio/lib_setvbuf.c
+++ b/libs/libc/stdio/lib_setvbuf.c
@@ -234,7 +234,7 @@ int setvbuf(FAR FILE *stream, FAR char *buffer, int mode, size_t size)
         break;
 
       default:
-        PANIC();
+        DEBUGPANIC();
     }
 
    /* Do not release the previous buffer if it was allocated by the user
diff --git a/libs/libnx/nxfonts/nxfonts_cache.c b/libs/libnx/nxfonts/nxfonts_cache.c
index bec084ab4db..855f7313208 100644
--- a/libs/libnx/nxfonts/nxfonts_cache.c
+++ b/libs/libnx/nxfonts/nxfonts_cache.c
@@ -500,7 +500,7 @@ static inline void nxf_fillglyph(FAR struct nxfonts_fcache_s *priv,
   else
 #endif
     {
-      PANIC();
+      DEBUGPANIC();
     }
 }
 
diff --git a/libs/libxx/libxx_cxapurevirtual.cxx b/libs/libxx/libxx_cxapurevirtual.cxx
index 42adad8d4a8..11be9b80b93 100644
--- a/libs/libxx/libxx_cxapurevirtual.cxx
+++ b/libs/libxx/libxx_cxapurevirtual.cxx
@@ -63,7 +63,7 @@ extern "C"
 {
   void __cxa_pure_virtual(void)
   {
-    PANIC();
+    DEBUGPANIC();
   }
 }
 
diff --git a/sched/init/os_smpstart.c b/sched/init/os_smpstart.c
index 163983277e8..b6e7411a380 100644
--- a/sched/init/os_smpstart.c
+++ b/sched/init/os_smpstart.c
@@ -111,7 +111,7 @@ void os_idle_trampoline(void)
 
   /* The IDLE task should never return */
 
-  PANIC();
+  DEBUGPANIC();
 }
 
 /****************************************************************************
diff --git a/sched/mqueue/mq_msgfree.c b/sched/mqueue/mq_msgfree.c
index 4ea3735f733..157b49348d0 100644
--- a/sched/mqueue/mq_msgfree.c
+++ b/sched/mqueue/mq_msgfree.c
@@ -112,6 +112,6 @@ void nxmq_free_msg(FAR struct mqueue_msg_s *mqmsg)
     }
   else
     {
-      PANIC();
+      DEBUGPANIC();
     }
 }