diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-09-28 18:36:37 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-09-28 18:36:37 +0000 |
| commit | 4af7368b7c2c8f50f1f972754d9e26589bc6c83c (patch) | |
| tree | 993058d251dfbcad28a0feee6a0e94c39e3ae6fb /sys/dev | |
| parent | b132baf16157998866fb4083bebc449ac677617e (diff) | |
In low-level suspend routines, set cold=2. In tsleep(), use this to
spit out a ddb trace to console. This should allow us to find suspend
or resume routines which break the rules. It depends on the console
output function being non-sleeping.... but that's another codepath which
should try to be safe when cold is set.
ok kettenis
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index 4bb5d543aec..50f46abcf76 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.294 2015/09/06 16:47:48 deraadt Exp $ */ +/* $OpenBSD: acpi.c,v 1.295 2015/09/28 18:36:36 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -2316,7 +2316,7 @@ acpi_sleep_state(struct acpi_softc *sc, int state) s = splhigh(); disable_intr(); /* PSL_I for resume; PIC/APIC broken until repair */ - cold = 1; /* Force other code to delay() instead of tsleep() */ + cold = 2; /* Force other code to delay() instead of tsleep() */ if (config_suspend_all(DVACT_SUSPEND) != 0) goto fail_suspend; |