diff options
| author |   Jan Kiszka <jan.kiszka@siemens.com> | 2017-05-24 20:04:41 +0200 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2017-05-26 13:04:09 +0200 |
| commit | 702644ec1cab10ffefcebb4060d4da46d4ef2c7f (patch) | |
| tree | 4aa816b6e008b3cfee2cd08a0129ace8baa837ab /arch/x86/kernel/setup.c | |
| parent | x86/alternatives: Prevent uninitialized stack byte read in apply_alternatives() (diff) | |
| download | linux-dev-702644ec1cab10ffefcebb4060d4da46d4ef2c7f.tar.xz linux-dev-702644ec1cab10ffefcebb4060d4da46d4ef2c7f.zip | |
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 1b5aeebf3a92 ("x86/earlyprintk:
Add support for earlyprintk via USB3 debug port"), comes much later
into play.
Fixes: dd759d93f4dd ("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
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 0b4d3c686b1e..f81823695014 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -980,8 +980,6 @@ void __init setup_arch(char **cmdline_p) */ x86_configure_nx(); - simple_udelay_calibration(); - parse_early_param(); #ifdef CONFIG_MEMORY_HOTPLUG @@ -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 */ |