Module Name: src
Committed By: joerg
Date: Wed Sep 2 15:25:07 UTC 2009
Modified Files:
src/sys/arch/x86/acpi: acpi_wakeup.c
Log Message:
Don't allow machdep.acpi_vbios_reset=2 if option VGA_POST is missing.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 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.16 src/sys/arch/x86/acpi/acpi_wakeup.c:1.17
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.16 Mon Aug 24 02:15:46 2009
+++ src/sys/arch/x86/acpi/acpi_wakeup.c Wed Sep 2 15:25:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakeup.c,v 1.16 2009/08/24 02:15:46 jmcneill Exp $ */
+/* $NetBSD: acpi_wakeup.c,v 1.17 2009/09/02 15:25:07 joerg Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.16 2009/08/24 02:15:46 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.17 2009/09/02 15:25:07 joerg Exp $");
/*-
* Copyright (c) 2001 Takanori Watanabe <takaw...@jp.freebsd.org>
@@ -103,6 +103,8 @@
#include <x86/cpuvar.h>
#include <x86/x86/tsc.h>
+#include "opt_vga.h"
+
#include "acpi_wakecode.h"
/* Address is also hard-coded in acpi_wakecode.S */
@@ -463,6 +465,11 @@
if (t < 0 || t > 2)
return EINVAL;
+#ifndef VGA_POST
+ if (t == 2)
+ return EINVAL;
+#endif
+
acpi_md_vbios_reset = t;
return 0;
