Commit 64d5aea3 authored Mar 12, 2010 by Linus Torvalds

Merge branch 'timers-fixes-for-linus' of...

Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  timekeeping: Prevent oops when GENERIC_TIME=n

parents 3836a03d ad6759fb

kernel/time/clocksource.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -592,6 +592,10 @@ static inline void clocksource_select(void) { }
		*/
		static int __init clocksource_done_booting(void)
		{
		mutex_lock(&clocksource_mutex);
		curr_clocksource = clocksource_default_clock();
		mutex_unlock(&clocksource_mutex);

		finished_booting = 1;

		/*