From: deraadt <deraadt@openbsd.org>
Date: Sat, 7 Aug 2010 16:21:20 +0000 (+0000)
Subject: The wakeup of the acpi thread is not needed.  This code is being called
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7a94bfdfee8b7626fd7db920a89203dab2314137;p=openbsd

The wakeup of the acpi thread is not needed.  This code is being called
from inside the thread context, and will unwind into the middle of
acpi_thread, where it will check these variables
ok jordan marco kettenis canacar
---

diff --git a/sys/dev/acpi/acpibtn.c b/sys/dev/acpi/acpibtn.c
index 274c956ddad..20cc016d540 100644
--- a/sys/dev/acpi/acpibtn.c
+++ b/sys/dev/acpi/acpibtn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpibtn.c,v 1.32 2010/08/06 21:12:27 marco Exp $ */
+/* $OpenBSD: acpibtn.c,v 1.33 2010/08/07 16:21:20 deraadt Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
  *
@@ -197,10 +197,8 @@ acpibtn_notify(struct aml_node *node, int notify_type, void *arg)
 		case 0x80:
 sleep:
 			/* Request to go to sleep */
-			if (acpi_record_event(sc->sc_acpi, APM_USER_SUSPEND_REQ)) {
+			if (acpi_record_event(sc->sc_acpi, APM_USER_SUSPEND_REQ))
 				sc->sc_acpi->sc_sleepmode = ACPI_STATE_S3;
-				acpi_wakeup(sc->sc_acpi);
-			}
 			break;
 		}
 #endif /* SMALL_KERNEL */
diff --git a/sys/dev/acpi/acpisony.c b/sys/dev/acpi/acpisony.c
index 627853f44e8..716db37130c 100644
--- a/sys/dev/acpi/acpisony.c
+++ b/sys/dev/acpi/acpisony.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpisony.c,v 1.2 2010/07/27 06:12:50 deraadt Exp $ */
+/* $OpenBSD: acpisony.c,v 1.3 2010/08/07 16:21:20 deraadt Exp $ */
 /*
  * Copyright (c) 2010 Paul Irofti <pirofti@openbsd.org>
  *
@@ -197,10 +197,8 @@ acpisony_notify(struct aml_node *node, int notify, void *arg)
 	case SONY_NOTIFY_SUSPEND_PRESSED:
 		DPRINTF(("suspend-pressed\n"));
 #ifndef SMALL_KERNEL
-		if (acpi_record_event(sc->sc_acpi, APM_USER_SUSPEND_REQ)) {
+		if (acpi_record_event(sc->sc_acpi, APM_USER_SUSPEND_REQ))
 			sc->sc_acpi->sc_sleepmode = ACPI_STATE_S3;
-			acpi_wakeup(sc->sc_acpi);
-		}
 #endif
 		break;
 	case SONY_NOTIFY_SUSPEND_RELEASED:
diff --git a/sys/dev/acpi/acpithinkpad.c b/sys/dev/acpi/acpithinkpad.c
index e91b0ac6514..bfff2073eda 100644
--- a/sys/dev/acpi/acpithinkpad.c
+++ b/sys/dev/acpi/acpithinkpad.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpithinkpad.c,v 1.23 2010/07/06 20:14:17 deraadt Exp $	*/
+/*	$OpenBSD: acpithinkpad.c,v 1.24 2010/08/07 16:21:20 deraadt Exp $	*/
 /*
  * Copyright (c) 2008 joshua stein <jcs@openbsd.org>
  *
@@ -283,10 +283,8 @@ thinkpad_hotkey(struct aml_node *node, int notify_type, void *arg)
 			break;
 		case THINKPAD_BUTTON_SUSPEND:
 #ifndef SMALL_KERNEL
-			if (acpi_record_event(sc->sc_acpi, APM_USER_SUSPEND_REQ)) {
+			if (acpi_record_event(sc->sc_acpi, APM_USER_SUSPEND_REQ))
 				sc->sc_acpi->sc_sleepmode = ACPI_STATE_S3;
-				acpi_wakeup(sc->sc_acpi);
-			}
 #endif
 			handled = 1;
 			break;