summaryrefslogtreecommitdiff
path: root/sys/dev/acpi/acpivar.h
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2010-08-08 20:45:19 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2010-08-08 20:45:19 +0000
commit6642620a0de9c576487d1d814ca28606fc9f1ba9 (patch)
tree60dbdf6eb2c1ed6b210322fd440e833477b4e189 /sys/dev/acpi/acpivar.h
parent1bcb978a282b4836390048e46b7a652d102342ac (diff)
Close race between the acpi thread and wscons ioctls running in process
context. We might rip this out post-release and replace it with a solution that serializes things in a more obvious way. ok deraadt@, miod@ and "those crazy texans who ok anything"
Diffstat (limited to 'sys/dev/acpi/acpivar.h')
-rw-r--r--sys/dev/acpi/acpivar.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/acpi/acpivar.h b/sys/dev/acpi/acpivar.h
index 6cf2bf2c5cd..2d8430bb394 100644
--- a/sys/dev/acpi/acpivar.h
+++ b/sys/dev/acpi/acpivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpivar.h,v 1.65 2010/08/07 17:15:23 kettenis Exp $ */
+/* $OpenBSD: acpivar.h,v 1.66 2010/08/08 20:45:18 kettenis Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
*
@@ -212,6 +212,8 @@ struct acpi_softc {
int sc_sleepmode;
int sc_powerdown;
+ struct rwlock sc_lck;
+
struct {
int slp_typa;
int slp_typb;