Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa84e9ee authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
LKML-Reference: <new-submission>
Cc: linux-arch@vger.kernel.org
parent 1e23502c

init/main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -631,7 +631,6 @@ asmlinkage void __init start_kernel(void) 
	softirq_init();

	softirq_init();

	timekeeping_init();

	timekeeping_init();

	time_init();

	time_init();

	sched_clock_init();

	profile_init();

	profile_init();

	if (!irqs_disabled())

	if (!irqs_disabled())

		printk(KERN_CRIT "start_kernel(): bug: interrupts were "

		printk(KERN_CRIT "start_kernel(): bug: interrupts were "
@@ -682,6 +681,7 @@ asmlinkage void __init start_kernel(void) 
	numa_policy_init();

	numa_policy_init();

	if (late_time_init)

	if (late_time_init)

		late_time_init();

		late_time_init();

	sched_clock_init();

	calibrate_delay();

	calibrate_delay();

	pidmap_init();

	pidmap_init();

	anon_vma_init();

	anon_vma_init();