---

yaml --- r: 5409 b: refs/heads/master c: 7e1f49d h: refs/heads/master i: 5407: c17e33a v: v3
git-mirror · Jul 29, 2005 · ff8978f · ff8978f
1 parent 3778c09
commit ff8978f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9b7cc84afc7f4ebcef27691279d557e13128818
+refs/heads/master: 7e1f49da6881bbf938e502d99335ad5488eb93b4
diff --git a/trunk/arch/um/kernel/time_kern.c b/trunk/arch/um/kernel/time_kern.c
@@ -137,7 +137,10 @@ long um_stime(int __user *tptr)
 void timer_handler(int sig, union uml_pt_regs *regs)
 {
 	local_irq_disable();
-	update_process_times(CHOOSE_MODE(user_context(UPT_SP(regs)), (regs)->skas.is_user));
+	irq_enter();
+	update_process_times(CHOOSE_MODE(user_context(UPT_SP(regs)),
+					 (regs)->skas.is_user));
+	irq_exit();
 	local_irq_enable();
 	if(current_thread->cpu == 0)
 		timer_irq(regs);