diff options
| author |   kettenis <kettenis@openbsd.org> | 2013-12-23 10:48:43 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2013-12-23 10:48:43 +0000 |
| commit | 05f91f63a37ef5a1f362a08c7e373afd283ded3e (patch) | |
| tree | 5281eb6a77fa83eff87e38754724dfc8299413dd /sys/dev/acpi/acpi.c | |
| parent | Make ld.so pass its cleanup handler in %edx as required by the i386 System V (diff) | |
| download | wireguard-openbsd-05f91f63a37ef5a1f362a08c7e373afd283ded3e.tar.xz wireguard-openbsd-05f91f63a37ef5a1f362a08c7e373afd283ded3e.zip | |
Revert previous commit. It makes resume hang on some MP systems running
GENERIC.MP.
Diffstat (limited to 'sys/dev/acpi/acpi.c')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index e4d428144b9..1a889be29b7 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.249 2013/12/16 19:11:52 kettenis Exp $ */ +/* $OpenBSD: acpi.c,v 1.250 2013/12/23 10:48:43 kettenis Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -30,7 +30,6 @@ #include <sys/workq.h> #include <sys/sched.h> #include <sys/reboot.h> -#include <sys/sysctl.h> #ifdef HIBERNATE #include <sys/hibernate.h> @@ -2085,7 +2084,6 @@ acpi_indicator(struct acpi_softc *sc, int led_state) int acpi_sleep_state(struct acpi_softc *sc, int state) { - extern int perflevel; int error = ENXIO; int s; @@ -2186,10 +2184,6 @@ fail_quiesce: wsdisplay_resume(); #endif /* NWSDISPLAY > 0 */ - /* Restore hw.setperf */ - if (cpu_setperf != NULL) - cpu_setperf(perflevel); - acpi_record_event(sc, APM_NORMAL_RESUME); acpi_indicator(sc, ACPI_SST_WORKING); fail_tts: |