Prev: [43/45] tmpfs: cleanup mpol_parse_str()
Next: [44/45] USB: fix usbfs regression
From: Greg KH on 30 Mar 2010 19:20
2.6.32-stable review patch. If anyone has any objections, please let us know.

------------------

From: john stultz <johnstul(a)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(a)iki.fi>
Signed-off-by: John Stultz <johnstul(a)us.ibm.com>
Cc: Martin Schwidefsky <schwidefsky(a)de.ibm.com>
LKML-Reference: <1267475683.4216.61.camel(a)localhost.localdomain>
Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)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;

/*


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [43/45] tmpfs: cleanup mpol_parse_str()
Next: [44/45] USB: fix usbfs regression