diff --git a/arch/arm/src/common/arm_exit.c b/arch/arm/src/common/arm_exit.c
index c44c4cf104..a998a15851 100644
--- a/arch/arm/src/common/arm_exit.c
+++ b/arch/arm/src/common/arm_exit.c
@@ -115,15 +115,15 @@ void up_exit(int status)
 
   sinfo("TCB=%p exiting\n", tcb);
 
+  /* Destroy the task at the head of the ready to run list. */
+
+  nxtask_exit();
+
 #ifdef CONFIG_DUMP_ON_EXIT
   sinfo("Other tasks:\n");
   nxsched_foreach(_up_dumponexit, NULL);
 #endif
 
-  /* Destroy the task at the head of the ready to run list. */
-
-  nxtask_exit();
-
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
    */
diff --git a/arch/avr/src/common/up_exit.c b/arch/avr/src/common/up_exit.c
index 98ac5160d4..e0c9664e7a 100644
--- a/arch/avr/src/common/up_exit.c
+++ b/arch/avr/src/common/up_exit.c
@@ -114,15 +114,15 @@ void up_exit(int status)
 
   sinfo("TCB=%p exiting\n", tcb);
 
+  /* Destroy the task at the head of the ready to run list. */
+
+  nxtask_exit();
+
 #ifdef CONFIG_DUMP_ON_EXIT
   sinfo("Other tasks:\n");
   nxsched_foreach(_up_dumponexit, NULL);
 #endif
 
-  /* Destroy the task at the head of the ready to run list. */
-
-  nxtask_exit();
-
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
    */
diff --git a/arch/hc/src/common/up_exit.c b/arch/hc/src/common/up_exit.c
index 3ba7affd60..3e92f8936b 100644
--- a/arch/hc/src/common/up_exit.c
+++ b/arch/hc/src/common/up_exit.c
@@ -114,15 +114,15 @@ void up_exit(int status)
 
   sinfo("TCB=%p exiting\n", tcb);
 
+  /* Destroy the task at the head of the ready to run list. */
+
+  nxtask_exit();
+
 #ifdef CONFIG_DUMP_ON_EXIT
   sinfo("Other tasks:\n");
   nxsched_foreach(_up_dumponexit, NULL);
 #endif
 
-  /* Destroy the task at the head of the ready to run list. */
-
-  nxtask_exit();
-
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
    */
diff --git a/arch/mips/src/common/mips_exit.c b/arch/mips/src/common/mips_exit.c
index dd17b8d436..b28dbd24c2 100644
--- a/arch/mips/src/common/mips_exit.c
+++ b/arch/mips/src/common/mips_exit.c
@@ -116,15 +116,15 @@ void up_exit(int status)
 
   sinfo("TCB=%p exiting\n", tcb);
 
+  /* Destroy the task at the head of the ready to run list. */
+
+  nxtask_exit();
+
 #ifdef CONFIG_DUMP_ON_EXIT
   sinfo("Other tasks:\n");
   nxsched_foreach(_up_dumponexit, NULL);
 #endif
 
-  /* Destroy the task at the head of the ready to run list. */
-
-  nxtask_exit();
-
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
    */
diff --git a/arch/misoc/src/lm32/lm32_exit.c b/arch/misoc/src/lm32/lm32_exit.c
index 3474bafb35..fb75de94d3 100644
--- a/arch/misoc/src/lm32/lm32_exit.c
+++ b/arch/misoc/src/lm32/lm32_exit.c
@@ -108,15 +108,15 @@ void up_exit(int status)
 
   sinfo("TCB=%p exiting\n", tcb);
 
+  /* Destroy the task at the head of the ready to run list. */
+
+  nxtask_exit();
+
 #ifdef CONFIG_DUMP_ON_EXIT
   sinfo("Other tasks:\n");
   nxsched_foreach(_up_dumponexit, NULL);
 #endif
 
-  /* Destroy the task at the head of the ready to run list. */
-
-  nxtask_exit();
-
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
    */
diff --git a/arch/misoc/src/minerva/minerva_exit.c b/arch/misoc/src/minerva/minerva_exit.c
index 814eaaeafd..0be779b84b 100644
--- a/arch/misoc/src/minerva/minerva_exit.c
+++ b/arch/misoc/src/minerva/minerva_exit.c
@@ -108,15 +108,15 @@ void up_exit(int status)
 
   sinfo("TCB=%p exiting\n", tcb);
 
+  /* Destroy the task at the head of the ready to run list. */
+
+  nxtask_exit();
+
 #ifdef CONFIG_DUMP_ON_EXIT
   sinfo("Other tasks:\n");
   nxsched_foreach(_up_dumponexit, NULL);
 #endif
 
-  /* Destroy the task at the head of the ready to run list. */
-
-  nxtask_exit();
-
   /* Now, perform the context switch to the new ready-to-run task at the head
    * of the list.
    */
diff --git a/arch/or1k/src/common/up_exit.c b/arch/or1k/src/common/up_exit.c
index 017b19e915..ff68918b04 100644
--- a/arch/or1k/src/common/up_exit.c
+++ b/arch/or1k/src/common/up_exit.c
@@ -115,15 +115,15 @@ void up_exit(int status)
 
   sinfo("TCB=%p exiting\n", tcb);
 
+  /* Destroy the task at the head of the ready to run list. */
+
+  nxtask_exit();
+
 #ifdef CONFIG_DUMP_ON_EXIT
   sinfo("Other tasks:\n");
   nxsched_foreach(_up_dumponexit, NULL);
 #endif
 
-  /* Destroy the task at the head of the ready to run list. */
-
-  nxtask_exit();
-
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
    */
diff --git a/arch/renesas/src/common/up_exit.c b/arch/renesas/src/common/up_exit.c
index 9ef5347b5b..6d78ba4dcc 100644
--- a/arch/renesas/src/common/up_exit.c
+++ b/arch/renesas/src/common/up_exit.c
@@ -114,15 +114,15 @@ void up_exit(int status)
 
   sinfo("TCB=%p exiting\n", tcb);
 
+  /* Destroy the task at the head of the ready to run list. */
+
+  nxtask_exit();
+
 #ifdef CONFIG_DUMP_ON_EXIT
   sinfo("Other tasks:\n");
   nxsched_foreach(_up_dumponexit, NULL);
 #endif
 
-  /* Destroy the task at the head of the ready to run list. */
-
-  nxtask_exit();
-
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
    */
diff --git a/arch/risc-v/src/common/riscv_exit.c b/arch/risc-v/src/common/riscv_exit.c
index 10036e9116..c6177f29b7 100644
--- a/arch/risc-v/src/common/riscv_exit.c
+++ b/arch/risc-v/src/common/riscv_exit.c
@@ -116,15 +116,15 @@ void up_exit(int status)
 
   sinfo("TCB=%p exiting\n", tcb);
 
+  /* Destroy the task at the head of the ready to run list. */
+
+  nxtask_exit();
+
 #ifdef CONFIG_DUMP_ON_EXIT
   sinfo("Other tasks:\n");
   nxsched_foreach(_up_dumponexit, NULL);
 #endif
 
-  /* Destroy the task at the head of the ready to run list. */
-
-  nxtask_exit();
-
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
    */
diff --git a/arch/sparc/src/common/up_exit.c b/arch/sparc/src/common/up_exit.c
index 808b69ece0..8f6a7d4e40 100644
--- a/arch/sparc/src/common/up_exit.c
+++ b/arch/sparc/src/common/up_exit.c
@@ -137,11 +137,6 @@ void up_exit(int status)
 
   sinfo("TCB=%p exiting\n", tcb);
 
-#ifdef CONFIG_DUMP_ON_EXIT
-  sinfo("Other tasks:\n");
-  sched_foreach(_up_dumponexit, NULL);
-#endif
-
   /* Update scheduler parameters */
 
   nxsched_suspend_scheduler(tcb);
@@ -150,6 +145,11 @@ void up_exit(int status)
 
   (void)nxtask_exit();
 
+#ifdef CONFIG_DUMP_ON_EXIT
+  sinfo("Other tasks:\n");
+  sched_foreach(_up_dumponexit, NULL);
+#endif
+
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
    */
diff --git a/arch/x86/src/common/up_exit.c b/arch/x86/src/common/up_exit.c
index 82463648bb..46864f2d5b 100644
--- a/arch/x86/src/common/up_exit.c
+++ b/arch/x86/src/common/up_exit.c
@@ -114,15 +114,15 @@ void up_exit(int status)
 
   sinfo("TCB=%p exiting\n", tcb);
 
+  /* Destroy the task at the head of the ready to run list. */
+
+  nxtask_exit();
+
 #ifdef CONFIG_DUMP_ON_EXIT
   sinfo("Other tasks:\n");
   nxsched_foreach(_up_dumponexit, NULL);
 #endif
 
-  /* Destroy the task at the head of the ready to run list. */
-
-  nxtask_exit();
-
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
    */
diff --git a/arch/x86_64/src/common/up_exit.c b/arch/x86_64/src/common/up_exit.c
index 3d4fd39e50..8671fcba97 100644
--- a/arch/x86_64/src/common/up_exit.c
+++ b/arch/x86_64/src/common/up_exit.c
@@ -114,15 +114,15 @@ void up_exit(int status)
 
   sinfo("TCB=%p exiting\n", this_task());
 
+  /* Destroy the task at the head of the ready to run list. */
+
+  nxtask_exit();
+
 #ifdef CONFIG_DUMP_ON_EXIT
   sinfo("Other tasks:\n");
   nxsched_foreach(_up_dumponexit, NULL);
 #endif
 
-  /* Destroy the task at the head of the ready to run list. */
-
-  nxtask_exit();
-
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
    */
diff --git a/arch/xtensa/src/common/xtensa_exit.c b/arch/xtensa/src/common/xtensa_exit.c
index edc6d17048..612862de41 100644
--- a/arch/xtensa/src/common/xtensa_exit.c
+++ b/arch/xtensa/src/common/xtensa_exit.c
@@ -116,11 +116,6 @@ void up_exit(int status)
 
   sinfo("TCB=%p exiting\n", tcb);
 
-#ifdef CONFIG_DUMP_ON_EXIT
-  sinfo("Other tasks:\n");
-  nxsched_foreach(_xtensa_dumponexit, NULL);
-#endif
-
 #if XCHAL_CP_NUM > 0
   /* Disable co-processor support for the task that is exit-ing. */
 
@@ -131,6 +126,11 @@ void up_exit(int status)
 
   nxtask_exit();
 
+#ifdef CONFIG_DUMP_ON_EXIT
+  sinfo("Other tasks:\n");
+  nxsched_foreach(_xtensa_dumponexit, NULL);
+#endif
+
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
    */
diff --git a/arch/z16/src/common/z16_exit.c b/arch/z16/src/common/z16_exit.c
index ed072a6241..c7fc4d38b5 100644
--- a/arch/z16/src/common/z16_exit.c
+++ b/arch/z16/src/common/z16_exit.c
@@ -114,15 +114,15 @@ void up_exit(int status)
 
   sinfo("TCB=%p exiting\n", tcb);
 
+  /* Destroy the task at the head of the ready to run list. */
+
+  nxtask_exit();
+
 #ifdef CONFIG_DUMP_ON_EXIT
   sinfo("Other tasks:\n");
   nxsched_foreach(_z16_dumponexit, NULL);
 #endif
 
-  /* Destroy the task at the head of the ready to run list. */
-
-  nxtask_exit();
-
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
    */
diff --git a/arch/z80/src/common/z80_exit.c b/arch/z80/src/common/z80_exit.c
index f1dece39a9..6843ba0ae8 100644
--- a/arch/z80/src/common/z80_exit.c
+++ b/arch/z80/src/common/z80_exit.c
@@ -116,15 +116,15 @@ void up_exit(int status)
 
   sinfo("TCB=%p exiting\n", tcb);
 
+  /* Destroy the task at the head of the ready to run list. */
+
+  nxtask_exit();
+
 #ifdef CONFIG_DUMP_ON_EXIT
   sinfo("Other tasks:\n");
   nxsched_foreach(_up_dumponexit, NULL);
 #endif
 
-  /* Destroy the task at the head of the ready to run list. */
-
-  nxtask_exit();
-
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
    */