summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkettenis <kettenis@openbsd.org>2013-11-04 22:32:31 +0000
committerkettenis <kettenis@openbsd.org>2013-11-04 22:32:31 +0000
commit8392da6480dbef40ecb775752421f2d4a59edfa6 (patch)
treeffb5cd49ea811dbe630339408e85130c8a979b5e
parentsubstantial namespace cleanup. Might go a little bit too far, but we (diff)
downloadwireguard-openbsd-8392da6480dbef40ecb775752421f2d4a59edfa6.tar.xz
wireguard-openbsd-8392da6480dbef40ecb775752421f2d4a59edfa6.zip
Enable locking of fields using the acpi global lock if required. Seems to fix
a couple of machines and so far caused no regressions. Pt this in the tree now to get wider testing. ok deraadt@
-rw-r--r--sys/dev/acpi/dsdt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c
index f658e745c67..097131f7831 100644
--- a/sys/dev/acpi/dsdt.c
+++ b/sys/dev/acpi/dsdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsdt.c,v 1.203 2013/06/02 17:21:38 jcs Exp $ */
+/* $OpenBSD: dsdt.c,v 1.204 2013/11/04 22:32:31 kettenis Exp $ */
/*
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
*
@@ -770,7 +770,7 @@ aml_lockfield(struct aml_scope *scope, struct aml_value *field)
/* Spin to acquire lock */
while (!st) {
- st = acpi_acquire_global_lock(&acpi_softc->sc_facs->global_lock);
+ st = acpi_acquire_glk(&acpi_softc->sc_facs->global_lock);
/* XXX - yield/delay? */
}
@@ -790,7 +790,7 @@ aml_unlockfield(struct aml_scope *scope, struct aml_value *field)
return;
/* Release lock */
- st = acpi_release_global_lock(&acpi_softc->sc_facs->global_lock);
+ st = acpi_release_glk(&acpi_softc->sc_facs->global_lock);
if (!st)
return;