[src/trunk]: src/sys/arch/x86/acpi Don't allow machdep.acpi_vbios_reset=2 if ...

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

details:   https://anonhg.NetBSD.org/src/rev/df0d7a80c5ed
branches:  trunk
changeset: 747103:df0d7a80c5ed
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Sep 02 15:25:07 2009 +0000

description:
Don't allow machdep.acpi_vbios_reset=2 if option VGA_POST is missing.

diffstat:

 sys/arch/x86/acpi/acpi_wakeup.c |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (39 lines):

diff -r 48bce6b1a660 -r df0d7a80c5ed sys/arch/x86/acpi/acpi_wakeup.c
--- a/sys/arch/x86/acpi/acpi_wakeup.c   Wed Sep 02 15:11:13 2009 +0000
+++ b/sys/arch/x86/acpi/acpi_wakeup.c   Wed Sep 02 15:25:07 2009 +0000
@@ -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 <takawata%jp.freebsd.org@localhost>
@@ -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;