diff options
| author |   kettenis <kettenis@openbsd.org> | 2018-06-30 10:16:35 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2018-06-30 10:16:35 +0000 |
| commit | 82ffe153e9bf6ba5571aa21bdca73a1ce675bd8d (patch) | |
| tree | f6baf70c3ca7b217b42964113ea842bb4cc342bf /sys/dev | |
| parent | over-eager refactor means fw_update goes thru delete_handle, so teach (diff) | |
| download | wireguard-openbsd-82ffe153e9bf6ba5571aa21bdca73a1ce675bd8d.tar.xz wireguard-openbsd-82ffe153e9bf6ba5571aa21bdca73a1ce675bd8d.zip | |
Add intr_enable() function, intended for MI use to amd64 and i386 and use
this in the acpi(4) suspend/resume code paths.
ok deraadt@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index 8a4ee6657cb..9e42f1899e6 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.349 2018/06/29 17:39:18 kettenis Exp $ */ +/* $OpenBSD: acpi.c,v 1.350 2018/06/30 10:16:35 kettenis Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -2360,7 +2360,7 @@ acpi_sleep_pm(struct acpi_softc *sc, int state) uint16_t rega, regb, regra, regrb; int retry = 0; - disable_intr(); + intr_disable(); /* Clear WAK_STS bit */ acpi_write_pmreg(sc, ACPIREG_PM1_STS, 0, ACPI_PM1_WAK_STS); @@ -2562,7 +2562,7 @@ acpi_sleep_state(struct acpi_softc *sc, int sleepmode) resettodr(); s = splhigh(); - disable_intr(); /* PSL_I for resume; PIC/APIC broken until repair */ + intr_disable(); /* PSL_I for resume; PIC/APIC broken until repair */ cold = 2; /* Force other code to delay() instead of tsleep() */ if (config_suspend_all(DVACT_SUSPEND) != 0) @@ -2610,7 +2610,7 @@ fail_pts: fail_suspend: cold = 0; - enable_intr(); + intr_enable(); splx(s); acpibtn_disable_psw(); /* disable _LID for wakeup */ @@ -2681,7 +2681,7 @@ acpi_powerdown(void) return; s = splhigh(); - disable_intr(); + intr_disable(); cold = 1; /* 1st powerdown AML step: _PTS(tostate) */ |