From ff8978f48fd319a409a10a7b512f97bbe55057e1 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Thu, 28 Jul 2005 21:16:09 -0700
Subject: [PATCH] --- yaml --- r: 5409 b: refs/heads/master c:
 7e1f49da6881bbf938e502d99335ad5488eb93b4 h: refs/heads/master i:   5407:
 c17e33a8c6fa9a3f40ccfcece882ae2e694ea6b5 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/um/kernel/time_kern.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 407087453367..ddf76d4585f4 100644
--- 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
index a8b4ef601f59..4e08f7545d63 100644
--- 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);