1 files changed, 3 insertions, 2 deletions

diff --git a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c
index 6fa4e1b892b7..3c7626cdba4b 100644
--- a/arch/um/kernel/time_kern.c
+++ b/arch/um/kernel/time_kern.c
@@ -187,8 +187,9 @@ void timer_handler(int sig, union uml_pt_regs *regs)
 {
         local_irq_disable();
         irq_enter();
-        update_process_times(CHOOSE_MODE(user_context(UPT_SP(regs)),
-                                         (regs)->skas.is_user));
+        update_process_times(CHOOSE_MODE(
+                             (UPT_SC(regs) && user_context(UPT_SP(regs))),
+                             (regs)->skas.is_user));
         irq_exit();
         local_irq_enable();
         if(current_thread->cpu == 0)