Module Name: src
Committed By: jmcneill
Date: Mon Aug 1 11:26:31 UTC 2011
Modified Files:
src/sys/arch/x86/x86: x86_machdep.c
Log Message:
x86_reset: use acpi_reset instead of AcpiReset
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/x86/x86/x86_machdep.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/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.52 src/sys/arch/x86/x86/x86_machdep.c:1.53
--- src/sys/arch/x86/x86/x86_machdep.c:1.52 Sun Jul 31 22:43:01 2011
+++ src/sys/arch/x86/x86/x86_machdep.c Mon Aug 1 11:26:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_machdep.c,v 1.52 2011/07/31 22:43:01 jmcneill Exp $ */
+/* $NetBSD: x86_machdep.c,v 1.53 2011/08/01 11:26:31 jmcneill Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.52 2011/07/31 22:43:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.53 2011/08/01 11:26:31 jmcneill Exp $");
#include "opt_modular.h"
#include "opt_physmem.h"
@@ -906,8 +906,9 @@
* defined in the FADT.
*/
if (acpi_active) {
- if (AcpiReset() != AE_NOT_EXIST)
+ if (acpi_reset() == 0) {
delay(500000); /* wait 0.5 sec to see if that did it */
+ }
}
#endif
