Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-6]: src/sys/arch/x86/acpi Pull up following revision(s) (requeste...



details:   https://anonhg.NetBSD.org/src/rev/7d46ac2e3e9d
branches:  netbsd-6
changeset: 774573:7d46ac2e3e9d
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Sep 03 18:55:11 2012 +0000

description:
Pull up following revision(s) (requested by jakllsch in ticket #529):
        sys/arch/x86/acpi/acpi_wakeup.c: revision 1.32
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.

diffstat:

 sys/arch/x86/acpi/acpi_wakeup.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 5cda8a095d18 -r 7d46ac2e3e9d sys/arch/x86/acpi/acpi_wakeup.c
--- a/sys/arch/x86/acpi/acpi_wakeup.c   Mon Sep 03 18:51:36 2012 +0000
+++ b/sys/arch/x86/acpi/acpi_wakeup.c   Mon Sep 03 18:55:11 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_wakeup.c,v 1.29.8.1 2012/05/09 03:22:54 riz Exp $ */
+/*     $NetBSD: acpi_wakeup.c,v 1.29.8.2 2012/09/03 18:55:11 riz 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.29.8.1 2012/05/09 03:22:54 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.29.8.2 2012/09/03 18:55:11 riz Exp $");
 
 /*-
  * Copyright (c) 2001 Takanori Watanabe <takawata%jp.freebsd.org@localhost>
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.29.8.1 2012/05/09 03:22:54 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.29.8.2 2012/09/03 18:55:11 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -320,7 +320,7 @@
        /* 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



Home | Main Index | Thread Index | Old Index