aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds2010-03-12 18:27:08 -0600
committerLinus Torvalds2010-03-12 18:27:08 -0600
commit64d5aea30062ce9f3ce7c62be8ae65e776cbfee2 (patch)
tree7020f4b8533d7fcf5eb24494453515ee672dd172
parent3836a03d978e68b0ae00d3589089343c998cd4ff (diff)
parentad6759fbf35d104dbf573cd6f4c6784ad6823f7e (diff)
downloadam43-linux-kernel-64d5aea30062ce9f3ce7c62be8ae65e776cbfee2.tar.gz
am43-linux-kernel-64d5aea30062ce9f3ce7c62be8ae65e776cbfee2.tar.xz
am43-linux-kernel-64d5aea30062ce9f3ce7c62be8ae65e776cbfee2.zip
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
-rw-r--r--kernel/time/clocksource.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 1f663d23e85..1f5dde63745 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -592,6 +592,10 @@ static inline void clocksource_select(void) { }
592 */ 592 */
593static int __init clocksource_done_booting(void) 593static int __init clocksource_done_booting(void)
594{ 594{
595 mutex_lock(&clocksource_mutex);
596 curr_clocksource = clocksource_default_clock();
597 mutex_unlock(&clocksource_mutex);
598
595 finished_booting = 1; 599 finished_booting = 1;
596 600
597 /* 601 /*