1 files changed, 2 insertions, 7 deletions

diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 8a6882dfba01..56d75afedbf7 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -95,18 +95,11 @@ void *_switch_to(void *prev, void *next, void *last)
         do {
                 current->thread.saved_task = NULL;
 
-                /* XXX need to check runqueues[cpu].idle */
-                if (current->pid == 0)
-                        switch_timers(0);
-
                 switch_threads(&from->thread.switch_buf,
                                &to->thread.switch_buf);
 
                 arch_switch_to(current->thread.prev_sched, current);
 
-                if (current->pid == 0)
-                        switch_timers(1);
-
                 if (current->thread.saved_task)
                         show_regs(&(current->thread.regs));
                 next= current->thread.saved_task;
@@ -251,7 +244,9 @@ void default_idle(void)
                 if (need_resched())
                         schedule();
 
+                switch_timers(1);
                 idle_sleep(10);
+                switch_timers(0);
         }
 }