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
git-mirror · Mar 13, 2010 · 64d5aea · 64d5aea
2 parents 3836a03 + ad6759f
commit 64d5aea
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
@@ -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;
 
 	/*