[src/trunk]: src/sys/dev/acpi Reset the firmware waking vector on resume. Ada...

[jruoho <jruoho%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9a55986e5460
branches:  trunk
changeset: 762109:9a55986e5460
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Tue Feb 15 20:24:11 2011 +0000

description:
Reset the firmware waking vector on resume. Adapted from FreeBSD and Linux.
No functional change intended.

diffstat:

 sys/dev/acpi/acpi.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 3c515263fb2f -r 9a55986e5460 sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c       Tue Feb 15 19:39:12 2011 +0000
+++ b/sys/dev/acpi/acpi.c       Tue Feb 15 20:24:11 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi.c,v 1.234 2011/01/17 15:49:13 jmcneill Exp $      */
+/*     $NetBSD: acpi.c,v 1.235 2011/02/15 20:24:11 jruoho Exp $        */
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.234 2011/01/17 15:49:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.235 2011/02/15 20:24:11 jruoho Exp $");
 
 #include "opt_acpi.h"
 #include "opt_pcifixup.h"
@@ -1369,9 +1369,10 @@
                        if (state == ACPI_STATE_S4)
                                AcpiEnable();
 
-                       pmf_system_bus_resume(PMF_Q_NONE);
+                       (void)pmf_system_bus_resume(PMF_Q_NONE);
                        (void)AcpiLeaveSleepState(state);
-                       pmf_system_resume(PMF_Q_NONE);
+                       (void)AcpiSetFirmwareWakingVector(0);
+                       (void)pmf_system_resume(PMF_Q_NONE);
                }
 
                break;