svn commit: r223527 - head/sys/dev/acpica
Marcel Moolenaar
marcel at FreeBSD.org
Sat Jun 25 02:49:47 UTC 2011
Author: marcel
Date: Sat Jun 25 02:49:47 2011
New Revision: 223527
URL: http://svn.freebsd.org/changeset/base/223527
Log:
Now that ia64 has been switched to the event timers, remove the
conditional compilation work-arounds.
Modified:
head/sys/dev/acpica/acpi_cpu.c
Modified: head/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- head/sys/dev/acpica/acpi_cpu.c Sat Jun 25 02:15:14 2011 (r223526)
+++ head/sys/dev/acpica/acpi_cpu.c Sat Jun 25 02:49:47 2011 (r223527)
@@ -856,10 +856,8 @@ acpi_cpu_cx_list(struct acpi_cpu_softc *
sbuf_printf(&sb, "C%d/%d ", i + 1, sc->cpu_cx_states[i].trans_lat);
if (sc->cpu_cx_states[i].type < ACPI_STATE_C3)
sc->cpu_non_c3 = i;
-#ifndef __ia64__
else
cpu_can_deep_sleep = 1;
-#endif
}
sbuf_trim(&sb);
sbuf_finish(&sb);
@@ -929,11 +927,9 @@ acpi_cpu_idle()
/* Find the lowest state that has small enough latency. */
cx_next_idx = 0;
-#ifndef __ia64__
if (cpu_disable_deep_sleep)
i = min(sc->cpu_cx_lowest, sc->cpu_non_c3);
else
-#endif
i = sc->cpu_cx_lowest;
for (; i >= 0; i--) {
if (sc->cpu_cx_states[i].trans_lat * 3 <= sc->cpu_prev_sleep) {
More information about the svn-src-head
mailing list