From 0bf716e988711b2a55a0d9fe9e95ab4caf8ea7ab Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Fri, 3 Jun 2016 18:23:45 +0000 Subject: [PATCH] Trim some spaces to record correct commit message for the r301278. Reduce number of iterations used for calibrating ICR read loop. The new number of iteration still gives the same ICR latency as before, tested on Intel SandyBridge and Haswell machines, and on AMD. But it significantly reduces the unneeded pause on boot in some VMs, from ~10 secs to less then 1 sec. It was reported to occur in bhyve on AMD host. Reported and tested by: avg Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/x86/local_apic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index bb15df00dc9..203e9d00e8a 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -706,7 +706,7 @@ native_lapic_setup(int boot) lapic_write32(LAPIC_LVT_CMCI, lvt_mode(la, APIC_LVT_CMCI, lapic_read32(LAPIC_LVT_CMCI))); } - + intr_restore(saveintr); } @@ -1725,7 +1725,7 @@ static void apic_setup_local(void *dummy __unused) { int retval; - + if (best_enum == NULL) return;