diff options
| author | marcel <marcel@FreeBSD.org> | 2011-06-25 02:49:47 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2011-06-25 02:49:47 +0000 |
| commit | 882ae336b550700da43586e85b20c164ad564f8b (patch) | |
| tree | 19763ee8089c0a4f1918fa7d3aeb4dfc0e81a913 | |
| parent | 215e258fd1019b3c027d1ca12d509337760ac8cf (diff) | |
| download | FreeBSD-src-882ae336b550700da43586e85b20c164ad564f8b.zip FreeBSD-src-882ae336b550700da43586e85b20c164ad564f8b.tar.gz | |
Now that ia64 has been switched to the event timers, remove the
conditional compilation work-arounds.
| -rw-r--r-- | sys/dev/acpica/acpi_cpu.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c index b0a7210..d26903d 100644 --- a/sys/dev/acpica/acpi_cpu.c +++ b/sys/dev/acpica/acpi_cpu.c @@ -856,10 +856,8 @@ acpi_cpu_cx_list(struct acpi_cpu_softc *sc) 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) { |
