Module Name: src
Committed By: jakllsch
Date: Sun Aug 26 01:04:03 UTC 2012
Modified Files:
src/sys/arch/x86/acpi: acpi_wakeup.c
Log Message:
It turns out we're actually waiting for other processors to be unbusy, not busy.
Unbreaks ACPI suspend on uniprocessor. Probably fixes unnoticed bugs on MP.
Needs pullup to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/x86/acpi/acpi_wakeup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_wakeup.c
diff -u src/sys/arch/x86/acpi/acpi_wakeup.c:1.31 src/sys/arch/x86/acpi/acpi_wakeup.c:1.32
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.31 Fri Apr 20 22:23:24 2012
+++ src/sys/arch/x86/acpi/acpi_wakeup.c Sun Aug 26 01:04:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakeup.c,v 1.31 2012/04/20 22:23:24 rmind Exp $ */
+/* $NetBSD: acpi_wakeup.c,v 1.32 2012/08/26 01:04:03 jakllsch Exp $ */
/*-
* Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.31 2012/04/20 22:23:24 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.32 2012/08/26 01:04:03 jakllsch Exp $");
/*-
* Copyright (c) 2001 Takanori Watanabe <[email protected]>
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.31 2012/04/20 22:23:24 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.32 2012/08/26 01:04:03 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -320,7 +320,7 @@ acpi_md_sleep(int state)
/* Save and suspend Application Processors. */
x86_broadcast_ipi(X86_IPI_ACPI_CPU_SLEEP);
cid = cpu_index(curcpu());
- while (!kcpuset_isotherset(kcpuset_running, cid)) {
+ while (kcpuset_isotherset(kcpuset_running, cid)) {
delay(1);
}
#endif
