Skip to contentSkip to conversation

init: Move sched_clock_init after late_time_init

tip:sched/clock tip-bot for Thomas Gleixner 1 participant 1 message Aug 27, 2009

lore
Share & tools
lore
#0 lore raw
Commit-ID:  fa84e9eecfff478df2d00e94deb3fc40fe4634ad
Gitweb:     http://git.kernel.org/tip/fa84e9eecfff478df2d00e94deb3fc40fe4634ad
Author:     Thomas Gleixner <[email protected]>
AuthorDate: Fri, 21 Aug 2009 22:01:12 +0200
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Thu, 27 Aug 2009 16:38:18 +0200

init: Move sched_clock_init after late_time_init

Some architectures initialize clocks and timers in late_time_init and x86 wants to do the same to avoid FIXMAP hackery for calibrating the TSC. That would result in undefined sched_clock readout and wreckaged printk timestamps again. We probably have those already on archs which do all their time/clock setup in late_time_init.

There is no harm to move that after late_time_init except that a few more boot timestamps are stale. The scheduler is not active at that point so no real wreckage is expected.

LKML-Reference: <new-submission>
Cc: [email protected]

---
 init/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
init/main.c +1 -1
index 11f4f14..0ec75ce 100644
@@ -631,7 +631,6 @@ asmlinkage void __init start_kernel(void)
 	softirq_init();
 	timekeeping_init();
 	time_init();
-	sched_clock_init();
 	profile_init();
 	if (!irqs_disabled())
 		printk(KERN_CRIT "start_kernel(): bug: interrupts were "
@@ -682,6 +681,7 @@ asmlinkage void __init start_kernel(void)
 	numa_policy_init();
 	if (late_time_init)
 		late_time_init();
+	sched_clock_init();
 	calibrate_delay();
 	pidmap_init();
 	anon_vma_init();