Module Name: src
Committed By: scole
Date: Sat Apr 8 18:10:43 UTC 2017
Modified Files:
src/sys/external/bsd/acpica/dist/tables: tbxfload.c
Log Message:
Add #ifdef so ski emulator won't crash. This change probably wouldn't
hurt other archs, but just apply to ia64 to be safe.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/tables/tbxfload.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/external/bsd/acpica/dist/tables/tbxfload.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbxfload.c:1.5 src/sys/external/bsd/acpica/dist/tables/tbxfload.c:1.6
--- src/sys/external/bsd/acpica/dist/tables/tbxfload.c:1.5 Wed Jan 25 13:38:22 2017
+++ src/sys/external/bsd/acpica/dist/tables/tbxfload.c Sat Apr 8 18:10:43 2017
@@ -163,6 +163,17 @@ AcpiTbLoadNamespace (
(void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
+#ifdef __ia64__
+ /*
+ * For ia64 ski emulator
+ */
+ if (AcpiGbl_DsdtIndex == ACPI_INVALID_TABLE_INDEX)
+ {
+ Status = AE_NO_ACPI_TABLES;
+ goto UnlockAndExit;
+ }
+#endif
+
/*
* Load the namespace. The DSDT is required, but any SSDT and
* PSDT tables are optional. Verify the DSDT.
