svn commit: r364059 - stable/12/sys/dev/acpica

Alexander Motin mav at FreeBSD.org
Mon Aug 10 00:43:44 UTC 2020


Author: mav
Date: Mon Aug 10 00:43:43 2020
New Revision: 364059
URL: https://svnweb.freebsd.org/changeset/base/364059

Log:
  MFC r364013: Allow ACPI APEI driver build without PCI.
  
  On x86 it seems difficult to build ACPI without PCI, but some aarch64
  users appears to be doing it.

Modified:
  stable/12/sys/dev/acpica/acpi_apei.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/acpica/acpi_apei.c
==============================================================================
--- stable/12/sys/dev/acpica/acpi_apei.c	Sun Aug  9 16:27:28 2020	(r364058)
+++ stable/12/sys/dev/acpica/acpi_apei.c	Mon Aug 10 00:43:43 2020	(r364059)
@@ -29,6 +29,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_acpi.h"
+#include "opt_pci.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -207,8 +208,10 @@ static int
 apei_pcie_handler(ACPI_HEST_GENERIC_DATA *ged)
 {
 	struct apei_pcie_error *p = (struct apei_pcie_error *)(ged + 1);
+	int h = 0, off;
+#ifdef DEV_PCI
 	device_t dev;
-	int h = 0, off, sev;
+	int sev;
 
 	if ((p->ValidationBits & 0x8) == 0x8) {
 		mtx_lock(&Giant);
@@ -235,6 +238,7 @@ apei_pcie_handler(ACPI_HEST_GENERIC_DATA *ged)
 	}
 	if (h)
 		return (h);
+#endif
 
 	printf("APEI %s PCIe Error:\n", apei_severity(ged->ErrorSeverity));
 	if (p->ValidationBits & 0x01)


More information about the svn-src-all mailing list