From: David Howells <dhowells@redhat.com>
Date: Tue, 19 Feb 2008 18:58:49 +0000 (+0000)
Subject: MN10300: Call update_process_times() outside of the xtime_lock
X-Git-Tag: v2.6.25-rc3~116
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2b79aac9038ee52fd8d89216b1a3ec9bd8285fac;p=linux-2.6-omap-h63xx.git

MN10300: Call update_process_times() outside of the xtime_lock

Call update_process_times() outside of the xtime_lock.  Somewhere somewhere
inside one of the functions called by that, xtime_lock is readlocked, which
ends up in a deadlock situation.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/mn10300/kernel/time.c b/arch/mn10300/kernel/time.c
index ff492e3b345..babb7c2ac37 100644
--- a/arch/mn10300/kernel/time.c
+++ b/arch/mn10300/kernel/time.c
@@ -84,11 +84,13 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
 		/* advance the kernel's time tracking system */
 		profile_tick(CPU_PROFILING);
 		do_timer(1);
-		update_process_times(user_mode(get_irq_regs()));
 		check_rtc_time();
 	}
 
 	write_sequnlock(&xtime_lock);
+
+	update_process_times(user_mode(get_irq_regs()));
+
 	return IRQ_HANDLED;
 }