From c3d830cf7c71614d21f57c24039de219e4a90538 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Tue, 1 Mar 2022 09:00:05 -0500 Subject: [PATCH] i386: Call clock_init() after finishidentcpu() In a subsequent commit clock_init() will attempt to determine the TSC frequency, and this requires that CPU identification is finalized. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- sys/i386/i386/machdep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 1e62b5f909b2..ee6752861c9e 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -1484,13 +1484,14 @@ init386(int first) r_idt.rd_base = (int) idt; lidt(&r_idt); + finishidentcpu(); /* Final stage of CPU initialization */ + /* * Initialize the clock before the console so that console * initialization can use DELAY(). */ clock_init(); - finishidentcpu(); /* Final stage of CPU initialization */ i386_setidt2(); pmap_set_nx(); initializecpu(); /* Initialize CPU registers */