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
This commit is contained in:
commit
64d5aea300
|
@ -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;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue