Skip to content

Commit

Permalink
x86/timers: Move simple_udelay_calibration past init_hypervisor_platform
Browse files Browse the repository at this point in the history
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 1b5aeeb ("x86/earlyprintk:
Add support for earlyprintk via USB3 debug port"), comes much later
into play.

Fixes: dd759d9 ("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
  • Loading branch information
Jan Kiszka authored and Thomas Gleixner committed May 26, 2017
1 parent fc152d2 commit 702644e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/x86/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -980,8 +980,6 @@ void __init setup_arch(char **cmdline_p)
*/
x86_configure_nx();

simple_udelay_calibration();

parse_early_param();

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

simple_udelay_calibration();

x86_init.resources.probe_roms();

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

0 comments on commit 702644e

Please sign in to comment.