svn commit: r212997 - head/sys/dev/acpica

[Alexander Motin]

Author: mav
Date: Wed Sep 22 11:32:22 2010
New Revision: 212997
URL: http://svn.freebsd.org/changeset/base/212997

Log:
  Quick fix for unmotivated C2 state usage during boot, introduced at r212541.
  That caused LAPIC timer failure and huge delays during boot on some systems.

Modified:
  head/sys/dev/acpica/acpi_cpu.c

Modified: head/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- head/sys/dev/acpica/acpi_cpu.c	Wed Sep 22 10:55:33 2010	(r212996)
+++ head/sys/dev/acpica/acpi_cpu.c	Wed Sep 22 11:32:22 2010	(r212997)
@@ -894,7 +894,7 @@ acpi_cpu_idle()
     cx_next_idx = 0;
 #ifndef __ia64__
     if (cpu_disable_deep_sleep)
-	i = sc->cpu_non_c3;
+	i = min(sc->cpu_cx_lowest, sc->cpu_non_c3);
     else
 #endif
 	i = sc->cpu_cx_lowest;