Commit 64d5aea3 authored by Linus Torvalds's avatar 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
...@@ -592,6 +592,10 @@ static inline void clocksource_select(void) { } ...@@ -592,6 +592,10 @@ static inline void clocksource_select(void) { }
*/ */
static int __init clocksource_done_booting(void) static int __init clocksource_done_booting(void)
{ {
mutex_lock(&clocksource_mutex);
curr_clocksource = clocksource_default_clock();
mutex_unlock(&clocksource_mutex);
finished_booting = 1; finished_booting = 1;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment