projects/linux·commit 64d5aea3

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

64d5aea3 · Linus Torvalds <[email protected]> · 2010-03-12 16:27:08 -08:00

* '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
Commit
64d5aea30062ce9f3ce7c62be8ae65e776cbfee2
Parents
3836a03d · ad6759fb

Merge commit. Changes below are compared with the first parent: 3836a03d.

Changes

1 files changed · +4 −0

FileStatusAddDelContent
kernel/time/clocksource.cmodified+4−0View file

kernel/time/clocksource.c

View file
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 1f663d2..1f5dde6 100644
--- 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;
/*