svn commit: r301776 - stable/10/sys/x86/x86

[Konstantin Belousov]

Author: kib
Date: Fri Jun 10 04:04:55 2016
New Revision: 301776
URL: https://svnweb.freebsd.org/changeset/base/301776

Log:
  MFC r301278
  Reduce number of iterations used for calibrating ICR read loop.
  
  MFC r301279:
  Record correct commit message for r301278.

Modified:
  stable/10/sys/x86/x86/local_apic.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/x86/x86/local_apic.c
==============================================================================
--- stable/10/sys/x86/x86/local_apic.c	Fri Jun 10 01:10:48 2016	(r301775)
+++ stable/10/sys/x86/x86/local_apic.c	Fri Jun 10 04:04:55 2016	(r301776)
@@ -284,7 +284,7 @@ lapic_init(vm_paddr_t addr)
 	}
 
 #ifdef SMP
-#define	LOOPS	1000000
+#define	LOOPS	100000
 	/*
 	 * Calibrate the busy loop waiting for IPI ack in xAPIC mode.
 	 * lapic_ipi_wait_mult contains the number of iterations which
@@ -440,7 +440,7 @@ lapic_setup(int boot)
 	/* Program the CMCI LVT entry if present. */
 	if (maxlvt >= APIC_LVT_CMCI)
 		lapic->lvt_cmci = lvt_mode(la, APIC_LVT_CMCI, lapic->lvt_cmci);
-	    
+
 	intr_restore(saveintr);
 }
 
@@ -1363,7 +1363,7 @@ static void
 apic_setup_local(void *dummy __unused)
 {
 	int retval;
- 
+
 	if (best_enum == NULL)
 		return;