summaryrefslogtreecommitdiffstats
path: root/sys/dev/acpica
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2010-09-22 11:32:22 +0000
committermav <mav@FreeBSD.org>2010-09-22 11:32:22 +0000
commit7b37740e0cfa34fe7e49ee1467fbfaf4070ef17d (patch)
tree7c06026519cd888d873ed743b87c10195fe1ca04 /sys/dev/acpica
parent98648775410aacffb472684a04b9eb6a99041957 (diff)
downloadFreeBSD-src-7b37740e0cfa34fe7e49ee1467fbfaf4070ef17d.zip
FreeBSD-src-7b37740e0cfa34fe7e49ee1467fbfaf4070ef17d.tar.gz
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.
Diffstat (limited to 'sys/dev/acpica')
-rw-r--r--sys/dev/acpica/acpi_cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c
index 9f0ca89..52934af 100644
--- a/sys/dev/acpica/acpi_cpu.c
+++ b/sys/dev/acpica/acpi_cpu.c
@@ -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;
OpenPOWER on IntegriCloud