diff --git a/arch/c5471/src/up_exit.c b/arch/c5471/src/up_exit.c
index 606ea097b5c..c6f544776d0 100644
--- a/arch/c5471/src/up_exit.c
+++ b/arch/c5471/src/up_exit.c
@@ -76,26 +76,27 @@
 static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
 {
   int i;
-  dbg("  TCB=%p name=%s\n", tcb, tcb->name);
+
+  lldbg("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
   if (tcb->filelist)
     {
-      dbg("    filelist refcount=%d\n",
-          tcb->filelist->fl_crefs);
+      lldbg("    filelist refcount=%d\n",
+            tcb->filelist->fl_crefs);
 
       for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
         {
           struct inode *inode = tcb->filelist->fl_files[i].f_inode;
           if (inode)
             {
-              dbg("      fd=%d refcount=%d\n",
-                  i, inode->i_crefs);
+              lldbg("      fd=%d refcount=%d\n",
+                    i, inode->i_crefs);
             }
         }
     }
 
   if (tcb->streams)
     {
-      dbg("    streamlist refcount=%d\n",
+      lldbg("    streamlist refcount=%d\n",
           tcb->streams->sl_crefs);
 
       for (i = 0; i < CONFIG_NFILE_STREAMS; i++)
@@ -103,9 +104,9 @@ static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
           struct file_struct *filep = &tcb->streams->sl_streams[i];
           if (filep->fs_filedes >= 0)
             {
-              dbg("      fd=%d nbytes=%d\n",
-                  filep->fs_filedes,
-                  filep->fs_bufpos - filep->fs_bufstart);
+              lldbg("      fd=%d nbytes=%d\n",
+                    filep->fs_filedes,
+                    filep->fs_bufpos - filep->fs_bufstart);
             }
         }
     }
@@ -128,11 +129,12 @@ static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
 void _exit(int status)
 {
   _TCB* tcb = (_TCB*)g_readytorun.head;
+  irqstate_t flags = irqsave();
 
-  dbg("TCB=%p exitting\n", tcb);
+  lldbg("TCB=%p exitting\n", tcb);
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
-  dbg("Other tasks:\n");
+  lldbg("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
@@ -162,7 +164,7 @@ void _exit(int status)
    */
 
   tcb = (_TCB*)g_readytorun.head;
-  dbg("New Active Task TCB=%p\n", tcb);
+  lldbg("New Active Task TCB=%p\n", tcb);
 
   /* Then switch contexts */
 
diff --git a/arch/dm320/src/up_exit.c b/arch/dm320/src/up_exit.c
index 606ea097b5c..b96d5f824c0 100644
--- a/arch/dm320/src/up_exit.c
+++ b/arch/dm320/src/up_exit.c
@@ -76,7 +76,7 @@
 static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
 {
   int i;
-  dbg("  TCB=%p name=%s\n", tcb, tcb->name);
+  dbg("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
   if (tcb->filelist)
     {
       dbg("    filelist refcount=%d\n",
@@ -128,8 +128,9 @@ static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
 void _exit(int status)
 {
   _TCB* tcb = (_TCB*)g_readytorun.head;
+  irqstate_t flags = irqsave();
 
-  dbg("TCB=%p exitting\n", tcb);
+  lldbg("TCB=%p exitting\n", tcb);
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
   dbg("Other tasks:\n");
@@ -162,7 +163,7 @@ void _exit(int status)
    */
 
   tcb = (_TCB*)g_readytorun.head;
-  dbg("New Active Task TCB=%p\n", tcb);
+  lldbg("New Active Task TCB=%p\n", tcb);
 
   /* Then switch contexts */
 
diff --git a/arch/pjrc-8051/src/up_exit.c b/arch/pjrc-8051/src/up_exit.c
index 5a98496a6ed..a9b641bab4e 100644
--- a/arch/pjrc-8051/src/up_exit.c
+++ b/arch/pjrc-8051/src/up_exit.c
@@ -41,6 +41,7 @@
 #include <sys/types.h>
 #include <sched.h>
 #include <debug.h>
+#include <8052.h>
 #include <nuttx/arch.h>
 #include "os_internal.h"
 #include "up_internal.h"
@@ -76,6 +77,12 @@ void _exit(int status)
 
   dbg("TCB=%p exitting\n", tcb);
 
+  /* Disable interrupts.  Interrupts will remain disabled until
+   * the new task is resumed below when the save IE is restored.
+   */
+
+  EA = 0;
+
   /* Remove the tcb task from the ready-to-run list.  We can
    * ignore the return value because we know that a context
    * switch is needed.