Module Name: src
Committed By: maya
Date: Tue Sep 20 08:38:55 UTC 2016
Modified Files:
src/sys/arch/x86/acpi: acpi_wakeup.c
Log Message:
use a value of hw.acpi.sleep.vbios that might actually
work for any real hardware suspend.
stop dragging feet through the ground in PR kern/50781
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 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.41 src/sys/arch/x86/acpi/acpi_wakeup.c:1.42
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.41 Wed Jul 27 13:04:28 2016
+++ src/sys/arch/x86/acpi/acpi_wakeup.c Tue Sep 20 08:38:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakeup.c,v 1.41 2016/07/27 13:04:28 maxv Exp $ */
+/* $NetBSD: acpi_wakeup.c,v 1.42 2016/09/20 08:38:55 maya Exp $ */
/*-
* Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.41 2016/07/27 13:04:28 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.42 2016/09/20 08:38:55 maya Exp $");
/*-
* Copyright (c) 2001 Takanori Watanabe <takaw...@jp.freebsd.org>
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.41 2016/07/27 13:04:28 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.42 2016/09/20 08:38:55 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,7 +111,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.
static paddr_t acpi_wakeup_paddr = 3 * PAGE_SIZE;
static vaddr_t acpi_wakeup_vaddr;
-int acpi_md_vbios_reset = 1; /* Referenced by dev/pci/vga_pci.c */
+int acpi_md_vbios_reset = 0; /* Referenced by dev/pci/vga_pci.c */
int acpi_md_vesa_modenum = 0; /* Referenced by arch/x86/x86/genfb_machdep.c */
static int acpi_md_beep_on_reset = 0;
