diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2010-06-30 22:41:44 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2010-06-30 22:41:44 +0000 |
| commit | 8c106c54d8ea352c3a5cde7ab58fdb7eb7231a4a (patch) | |
| tree | 4a4020cfe4f538b6c3c04c24c5708c8c733cc012 /sys/dev/acpi | |
| parent | 38476b8055a995115e29616d489a311bd00ac9b9 (diff) | |
Disable/partially backout the bufq quiesce changes as this
is causing havoc with vnds and release must be buildable.
Diffstat (limited to 'sys/dev/acpi')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index bc8d076eafb..9066eabb651 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.164 2010/06/29 23:03:22 deraadt Exp $ */ +/* $OpenBSD: acpi.c,v 1.165 2010/06/30 22:41:43 thib Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -2137,8 +2137,6 @@ acpi_resume(struct acpi_softc *sc, int state) acpi_record_event(sc, APM_NORMAL_RESUME); - bufq_restart(); - #if NWSDISPLAY > 0 wsdisplay_resume(); #endif /* NWSDISPLAY > 0 */ @@ -2227,8 +2225,6 @@ acpi_prepare_sleep_state(struct acpi_softc *sc, int state) wsdisplay_suspend(); #endif /* NWSDISPLAY > 0 */ - bufq_quiesce(); - acpi_saved_spl = splhigh(); disable_intr(); cold = 1; @@ -2268,7 +2264,6 @@ acpi_prepare_sleep_state(struct acpi_softc *sc, int state) acpi_susp_resume_gpewalk(sc, state, 1); fail: - bufq_restart(); #if NWSDISPLAY > 0 if (error) |