git: aa597d4049ff - main - i386: Fix the nodevice apic build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 08 Apr 2022 16:10:26 UTC
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aa597d4049ffee69d413ea2154f4b312ffbaf646 commit aa597d4049ffee69d413ea2154f4b312ffbaf646 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2022-04-08 15:47:52 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2022-04-08 15:47:52 +0000 i386: Fix the nodevice apic build PR: 263124 Fixes: 62d09b46ad75 ("x86: Defer LAPIC calibration until after timecounters are available") Reviewed by: kib, jhb, emaste MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34830 --- sys/x86/isa/clock.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/x86/isa/clock.c b/sys/x86/isa/clock.c index 730aee5e9a2a..cb869070845f 100644 --- a/sys/x86/isa/clock.c +++ b/sys/x86/isa/clock.c @@ -42,6 +42,11 @@ __FBSDID("$FreeBSD$"); * Routines to handle clock hardware. */ +#ifdef __amd64__ +#define DEV_APIC +#else +#include "opt_apic.h" +#endif #include "opt_clock.h" #include "opt_isa.h" @@ -415,7 +420,9 @@ cpu_initclocks(void) td = curthread; tsc_calibrate(); +#ifdef DEV_APIC lapic_calibrate_timer(); +#endif cpu_initclocks_bsp(); CPU_FOREACH(i) { if (i == 0) @@ -431,7 +438,9 @@ cpu_initclocks(void) thread_unlock(td); #else tsc_calibrate(); +#ifdef DEV_APIC lapic_calibrate_timer(); +#endif cpu_initclocks_bsp(); #endif }