diff --git a/[refs] b/[refs]
index fc31fe05fd5b..8096a7d8d0f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f79e0258ea1f04d63db499479b5fb855dff6dbc5
+refs/heads/master: e6c733050faa93ce616bfedccd279ab12cffdd7b
diff --git a/trunk/kernel/time/clocksource.c b/trunk/kernel/time/clocksource.c
index 5697155f1868..2c2e5ba1453d 100644
--- a/trunk/kernel/time/clocksource.c
+++ b/trunk/kernel/time/clocksource.c
@@ -471,7 +471,9 @@ static void clocksource_select(void)
 static int __init clocksource_done_booting(void)
 {
 	finished_booting = 1;
+	mutex_lock(&clocksource_mutex);
 	clocksource_select();
+	mutex_unlock(&clocksource_mutex);
 	return 0;
 }
 fs_initcall(clocksource_done_booting);