2 files changed, 6 insertions, 8 deletions

diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index f19ca6152460..57fc7028714a 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -151,12 +151,10 @@ void new_thread_handler(void)
          * 0 if it just exits
          */
         n = run_kernel_thread(fn, arg, &current->thread.exec_buf);
-        if (n == 1) {
-                /* Handle any immediate reschedules or signals */
-                interrupt_end();
+        if (n == 1)
                 userspace(&current->thread.regs.regs);
-        }
-        else do_exit(0);
+        else
+                do_exit(0);
 }
 
 /* Called magically, see new_thread_handler above */
@@ -175,9 +173,6 @@ void fork_handler(void)
 
         current->thread.prev_sched = NULL;
 
-        /* Handle any immediate reschedules or signals */
-        interrupt_end();
-
         userspace(&current->thread.regs.regs);
 }
 
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index cd65727854eb..2687f1f3a709 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -347,6 +347,9 @@ void userspace(struct uml_pt_regs *regs)
         /* To prevent races if using_sysemu changes under us.*/
         int local_using_sysemu;
 
+        /* Handle any immediate reschedules or signals */
+        interrupt_end();
+
         if (getitimer(ITIMER_VIRTUAL, &timer))
                 printk(UM_KERN_ERR "Failed to get itimer, errno = %d\n", errno);
         nsecs = timer.it_value.tv_sec * UM_NSEC_PER_SEC +