Module Name: src
Committed By: martin
Date: Fri Oct 20 18:35:54 UTC 2023
Modified Files:
src/sys/arch/x86/acpi [netbsd-10]: acpi_wakeup.c
src/sys/arch/x86/x86 [netbsd-10]: genfb_machdep.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #432):
sys/arch/x86/x86/genfb_machdep.c: revision 1.23 (patch)
sys/arch/x86/acpi/acpi_wakeup.c: revision 1.57 (patch)
Move definition of acpi_md_vesa_modenum to acpi_wakeup.c; allows building
kernels without framebuffer devices.
Problem reported by John D. Baker on current-users@
To generate a diff of this commit:
cvs rdiff -u -r1.54.12.1 -r1.54.12.2 src/sys/arch/x86/acpi/acpi_wakeup.c
cvs rdiff -u -r1.19.4.2 -r1.19.4.3 src/sys/arch/x86/x86/genfb_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/acpi/acpi_wakeup.c
diff -u src/sys/arch/x86/acpi/acpi_wakeup.c:1.54.12.1 src/sys/arch/x86/acpi/acpi_wakeup.c:1.54.12.2
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.54.12.1 Wed Oct 18 15:14:24 2023
+++ src/sys/arch/x86/acpi/acpi_wakeup.c Fri Oct 20 18:35:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakeup.c,v 1.54.12.1 2023/10/18 15:14:24 martin Exp $ */
+/* $NetBSD: acpi_wakeup.c,v 1.54.12.2 2023/10/20 18:35:54 martin Exp $ */
/*-
* Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.54.12.1 2023/10/18 15:14:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.54.12.2 2023/10/20 18:35:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,6 +104,12 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.
#include "acpi_wakecode.h"
+#ifdef XENPV
+#error acpi_wakeup.c (acpi_md_vesa_modenum) users must be adapted for Xen
+#else
+int acpi_md_vesa_modenum = 0;
+#endif
+
/* Address is also hard-coded in acpi_wakecode.S */
static paddr_t acpi_wakeup_paddr = 3 * PAGE_SIZE;
static vaddr_t acpi_wakeup_vaddr;
Index: src/sys/arch/x86/x86/genfb_machdep.c
diff -u src/sys/arch/x86/x86/genfb_machdep.c:1.19.4.2 src/sys/arch/x86/x86/genfb_machdep.c:1.19.4.3
--- src/sys/arch/x86/x86/genfb_machdep.c:1.19.4.2 Wed Oct 18 16:53:03 2023
+++ src/sys/arch/x86/x86/genfb_machdep.c Fri Oct 20 18:35:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_machdep.c,v 1.19.4.2 2023/10/18 16:53:03 martin Exp $ */
+/* $NetBSD: genfb_machdep.c,v 1.19.4.3 2023/10/20 18:35:54 martin Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.19.4.2 2023/10/18 16:53:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.19.4.3 2023/10/20 18:35:54 martin Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -64,10 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: genfb_machde
struct vcons_screen x86_genfb_console_screen;
bool x86_genfb_use_shadowfb = true;
-#if NACPICA > 0
-int acpi_md_vesa_modenum = 0;
-#endif
-
static device_t x86_genfb_console_dev = NULL;
static struct wsscreen_descr x86_genfb_stdscreen = {
