Commit 702644ec authored May 24, 2017 by Jan Kiszka Committed by Thomas Gleixner May 26, 2017

x86/timers: Move simple_udelay_calibration past init_hypervisor_platform



This ensures that adjustments to x86_platform done by the hypervisor
setup is already respected by this simple calibration.

The current user of this, introduced by 1b5aeebf ("x86/earlyprintk:
Add support for earlyprintk via USB3 debug port"), comes much later
into play.

Fixes: dd759d93 ("x86/timers: Add simple udelay calibration")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: http://lkml.kernel.org/r/5e89fe60-aab3-2c1c-aba8-32f8ad376189@siemens.com

parent fc152d22

arch/x86/kernel/setup.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -980,8 +980,6 @@ void __init setup_arch(char **cmdline_p)
	*/		*/
	x86_configure_nx();		x86_configure_nx();

	simple_udelay_calibration();

	parse_early_param();		parse_early_param();

	#ifdef CONFIG_MEMORY_HOTPLUG		#ifdef CONFIG_MEMORY_HOTPLUG
	@@ -1041,6 +1039,8 @@ void __init setup_arch(char **cmdline_p)
	*/		*/
	init_hypervisor_platform();		init_hypervisor_platform();

			simple_udelay_calibration();

	x86_init.resources.probe_roms();		x86_init.resources.probe_roms();

	/* after parse_early_param, so could debug it */		/* after parse_early_param, so could debug it */

Admin message