| Date | Tue, 30 Mar 2010 15:54:48 -0700 | From | Greg KH <> | Subject | [010/116] timekeeping: Prevent oops when GENERIC_TIME=n |
| |
2.6.32-stable review patch. If anyone has any objections, please let us know.
------------------
From: john stultz <johnstul@us.ibm.com>
commit ad6759fbf35d104dbf573cd6f4c6784ad6823f7e upstream.
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> LKML-Reference: <1267475683.4216.61.camel@localhost.localdomain> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- kernel/time/clocksource.c | 4 ++++ 1 file changed, 4 insertions(+)
--- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -515,6 +515,10 @@ static inline void clocksource_select(vo */ static int __init clocksource_done_booting(void) { + mutex_lock(&clocksource_mutex); + curr_clocksource = clocksource_default_clock(); + mutex_unlock(&clocksource_mutex); + finished_booting = 1; /*
|