Module Name: src
Committed By: cherry
Date: Mon Dec 3 19:46:43 UTC 2018
Modified Files:
src/sys/arch/x86/x86: efi.c
Log Message:
Do not assume that all uses of efi are pci aware.
Allow efi.c to compile in the case where pci is not enabled.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/x86/x86/efi.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/efi.c
diff -u src/sys/arch/x86/x86/efi.c:1.18 src/sys/arch/x86/x86/efi.c:1.19
--- src/sys/arch/x86/x86/efi.c:1.18 Thu Nov 15 16:58:56 2018
+++ src/sys/arch/x86/x86/efi.c Mon Dec 3 19:46:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efi.c,v 1.18 2018/11/15 16:58:56 riastradh Exp $ */
+/* $NetBSD: efi.c,v 1.19 2018/12/03 19:46:43 cherry Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.18 2018/11/15 16:58:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.19 2018/12/03 19:46:43 cherry Exp $");
#include <sys/kmem.h>
#include <sys/param.h>
@@ -40,7 +40,9 @@ __KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.18
#include <x86/efi.h>
#include <dev/mm.h>
+#if NPCI > 0
#include <dev/pci/pcivar.h> /* for pci_mapreg_map_enable_decode */
+#endif
const struct uuid EFI_UUID_ACPI20 = EFI_TABLE_ACPI20;
const struct uuid EFI_UUID_ACPI10 = EFI_TABLE_ACPI10;
@@ -419,7 +421,9 @@ efi_init(void)
return;
}
bootmethod_efi = true;
+#if NPCI > 0
pci_mapreg_map_enable_decode = true; /* PR port-amd64/53286 */
+#endif
}
bool
