Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b79aac9 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e855e5d8

arch/mn10300/kernel/time.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -84,11 +84,13 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id) 
		/* advance the kernel's time tracking system */

		/* advance the kernel's time tracking system */

		profile_tick(CPU_PROFILING);

		profile_tick(CPU_PROFILING);

		do_timer(1);

		do_timer(1);

		update_process_times(user_mode(get_irq_regs()));

		check_rtc_time();

		check_rtc_time();

	}

	}





	write_sequnlock(&xtime_lock);

	write_sequnlock(&xtime_lock);



	update_process_times(user_mode(get_irq_regs()));



	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}