Module Name: src
Committed By: maya
Date: Thu Mar 1 06:00:49 UTC 2018
Modified Files:
src/sys/dev/acpi: acpi.c files.acpi
Log Message:
Limit building & calling ACPI MCFG to kernels with PCI and ACPI.
pci_quirks.c requires pci
acpi_mcfg.c was recently changed to use pci_quirks.c functions.
as a result, ia64 kernels with acpi but no pci failed to link.
tested an ia64 and amd64 kernels build.
To generate a diff of this commit:
cvs rdiff -u -r1.265 -r1.266 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/acpi/files.acpi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.265 src/sys/dev/acpi/acpi.c:1.266
--- src/sys/dev/acpi/acpi.c:1.265 Thu Nov 23 15:48:24 2017
+++ src/sys/dev/acpi/acpi.c Thu Mar 1 06:00:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.265 2017/11/23 15:48:24 jmcneill Exp $ */
+/* $NetBSD: acpi.c,v 1.266 2018/03/01 06:00:49 maya Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,9 +100,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.265 2017/11/23 15:48:24 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.266 2018/03/01 06:00:49 maya Exp $");
#include "opt_acpi.h"
+#include "opt_pci.h"
#include "opt_pcifixup.h"
#include <sys/param.h>
@@ -487,10 +488,12 @@ acpi_attach(device_t parent, device_t se
*/
acpi_build_tree(sc);
+#ifdef NPCI
/*
* Probe MCFG table
*/
acpimcfg_probe(sc);
+#endif
acpi_md_callback(sc);
Index: src/sys/dev/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.100 src/sys/dev/acpi/files.acpi:1.101
--- src/sys/dev/acpi/files.acpi:1.100 Sun Dec 10 16:51:30 2017
+++ src/sys/dev/acpi/files.acpi Thu Mar 1 06:00:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpi,v 1.100 2017/12/10 16:51:30 bouyer Exp $
+# $NetBSD: files.acpi,v 1.101 2018/03/01 06:00:49 maya Exp $
include "dev/acpi/acpica/files.acpica"
@@ -19,7 +19,7 @@ attach acpi at acpibus
file dev/acpi/acpi.c acpi
file dev/acpi/acpi_debug.c acpi
file dev/acpi/acpi_i2c.c acpi
-file dev/acpi/acpi_mcfg.c acpi
+file dev/acpi/acpi_mcfg.c acpi & pci
file dev/acpi/acpi_pci.c acpi
file dev/acpi/acpi_pci_link.c acpi
file dev/acpi/acpi_power.c acpi
