Module Name: src
Committed By: jruoho
Date: Tue Feb 15 20:24:11 UTC 2011
Modified Files:
src/sys/dev/acpi: acpi.c
Log Message:
Reset the firmware waking vector on resume. Adapted from FreeBSD and Linux.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.234 -r1.235 src/sys/dev/acpi/acpi.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/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.234 src/sys/dev/acpi/acpi.c:1.235
--- src/sys/dev/acpi/acpi.c:1.234 Mon Jan 17 15:49:13 2011
+++ src/sys/dev/acpi/acpi.c Tue Feb 15 20:24:11 2011
@@ -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;
