]> err.no Git - linux-2.6/commitdiff
MN10300: Call update_process_times() outside of the xtime_lock
authorDavid Howells <dhowells@redhat.com>
Tue, 19 Feb 2008 18:58:49 +0000 (18:58 +0000)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 19 Feb 2008 23:51:36 +0000 (15:51 -0800)
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>
arch/mn10300/kernel/time.c

index ff492e3b34577eb083ca6921d4152c4060739888..babb7c2ac37701be5065da1e9cba3d1659cf636c 100644 (file)
@@ -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;
 }