diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 01:27:08 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 01:27:08 +0100 |
| commit | 64d5aea30062ce9f3ce7c62be8ae65e776cbfee2 (patch) | |
| tree | 7020f4b8533d7fcf5eb24494453515ee672dd172 /kernel | |
| parent | anon_inodes: mark the anon inode private (diff) | |
| parent | timekeeping: Prevent oops when GENERIC_TIME=n (diff) | |
| download | linux-64d5aea30062ce9f3ce7c62be8ae65e776cbfee2.tar.xz linux-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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/clocksource.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 1f663d23e85e..1f5dde637457 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; /* |