diff options
| author | john stultz <johnstul@us.ibm.com> | 2010-03-01 12:34:43 -0800 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-03-02 09:22:25 +0100 |
| commit | ad6759fbf35d104dbf573cd6f4c6784ad6823f7e (patch) | |
| tree | 6eb4b1770d8875828c9693cdd510f43fb87da8b6 | |
| parent | 13dda80e48439b446d0bc9bab34b91484bc8f533 (diff) | |
| download | linux-ad6759fbf35d104dbf573cd6f4c6784ad6823f7e.tar.gz linux-ad6759fbf35d104dbf573cd6f4c6784ad6823f7e.tar.bz2 linux-ad6759fbf35d104dbf573cd6f4c6784ad6823f7e.zip | |
timekeeping: Prevent oops when GENERIC_TIME=n
Aaro Koskinen reported an issue in kernel.org bugzilla #15366, where
on non-GENERIC_TIME systems, accessing
/sys/devices/system/clocksource/clocksource0/current_clocksource
results in an oops.
It seems the timekeeper/clocksource rework missed initializing the
curr_clocksource value in the !GENERIC_TIME case.
Thanks to Aaro for reporting and diagnosing the issue as well as
testing the fix!
Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: stable@kernel.org
LKML-Reference: <1267475683.4216.61.camel@localhost.localdomain>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -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; /* |