From 91417ae9233a4723354ce6787483923c285e8437 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Thu, 21 Jun 2018 17:03:16 -0600 Subject: [PATCH] Update source to 20180531 upstream, plus patch refresh Signed-off-by: Al Stone --- .gitignore | 2 + acpica-tools.spec | 7 +- big-endian.patch | 417 ++++++++++++++++++++++--------------------- cve-2017-13694.patch | 14 +- int-format.patch | 112 ++++++------ sources | 4 +- 6 files changed, 283 insertions(+), 273 deletions(-) diff --git a/.gitignore b/.gitignore index ebe20eb..9591802 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,5 @@ series /acpitests-unix-20180427.tar.gz /acpica-unix2-20180508.tar.gz /acpitests-unix-20180508.tar.gz +/acpica-unix2-20180531.tar.gz +/acpitests-unix-20180531.tar.gz diff --git a/acpica-tools.spec b/acpica-tools.spec index f127375..4ac4815 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -1,6 +1,6 @@ Name: acpica-tools -Version: 20180508 -Release: 2%{?dist} +Version: 20180531 +Release: 1%{?dist} Summary: ACPICA tools for the development and debug of ACPI tables Group: Development/Languages @@ -229,6 +229,9 @@ fi %changelog +* Thu Jun 21 2018 Al Stone - 20180531-1 +- Update to 20180531 source tree, including patch refeshes. Closes BZ#1584923 + * Tue May 22 2018 Al Stone - 20180508-2 - %%pre and %%post scriptlets fail -- stupid thinko where I inadvertently tested for alternatives not existing, vs existing diff --git a/big-endian.patch b/big-endian.patch index 61eeb9f..cb04d9f 100644 --- a/big-endian.patch +++ b/big-endian.patch @@ -23,10 +23,10 @@ Signed-off-by: Al Stone source/include/platform/aclinux.h | 8 ++ 12 files changed, 487 insertions(+), 283 deletions(-) -Index: acpica-unix-20180313/source/compiler/aslcodegen.c +Index: acpica-unix2-20180531/source/compiler/aslcodegen.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/aslcodegen.c -+++ acpica-unix-20180313/source/compiler/aslcodegen.c +--- acpica-unix2-20180531.orig/source/compiler/aslcodegen.c ++++ acpica-unix2-20180531/source/compiler/aslcodegen.c @@ -240,16 +240,12 @@ CgWriteAmlOpcode ( ACPI_PARSE_OBJECT *Op) { @@ -268,10 +268,10 @@ Index: acpica-unix-20180313/source/compiler/aslcodegen.c case AML_RAW_DATA_BUFFER: -Index: acpica-unix-20180313/source/compiler/aslopcodes.c +Index: acpica-unix2-20180531/source/compiler/aslopcodes.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/aslopcodes.c -+++ acpica-unix-20180313/source/compiler/aslopcodes.c +--- acpica-unix2-20180531.orig/source/compiler/aslopcodes.c ++++ acpica-unix2-20180531/source/compiler/aslopcodes.c @@ -485,6 +485,7 @@ OpcDoUnicode ( UINT32 i; UINT8 *AsciiString; @@ -290,10 +290,10 @@ Index: acpica-unix-20180313/source/compiler/aslopcodes.c } /* -Index: acpica-unix-20180313/source/compiler/aslrestype1.c +Index: acpica-unix2-20180531/source/compiler/aslrestype1.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/aslrestype1.c -+++ acpica-unix-20180313/source/compiler/aslrestype1.c +--- acpica-unix2-20180531.orig/source/compiler/aslrestype1.c ++++ acpica-unix2-20180531/source/compiler/aslrestype1.c @@ -142,6 +142,11 @@ RsDoMemory24Descriptor ( ACPI_PARSE_OBJECT *LengthOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -490,10 +490,10 @@ Index: acpica-unix-20180313/source/compiler/aslrestype1.c RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength)); break; -Index: acpica-unix-20180313/source/compiler/aslrestype1i.c +Index: acpica-unix2-20180531/source/compiler/aslrestype1i.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/aslrestype1i.c -+++ acpica-unix-20180313/source/compiler/aslrestype1i.c +--- acpica-unix2-20180531.orig/source/compiler/aslrestype1i.c ++++ acpica-unix2-20180531/source/compiler/aslrestype1i.c @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -630,10 +630,10 @@ Index: acpica-unix-20180313/source/compiler/aslrestype1i.c + ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask); return (Rnode); } -Index: acpica-unix-20180313/source/compiler/aslrestype2.c +Index: acpica-unix2-20180531/source/compiler/aslrestype2.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/aslrestype2.c -+++ acpica-unix-20180313/source/compiler/aslrestype2.c +--- acpica-unix2-20180531.orig/source/compiler/aslrestype2.c ++++ acpica-unix2-20180531/source/compiler/aslrestype2.c @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -774,10 +774,10 @@ Index: acpica-unix-20180313/source/compiler/aslrestype2.c /* Point to end-of-descriptor for vendor data */ -Index: acpica-unix-20180313/source/compiler/aslrestype2d.c +Index: acpica-unix2-20180531/source/compiler/aslrestype2d.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/aslrestype2d.c -+++ acpica-unix-20180313/source/compiler/aslrestype2d.c +--- acpica-unix2-20180531.orig/source/compiler/aslrestype2d.c ++++ acpica-unix2-20180531/source/compiler/aslrestype2d.c @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -1133,10 +1133,10 @@ Index: acpica-unix-20180313/source/compiler/aslrestype2d.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix-20180313/source/compiler/aslrestype2e.c +Index: acpica-unix2-20180531/source/compiler/aslrestype2e.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/aslrestype2e.c -+++ acpica-unix-20180313/source/compiler/aslrestype2e.c +--- acpica-unix2-20180531.orig/source/compiler/aslrestype2e.c ++++ acpica-unix2-20180531/source/compiler/aslrestype2e.c @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -1242,10 +1242,10 @@ Index: acpica-unix-20180313/source/compiler/aslrestype2e.c Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength; return (Rnode); -Index: acpica-unix-20180313/source/compiler/aslrestype2q.c +Index: acpica-unix2-20180531/source/compiler/aslrestype2q.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/aslrestype2q.c -+++ acpica-unix-20180313/source/compiler/aslrestype2q.c +--- acpica-unix2-20180531.orig/source/compiler/aslrestype2q.c ++++ acpica-unix2-20180531/source/compiler/aslrestype2q.c @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; @@ -1584,10 +1584,10 @@ Index: acpica-unix-20180313/source/compiler/aslrestype2q.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix-20180313/source/compiler/aslrestype2s.c +Index: acpica-unix2-20180531/source/compiler/aslrestype2s.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/aslrestype2s.c -+++ acpica-unix-20180313/source/compiler/aslrestype2s.c +--- acpica-unix2-20180531.orig/source/compiler/aslrestype2s.c ++++ acpica-unix2-20180531/source/compiler/aslrestype2s.c @@ -340,9 +340,14 @@ RsDoGpioIntDescriptor ( UINT16 VendorLength; UINT16 InterruptLength; @@ -2053,10 +2053,10 @@ Index: acpica-unix-20180313/source/compiler/aslrestype2s.c MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); return (Rnode); } -Index: acpica-unix-20180313/source/compiler/aslrestype2w.c +Index: acpica-unix2-20180531/source/compiler/aslrestype2w.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/aslrestype2w.c -+++ acpica-unix-20180313/source/compiler/aslrestype2w.c +--- acpica-unix2-20180531.orig/source/compiler/aslrestype2w.c ++++ acpica-unix2-20180531/source/compiler/aslrestype2w.c @@ -81,6 +81,12 @@ RsDoWordIoDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -2400,10 +2400,10 @@ Index: acpica-unix-20180313/source/compiler/aslrestype2w.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix-20180313/source/include/acmacros.h +Index: acpica-unix2-20180531/source/include/acmacros.h =================================================================== ---- acpica-unix-20180313.orig/source/include/acmacros.h -+++ acpica-unix-20180313/source/include/acmacros.h +--- acpica-unix2-20180531.orig/source/include/acmacros.h ++++ acpica-unix2-20180531/source/include/acmacros.h @@ -98,9 +98,12 @@ ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\ ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];} @@ -2482,10 +2482,10 @@ Index: acpica-unix-20180313/source/include/acmacros.h #define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */ -Index: acpica-unix-20180313/source/include/platform/aclinux.h +Index: acpica-unix2-20180531/source/include/platform/aclinux.h =================================================================== ---- acpica-unix-20180313.orig/source/include/platform/aclinux.h -+++ acpica-unix-20180313/source/include/platform/aclinux.h +--- acpica-unix2-20180531.orig/source/include/platform/aclinux.h ++++ acpica-unix2-20180531/source/include/platform/aclinux.h @@ -193,6 +193,7 @@ #ifdef ACPI_USE_STANDARD_HEADERS @@ -2505,10 +2505,10 @@ Index: acpica-unix-20180313/source/include/platform/aclinux.h #endif /* __KERNEL__ */ #endif /* __ACLINUX_H__ */ -Index: acpica-unix-20180313/source/compiler/aslanalyze.c +Index: acpica-unix2-20180531/source/compiler/aslanalyze.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/aslanalyze.c -+++ acpica-unix-20180313/source/compiler/aslanalyze.c +--- acpica-unix2-20180531.orig/source/compiler/aslanalyze.c ++++ acpica-unix2-20180531/source/compiler/aslanalyze.c @@ -461,7 +461,7 @@ ApCheckForGpeNameConflict ( /* Need a null-terminated string version of NameSeg */ @@ -2527,10 +2527,10 @@ Index: acpica-unix-20180313/source/compiler/aslanalyze.c /* Inject opposite letter ("L" versus "E") */ -Index: acpica-unix-20180313/source/compiler/asllookup.c +Index: acpica-unix2-20180531/source/compiler/asllookup.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/asllookup.c -+++ acpica-unix-20180313/source/compiler/asllookup.c +--- acpica-unix2-20180531.orig/source/compiler/asllookup.c ++++ acpica-unix2-20180531/source/compiler/asllookup.c @@ -119,6 +119,7 @@ LkIsObjectUsed ( { ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle); @@ -2561,10 +2561,10 @@ Index: acpica-unix-20180313/source/compiler/asllookup.c AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED, LkGetNameOp (Node->Op), MsgBuffer); return (AE_OK); -Index: acpica-unix-20180313/source/compiler/aslmain.c +Index: acpica-unix2-20180531/source/compiler/aslmain.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/aslmain.c -+++ acpica-unix-20180313/source/compiler/aslmain.c +--- acpica-unix2-20180531.orig/source/compiler/aslmain.c ++++ acpica-unix2-20180531/source/compiler/aslmain.c @@ -102,18 +102,6 @@ main ( signal (SIGINT, AslSignalHandler); signal (SIGSEGV, AslSignalHandler); @@ -2584,10 +2584,10 @@ Index: acpica-unix-20180313/source/compiler/aslmain.c AcpiOsInitialize (); ACPI_DEBUG_INITIALIZE (); /* For debug version only */ -Index: acpica-unix-20180313/source/common/acfileio.c +Index: acpica-unix2-20180531/source/common/acfileio.c =================================================================== ---- acpica-unix-20180313.orig/source/common/acfileio.c -+++ acpica-unix-20180313/source/common/acfileio.c +--- acpica-unix2-20180531.orig/source/common/acfileio.c ++++ acpica-unix2-20180531/source/common/acfileio.c @@ -280,6 +280,7 @@ AcGetOneTableFromFile ( ACPI_TABLE_HEADER *Table; INT32 Count; @@ -2606,18 +2606,23 @@ Index: acpica-unix-20180313/source/common/acfileio.c if (!Table) { return (AE_NO_MEMORY); -@@ -329,8 +331,8 @@ AcGetOneTableFromFile ( +@@ -329,13 +331,13 @@ AcGetOneTableFromFile ( fseek (File, TableOffset, SEEK_SET); - Count = fread (Table, 1, TableHeader.Length, File); -- if (Count != (INT32) TableHeader.Length) + Count = fread (Table, 1, TableLen, File); -+ if (Count != (INT32) TableLen) + + /* + * Checks for data table headers happen later in the execution. Only verify + * for Aml tables at this point in the code. + */ +- if (GetOnlyAmlTables && Count != (INT32) TableHeader.Length) ++ if (GetOnlyAmlTables && Count != TableLen) { Status = AE_ERROR; goto ErrorExit; -@@ -338,7 +340,7 @@ AcGetOneTableFromFile ( +@@ -343,7 +345,7 @@ AcGetOneTableFromFile ( /* Validate the checksum (just issue a warning) */ @@ -2626,7 +2631,7 @@ Index: acpica-unix-20180313/source/common/acfileio.c if (ACPI_FAILURE (Status)) { Status = AcCheckTextModeCorruption (Table); -@@ -430,6 +432,7 @@ AcValidateTableHeader ( +@@ -435,6 +437,7 @@ AcValidateTableHeader ( ACPI_SIZE Actual; long OriginalOffset; UINT32 FileSize; @@ -2634,7 +2639,7 @@ Index: acpica-unix-20180313/source/common/acfileio.c UINT32 i; -@@ -459,11 +462,12 @@ AcValidateTableHeader ( +@@ -464,11 +467,12 @@ AcValidateTableHeader ( /* Validate table length against bytes remaining in the file */ FileSize = CmGetFileSize (File); @@ -2649,10 +2654,10 @@ Index: acpica-unix-20180313/source/common/acfileio.c (UINT32) (FileSize - TableOffset)); return (AE_BAD_HEADER); } -Index: acpica-unix-20180313/source/common/dmtable.c +Index: acpica-unix2-20180531/source/common/dmtable.c =================================================================== ---- acpica-unix-20180313.orig/source/common/dmtable.c -+++ acpica-unix-20180313/source/common/dmtable.c +--- acpica-unix2-20180531.orig/source/common/dmtable.c ++++ acpica-unix2-20180531/source/common/dmtable.c @@ -550,7 +550,7 @@ AcpiDmDumpDataTable ( */ if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS)) @@ -2751,10 +2756,10 @@ Index: acpica-unix-20180313/source/common/dmtable.c AcpiDmNfitSubnames[Temp16]); break; -Index: acpica-unix-20180313/source/common/dmtables.c +Index: acpica-unix2-20180531/source/common/dmtables.c =================================================================== ---- acpica-unix-20180313.orig/source/common/dmtables.c -+++ acpica-unix-20180313/source/common/dmtables.c +--- acpica-unix2-20180531.orig/source/common/dmtables.c ++++ acpica-unix2-20180531/source/common/dmtables.c @@ -142,7 +142,9 @@ AdCreateTableHeader ( ACPI_TABLE_HEADER *Table) { @@ -2820,10 +2825,10 @@ Index: acpica-unix-20180313/source/common/dmtables.c AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)); ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength); -Index: acpica-unix-20180313/source/common/dmtbdump.c +Index: acpica-unix2-20180531/source/common/dmtbdump.c =================================================================== ---- acpica-unix-20180313.orig/source/common/dmtbdump.c -+++ acpica-unix-20180313/source/common/dmtbdump.c +--- acpica-unix2-20180531.orig/source/common/dmtbdump.c ++++ acpica-unix2-20180531/source/common/dmtbdump.c @@ -277,6 +277,8 @@ AcpiDmDumpRsdt ( UINT32 Entries; UINT32 Offset; @@ -2982,10 +2987,10 @@ Index: acpica-unix-20180313/source/common/dmtbdump.c - Revision, Length, ExpectedLength); + Revision, Tmp32, ExpectedLength); } -Index: acpica-unix-20180313/source/common/dmtbdump1.c +Index: acpica-unix2-20180531/source/common/dmtbdump1.c =================================================================== ---- acpica-unix-20180313.orig/source/common/dmtbdump1.c -+++ acpica-unix-20180313/source/common/dmtbdump1.c +--- acpica-unix2-20180531.orig/source/common/dmtbdump1.c ++++ acpica-unix2-20180531/source/common/dmtbdump1.c @@ -79,17 +79,21 @@ AcpiDmDumpAsf ( UINT32 DataOffset = 0; UINT32 i; @@ -3619,10 +3624,10 @@ Index: acpica-unix-20180313/source/common/dmtbdump1.c { case ACPI_HEST_TYPE_IA32_CHECK: -Index: acpica-unix-20180313/source/common/dmtbdump2.c +Index: acpica-unix2-20180531/source/common/dmtbdump2.c =================================================================== ---- acpica-unix-20180313.orig/source/common/dmtbdump2.c -+++ acpica-unix-20180313/source/common/dmtbdump2.c +--- acpica-unix2-20180531.orig/source/common/dmtbdump2.c ++++ acpica-unix2-20180531/source/common/dmtbdump2.c @@ -75,15 +75,21 @@ AcpiDmDumpIort ( ACPI_IORT_SMMU *IortSmmu = NULL; UINT32 Offset; @@ -3691,8 +3696,8 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c + Length = NodeLength - NodeOffset; break; - default: -@@ -164,7 +173,8 @@ AcpiDmDumpIort ( + case ACPI_IORT_NODE_PMCG: +@@ -170,7 +179,8 @@ AcpiDmDumpIort ( /* Attempt to continue */ @@ -3702,7 +3707,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c { AcpiOsPrintf ("Invalid zero length IORT node\n"); return; -@@ -175,7 +185,7 @@ AcpiDmDumpIort ( +@@ -181,7 +191,7 @@ AcpiDmDumpIort ( /* Dump the node subtable header */ AcpiOsPrintf ("\n"); @@ -3711,7 +3716,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), Length, InfoTable); if (ACPI_FAILURE (Status)) -@@ -195,9 +205,10 @@ AcpiDmDumpIort ( +@@ -201,9 +211,10 @@ AcpiDmDumpIort ( if (IortItsGroup) { @@ -3724,7 +3729,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), 4, AcpiDmTableInfoIort0a); NodeOffset += 4; -@@ -209,11 +220,11 @@ AcpiDmDumpIort ( +@@ -215,11 +226,11 @@ AcpiDmDumpIort ( /* Dump the Padding (optional) */ @@ -3740,7 +3745,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -230,8 +241,8 @@ AcpiDmDumpIort ( +@@ -236,8 +247,8 @@ AcpiDmDumpIort ( if (IortSmmu) { Length = 2 * sizeof (UINT64); @@ -3751,7 +3756,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), Length, AcpiDmTableInfoIort3a); if (ACPI_FAILURE (Status)) -@@ -239,10 +250,11 @@ AcpiDmDumpIort ( +@@ -245,10 +256,11 @@ AcpiDmDumpIort ( return; } @@ -3766,7 +3771,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), 8, AcpiDmTableInfoIort3b); if (ACPI_FAILURE (Status)) -@@ -253,10 +265,11 @@ AcpiDmDumpIort ( +@@ -259,10 +271,11 @@ AcpiDmDumpIort ( NodeOffset += 8; } @@ -3781,7 +3786,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), 8, AcpiDmTableInfoIort3c); if (ACPI_FAILURE (Status)) -@@ -276,12 +289,13 @@ AcpiDmDumpIort ( +@@ -282,12 +295,13 @@ AcpiDmDumpIort ( /* Dump the ID mappings */ @@ -3798,7 +3803,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), Length, AcpiDmTableInfoIortMap); if (ACPI_FAILURE (Status)) -@@ -295,8 +309,9 @@ AcpiDmDumpIort ( +@@ -301,8 +315,9 @@ AcpiDmDumpIort ( NextSubtable: /* Point to next node subtable */ @@ -3810,7 +3815,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c } } -@@ -327,11 +342,14 @@ AcpiDmDumpIvrs ( +@@ -333,11 +348,14 @@ AcpiDmDumpIvrs ( ACPI_IVRS_DE_HEADER *DeviceEntry; ACPI_IVRS_HEADER *Subtable; ACPI_DMTABLE_INFO *InfoTable; @@ -3826,7 +3831,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -340,13 +358,14 @@ AcpiDmDumpIvrs ( +@@ -346,13 +364,14 @@ AcpiDmDumpIvrs ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset); @@ -3844,7 +3849,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -373,7 +392,7 @@ AcpiDmDumpIvrs ( +@@ -379,7 +398,7 @@ AcpiDmDumpIvrs ( /* Attempt to continue */ @@ -3853,7 +3858,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c { AcpiOsPrintf ("Invalid zero length subtable\n"); return; -@@ -384,8 +403,8 @@ AcpiDmDumpIvrs ( +@@ -390,8 +409,8 @@ AcpiDmDumpIvrs ( /* Dump the subtable */ AcpiOsPrintf ("\n"); @@ -3864,7 +3869,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -399,7 +418,7 @@ AcpiDmDumpIvrs ( +@@ -405,7 +424,7 @@ AcpiDmDumpIvrs ( DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, Subtable, sizeof (ACPI_IVRS_HARDWARE)); @@ -3873,7 +3878,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c { AcpiOsPrintf ("\n"); /* -@@ -461,7 +480,7 @@ AcpiDmDumpIvrs ( +@@ -467,7 +486,7 @@ AcpiDmDumpIvrs ( /* Dump the Device Entry */ @@ -3882,7 +3887,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c DeviceEntry, EntryLength, InfoTable); if (ACPI_FAILURE (Status)) { -@@ -477,8 +496,8 @@ AcpiDmDumpIvrs ( +@@ -483,8 +502,8 @@ AcpiDmDumpIvrs ( NextSubtable: /* Point to next subtable */ @@ -3893,7 +3898,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c } } -@@ -504,7 +523,7 @@ AcpiDmDumpLpit ( +@@ -510,7 +529,7 @@ AcpiDmDumpLpit ( { ACPI_STATUS Status; ACPI_LPIT_HEADER *Subtable; @@ -3902,7 +3907,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c UINT32 Offset = sizeof (ACPI_TABLE_LPIT); ACPI_DMTABLE_INFO *InfoTable; UINT32 SubtableLength; -@@ -512,8 +531,9 @@ AcpiDmDumpLpit ( +@@ -518,8 +537,9 @@ AcpiDmDumpLpit ( /* Subtables */ @@ -3913,7 +3918,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c { /* Common subtable header */ -@@ -577,13 +597,14 @@ AcpiDmDumpMadt ( +@@ -583,13 +603,14 @@ AcpiDmDumpMadt ( { ACPI_STATUS Status; ACPI_SUBTABLE_HEADER *Subtable; @@ -3929,7 +3934,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMadt); if (ACPI_FAILURE (Status)) { -@@ -593,7 +614,7 @@ AcpiDmDumpMadt ( +@@ -599,7 +620,7 @@ AcpiDmDumpMadt ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset); @@ -3938,7 +3943,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c { /* Common subtable header */ -@@ -739,11 +760,13 @@ AcpiDmDumpMcfg ( +@@ -745,11 +766,13 @@ AcpiDmDumpMcfg ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_MCFG); ACPI_MCFG_ALLOCATION *Subtable; @@ -3953,7 +3958,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -752,17 +775,17 @@ AcpiDmDumpMcfg ( +@@ -758,17 +781,17 @@ AcpiDmDumpMcfg ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset); @@ -3975,7 +3980,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0); if (ACPI_FAILURE (Status)) { -@@ -796,6 +819,7 @@ AcpiDmDumpMpst ( +@@ -802,6 +825,7 @@ AcpiDmDumpMpst ( { ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_MPST); @@ -3983,7 +3988,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c ACPI_MPST_POWER_NODE *Subtable0; ACPI_MPST_POWER_STATE *Subtable0A; ACPI_MPST_COMPONENT *Subtable0B; -@@ -804,11 +828,13 @@ AcpiDmDumpMpst ( +@@ -810,11 +834,13 @@ AcpiDmDumpMpst ( UINT16 SubtableCount; UINT32 PowerStateCount; UINT32 ComponentCount; @@ -3998,7 +4003,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -816,13 +842,14 @@ AcpiDmDumpMpst ( +@@ -822,13 +848,14 @@ AcpiDmDumpMpst ( /* Subtable: Memory Power Node(s) */ @@ -4016,7 +4021,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0); if (ACPI_FAILURE (Status)) { -@@ -831,8 +858,8 @@ AcpiDmDumpMpst ( +@@ -837,8 +864,8 @@ AcpiDmDumpMpst ( /* Extract the sub-subtable counts */ @@ -4027,7 +4032,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c Offset += sizeof (ACPI_MPST_POWER_NODE); /* Sub-subtables - Memory Power State Structure(s) */ -@@ -843,7 +870,7 @@ AcpiDmDumpMpst ( +@@ -849,7 +876,7 @@ AcpiDmDumpMpst ( while (PowerStateCount) { AcpiOsPrintf ("\n"); @@ -4036,7 +4041,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A); if (ACPI_FAILURE (Status)) { -@@ -853,7 +880,7 @@ AcpiDmDumpMpst ( +@@ -859,7 +886,7 @@ AcpiDmDumpMpst ( Subtable0A++; PowerStateCount--; Offset += sizeof (ACPI_MPST_POWER_STATE); @@ -4045,7 +4050,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c /* Sub-subtables - Physical Component ID Structure(s) */ -@@ -866,7 +893,7 @@ AcpiDmDumpMpst ( +@@ -872,7 +899,7 @@ AcpiDmDumpMpst ( while (ComponentCount) { @@ -4054,7 +4059,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B); if (ACPI_FAILURE (Status)) { -@@ -881,17 +908,19 @@ AcpiDmDumpMpst ( +@@ -887,17 +914,19 @@ AcpiDmDumpMpst ( /* Point to next Memory Power Node subtable */ SubtableCount--; @@ -4077,7 +4082,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1); if (ACPI_FAILURE (Status)) { -@@ -906,10 +935,10 @@ AcpiDmDumpMpst ( +@@ -912,10 +941,10 @@ AcpiDmDumpMpst ( Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1, sizeof (ACPI_MPST_DATA_HDR)); @@ -4090,7 +4095,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2); if (ACPI_FAILURE (Status)) { -@@ -942,11 +971,13 @@ AcpiDmDumpMsct ( +@@ -948,11 +977,13 @@ AcpiDmDumpMsct ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_MSCT); ACPI_MSCT_PROXIMITY *Subtable; @@ -4105,7 +4110,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -955,12 +986,12 @@ AcpiDmDumpMsct ( +@@ -961,12 +992,12 @@ AcpiDmDumpMsct ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset); @@ -4120,7 +4125,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0); if (ACPI_FAILURE (Status)) { -@@ -995,11 +1026,13 @@ AcpiDmDumpMtmr ( +@@ -1001,11 +1032,13 @@ AcpiDmDumpMtmr ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_MTMR); ACPI_MTMR_ENTRY *Subtable; @@ -4135,7 +4140,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -1008,12 +1041,12 @@ AcpiDmDumpMtmr ( +@@ -1014,12 +1047,12 @@ AcpiDmDumpMtmr ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset); @@ -4150,7 +4155,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0); if (ACPI_FAILURE (Status)) { -@@ -1055,11 +1088,17 @@ AcpiDmDumpNfit ( +@@ -1061,11 +1094,17 @@ AcpiDmDumpNfit ( ACPI_NFIT_SMBIOS *SmbiosInfo = NULL; ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL; UINT32 i; @@ -4169,7 +4174,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -1068,19 +1107,21 @@ AcpiDmDumpNfit ( +@@ -1074,19 +1113,21 @@ AcpiDmDumpNfit ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset); @@ -4195,7 +4200,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c { case ACPI_NFIT_TYPE_SYSTEM_ADDRESS: -@@ -1137,7 +1178,7 @@ AcpiDmDumpNfit ( +@@ -1143,7 +1184,7 @@ AcpiDmDumpNfit ( /* Attempt to continue */ @@ -4204,7 +4209,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c { AcpiOsPrintf ("Invalid zero length subtable\n"); return; -@@ -1146,8 +1187,8 @@ AcpiDmDumpNfit ( +@@ -1152,8 +1193,8 @@ AcpiDmDumpNfit ( } AcpiOsPrintf ("\n"); @@ -4215,7 +4220,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -1155,13 +1196,14 @@ AcpiDmDumpNfit ( +@@ -1161,13 +1202,14 @@ AcpiDmDumpNfit ( /* Per-subtable variable-length fields */ @@ -4233,7 +4238,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c &Interleave->LineOffset[i], sizeof (UINT32), AcpiDmTableInfoNfit2a); if (ACPI_FAILURE (Status)) -@@ -1175,12 +1217,11 @@ AcpiDmDumpNfit ( +@@ -1181,12 +1223,11 @@ AcpiDmDumpNfit ( case ACPI_NFIT_TYPE_SMBIOS: @@ -4248,7 +4253,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8), SmbiosInfo, Length, AcpiDmTableInfoNfit3a); -@@ -1194,9 +1235,10 @@ AcpiDmDumpNfit ( +@@ -1200,9 +1241,10 @@ AcpiDmDumpNfit ( case ACPI_NFIT_TYPE_FLUSH_ADDRESS: @@ -4261,7 +4266,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c &Hint->HintAddress[i], sizeof (UINT64), AcpiDmTableInfoNfit6a); if (ACPI_FAILURE (Status)) -@@ -1215,8 +1257,8 @@ AcpiDmDumpNfit ( +@@ -1221,8 +1263,8 @@ AcpiDmDumpNfit ( NextSubtable: /* Point to next subtable */ @@ -4272,7 +4277,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c } } -@@ -1241,12 +1283,13 @@ AcpiDmDumpPcct ( +@@ -1247,12 +1289,13 @@ AcpiDmDumpPcct ( ACPI_STATUS Status; ACPI_PCCT_SUBSPACE *Subtable; ACPI_DMTABLE_INFO *InfoTable; @@ -4287,7 +4292,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct); if (ACPI_FAILURE (Status)) { -@@ -1256,7 +1299,7 @@ AcpiDmDumpPcct ( +@@ -1262,7 +1305,7 @@ AcpiDmDumpPcct ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset); @@ -4296,7 +4301,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c { /* Common subtable header */ -@@ -1396,16 +1439,21 @@ AcpiDmDumpPmtt ( +@@ -1402,16 +1445,21 @@ AcpiDmDumpPmtt ( ACPI_PMTT_HEADER *MemSubtable; ACPI_PMTT_HEADER *DimmSubtable; ACPI_PMTT_DOMAIN *DomainArray; @@ -4320,7 +4325,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt); if (ACPI_FAILURE (Status)) { -@@ -1415,13 +1463,14 @@ AcpiDmDumpPmtt ( +@@ -1421,13 +1469,14 @@ AcpiDmDumpPmtt ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset); @@ -4337,7 +4342,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -1440,7 +1489,7 @@ AcpiDmDumpPmtt ( +@@ -1446,7 +1495,7 @@ AcpiDmDumpPmtt ( /* Dump the fixed-length portion of the subtable */ Status = AcpiDmDumpTable (Length, Offset, Subtable, @@ -4346,7 +4351,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -1452,15 +1501,16 @@ AcpiDmDumpPmtt ( +@@ -1458,15 +1507,16 @@ AcpiDmDumpPmtt ( MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable, sizeof (ACPI_PMTT_SOCKET)); @@ -4366,7 +4371,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -1480,7 +1530,7 @@ AcpiDmDumpPmtt ( +@@ -1486,7 +1536,7 @@ AcpiDmDumpPmtt ( Status = AcpiDmDumpTable (Length, Offset + MemOffset, MemSubtable, @@ -4375,7 +4380,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -1488,13 +1538,14 @@ AcpiDmDumpPmtt ( +@@ -1494,13 +1544,14 @@ AcpiDmDumpPmtt ( /* Walk the variable count of proximity domains */ @@ -4393,7 +4398,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c DomainCount) { Status = AcpiDmDumpTable (Length, -@@ -1522,15 +1573,16 @@ AcpiDmDumpPmtt ( +@@ -1528,15 +1579,16 @@ AcpiDmDumpPmtt ( DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubtable, DomainOffset); @@ -4413,7 +4418,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -1550,7 +1602,7 @@ AcpiDmDumpPmtt ( +@@ -1556,7 +1608,7 @@ AcpiDmDumpPmtt ( Status = AcpiDmDumpTable (Length, Offset + MemOffset + DimmOffset, DimmSubtable, @@ -4422,7 +4427,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -1558,23 +1610,22 @@ AcpiDmDumpPmtt ( +@@ -1564,23 +1616,22 @@ AcpiDmDumpPmtt ( /* Point to next DIMM subtable */ @@ -4452,7 +4457,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c } } -@@ -1730,6 +1781,8 @@ AcpiDmDumpS3pt ( +@@ -1736,6 +1787,8 @@ AcpiDmDumpS3pt ( ACPI_FPDT_HEADER *Subtable; ACPI_DMTABLE_INFO *InfoTable; ACPI_TABLE_S3PT *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables); @@ -4461,7 +4466,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c /* Main table */ -@@ -1740,20 +1793,22 @@ AcpiDmDumpS3pt ( +@@ -1746,20 +1799,22 @@ AcpiDmDumpS3pt ( return 0; } @@ -4487,7 +4492,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c { case ACPI_S3PT_TYPE_RESUME: -@@ -1768,7 +1823,7 @@ AcpiDmDumpS3pt ( +@@ -1774,7 +1829,7 @@ AcpiDmDumpS3pt ( default: AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n", @@ -4496,7 +4501,7 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c /* Attempt to continue */ -@@ -1781,7 +1836,7 @@ AcpiDmDumpS3pt ( +@@ -1787,7 +1842,7 @@ AcpiDmDumpS3pt ( } AcpiOsPrintf ("\n"); @@ -4505,10 +4510,10 @@ Index: acpica-unix-20180313/source/common/dmtbdump2.c Subtable->Length, InfoTable); if (ACPI_FAILURE (Status)) { -Index: acpica-unix-20180313/source/common/dmtbdump3.c +Index: acpica-unix2-20180531/source/common/dmtbdump3.c =================================================================== ---- acpica-unix-20180313.orig/source/common/dmtbdump3.c -+++ acpica-unix-20180313/source/common/dmtbdump3.c +--- acpica-unix2-20180531.orig/source/common/dmtbdump3.c ++++ acpica-unix2-20180531/source/common/dmtbdump3.c @@ -68,9 +68,11 @@ void AcpiDmDumpSlic ( ACPI_TABLE_HEADER *Table) @@ -4755,10 +4760,10 @@ Index: acpica-unix-20180313/source/common/dmtbdump3.c + (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength, AcpiDmTableInfoWpbt0); } -Index: acpica-unix-20180313/source/compiler/dtfield.c +Index: acpica-unix2-20180531/source/compiler/dtfield.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/dtfield.c -+++ acpica-unix-20180313/source/compiler/dtfield.c +--- acpica-unix2-20180531.orig/source/compiler/dtfield.c ++++ acpica-unix2-20180531/source/compiler/dtfield.c @@ -359,7 +359,27 @@ DtCompileInteger ( DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, MsgBuffer); } @@ -4788,10 +4793,10 @@ Index: acpica-unix-20180313/source/compiler/dtfield.c return; } -Index: acpica-unix-20180313/source/compiler/dtsubtable.c +Index: acpica-unix2-20180531/source/compiler/dtsubtable.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/dtsubtable.c -+++ acpica-unix-20180313/source/compiler/dtsubtable.c +--- acpica-unix2-20180531.orig/source/compiler/dtsubtable.c ++++ acpica-unix2-20180531/source/compiler/dtsubtable.c @@ -378,6 +378,21 @@ DtSetSubtableLength ( return; } @@ -4816,10 +4821,10 @@ Index: acpica-unix-20180313/source/compiler/dtsubtable.c + Subtable->SizeOfLengthField); + } } -Index: acpica-unix-20180313/source/compiler/dttable1.c +Index: acpica-unix2-20180531/source/compiler/dttable1.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/dttable1.c -+++ acpica-unix-20180313/source/compiler/dttable1.c +--- acpica-unix2-20180531.orig/source/compiler/dttable1.c ++++ acpica-unix2-20180531/source/compiler/dttable1.c @@ -281,6 +281,8 @@ DtCompileCsrt ( DT_FIELD **PFieldList = (DT_FIELD **) List; UINT32 DescriptorCount; @@ -5164,7 +5169,7 @@ Index: acpica-unix-20180313/source/compiler/dttable1.c break; case ACPI_IORT_NODE_SMMU_V3: -@@ -1729,7 +1759,7 @@ DtCompileIort ( +@@ -1742,7 +1772,7 @@ DtCompileIort ( /* Compile Array of ID mappings */ @@ -5173,7 +5178,7 @@ Index: acpica-unix-20180313/source/compiler/dttable1.c IdMappingNumber = 0; while (*PFieldList) { -@@ -1750,7 +1780,7 @@ DtCompileIort ( +@@ -1763,7 +1793,7 @@ DtCompileIort ( IdMappingNumber++; } @@ -5182,7 +5187,7 @@ Index: acpica-unix-20180313/source/compiler/dttable1.c if (!IdMappingNumber) { IortNode->MappingOffset = 0; -@@ -1765,7 +1795,7 @@ DtCompileIort ( +@@ -1778,7 +1808,7 @@ DtCompileIort ( NodeNumber++; } @@ -5191,10 +5196,10 @@ Index: acpica-unix-20180313/source/compiler/dttable1.c return (AE_OK); } -Index: acpica-unix-20180313/source/compiler/dttable2.c +Index: acpica-unix2-20180531/source/compiler/dttable2.c =================================================================== ---- acpica-unix-20180313.orig/source/compiler/dttable2.c -+++ acpica-unix-20180313/source/compiler/dttable2.c +--- acpica-unix2-20180531.orig/source/compiler/dttable2.c ++++ acpica-unix2-20180531/source/compiler/dttable2.c @@ -345,7 +345,7 @@ DtCompileMpst ( DtPushSubtable (Subtable); @@ -5351,10 +5356,10 @@ Index: acpica-unix-20180313/source/compiler/dttable2.c ParentTable = DtPeekSubtable (); DtInsertSubtable (ParentTable, Subtable); -Index: acpica-unix-20180313/source/components/disassembler/dmbuffer.c +Index: acpica-unix2-20180531/source/components/disassembler/dmbuffer.c =================================================================== ---- acpica-unix-20180313.orig/source/components/disassembler/dmbuffer.c -+++ acpica-unix-20180313/source/components/disassembler/dmbuffer.c +--- acpica-unix2-20180531.orig/source/components/disassembler/dmbuffer.c ++++ acpica-unix2-20180531/source/components/disassembler/dmbuffer.c @@ -204,7 +204,7 @@ AcpiDmByteList ( @@ -5430,10 +5435,10 @@ Index: acpica-unix-20180313/source/components/disassembler/dmbuffer.c NextOp = AcpiPsGetDepthNext (NULL, Op); if (!NextOp) -Index: acpica-unix-20180313/source/components/disassembler/dmopcode.c +Index: acpica-unix2-20180531/source/components/disassembler/dmopcode.c =================================================================== ---- acpica-unix-20180313.orig/source/components/disassembler/dmopcode.c -+++ acpica-unix-20180313/source/components/disassembler/dmopcode.c +--- acpica-unix2-20180531.orig/source/components/disassembler/dmopcode.c ++++ acpica-unix2-20180531/source/components/disassembler/dmopcode.c @@ -244,6 +244,7 @@ AcpiDmPredefinedDescription ( char *NameString; int LastCharIsDigit; @@ -5504,10 +5509,10 @@ Index: acpica-unix-20180313/source/components/disassembler/dmopcode.c Info->Level += 1; Info->MappingOp = Op; -Index: acpica-unix-20180313/source/components/disassembler/dmresrcl.c +Index: acpica-unix2-20180531/source/components/disassembler/dmresrcl.c =================================================================== ---- acpica-unix-20180313.orig/source/components/disassembler/dmresrcl.c -+++ acpica-unix-20180313/source/components/disassembler/dmresrcl.c +--- acpica-unix2-20180531.orig/source/components/disassembler/dmresrcl.c ++++ acpica-unix2-20180531/source/components/disassembler/dmresrcl.c @@ -141,7 +141,8 @@ AcpiDmMemoryFields ( UINT32 Level) { @@ -5656,10 +5661,10 @@ Index: acpica-unix-20180313/source/components/disassembler/dmresrcl.c } AcpiDmIndent (Level); -Index: acpica-unix-20180313/source/components/disassembler/dmresrcl2.c +Index: acpica-unix2-20180531/source/components/disassembler/dmresrcl2.c =================================================================== ---- acpica-unix-20180313.orig/source/components/disassembler/dmresrcl2.c -+++ acpica-unix-20180313/source/components/disassembler/dmresrcl2.c +--- acpica-unix2-20180531.orig/source/components/disassembler/dmresrcl2.c ++++ acpica-unix2-20180531/source/components/disassembler/dmresrcl2.c @@ -191,22 +191,24 @@ AcpiDmGpioCommon ( char *DeviceName = NULL; UINT32 PinCount; @@ -5883,10 +5888,10 @@ Index: acpica-unix-20180313/source/components/disassembler/dmresrcl2.c DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset); AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX); -Index: acpica-unix-20180313/source/components/disassembler/dmresrcs.c +Index: acpica-unix2-20180531/source/components/disassembler/dmresrcs.c =================================================================== ---- acpica-unix-20180313.orig/source/components/disassembler/dmresrcs.c -+++ acpica-unix-20180313/source/components/disassembler/dmresrcs.c +--- acpica-unix2-20180531.orig/source/components/disassembler/dmresrcs.c ++++ acpica-unix2-20180531/source/components/disassembler/dmresrcs.c @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor ( UINT32 Length, UINT32 Level) @@ -5943,10 +5948,10 @@ Index: acpica-unix-20180313/source/components/disassembler/dmresrcs.c AcpiDmIndent (Level + 1); AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length"); -Index: acpica-unix-20180313/source/components/dispatcher/dsfield.c +Index: acpica-unix2-20180531/source/components/dispatcher/dsfield.c =================================================================== ---- acpica-unix-20180313.orig/source/components/dispatcher/dsfield.c -+++ acpica-unix-20180313/source/components/dispatcher/dsfield.c +--- acpica-unix2-20180531.orig/source/components/dispatcher/dsfield.c ++++ acpica-unix2-20180531/source/components/dispatcher/dsfield.c @@ -321,6 +321,7 @@ AcpiDsGetFieldNames ( ACPI_STATUS Status; UINT64 Position; @@ -5991,10 +5996,10 @@ Index: acpica-unix-20180313/source/components/dispatcher/dsfield.c if (ACPI_FAILURE (Status)) { ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo, -Index: acpica-unix-20180313/source/components/events/evgpeblk.c +Index: acpica-unix2-20180531/source/components/events/evgpeblk.c =================================================================== ---- acpica-unix-20180313.orig/source/components/events/evgpeblk.c -+++ acpica-unix-20180313/source/components/events/evgpeblk.c +--- acpica-unix2-20180531.orig/source/components/events/evgpeblk.c ++++ acpica-unix2-20180531/source/components/events/evgpeblk.c @@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock ( ACPI_STATUS Status; ACPI_GPE_BLOCK_INFO *GpeBlock; @@ -6027,10 +6032,10 @@ Index: acpica-unix-20180313/source/components/events/evgpeblk.c InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : "")); /* Update global count of currently available GPEs */ -Index: acpica-unix-20180313/source/components/hardware/hwregs.c +Index: acpica-unix2-20180531/source/components/hardware/hwregs.c =================================================================== ---- acpica-unix-20180313.orig/source/components/hardware/hwregs.c -+++ acpica-unix-20180313/source/components/hardware/hwregs.c +--- acpica-unix2-20180531.orig/source/components/hardware/hwregs.c ++++ acpica-unix2-20180531/source/components/hardware/hwregs.c @@ -197,7 +197,7 @@ AcpiHwValidateRegister ( * Address must not be null. A null address also indicates an optional * ACPI register that is not supported, so no error message. @@ -6040,10 +6045,10 @@ Index: acpica-unix-20180313/source/components/hardware/hwregs.c if (!(*Address)) { return (AE_BAD_ADDRESS); -Index: acpica-unix-20180313/source/components/hardware/hwvalid.c +Index: acpica-unix2-20180531/source/components/hardware/hwvalid.c =================================================================== ---- acpica-unix-20180313.orig/source/components/hardware/hwvalid.c -+++ acpica-unix-20180313/source/components/hardware/hwvalid.c +--- acpica-unix2-20180531.orig/source/components/hardware/hwvalid.c ++++ acpica-unix2-20180531/source/components/hardware/hwvalid.c @@ -135,6 +135,8 @@ AcpiHwValidateIoRequest ( UINT32 ByteWidth; ACPI_IO_ADDRESS LastAddress; @@ -6065,10 +6070,10 @@ Index: acpica-unix-20180313/source/components/hardware/hwvalid.c { ACPI_ERROR ((AE_INFO, "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X", -Index: acpica-unix-20180313/source/components/namespace/nsaccess.c +Index: acpica-unix2-20180531/source/components/namespace/nsaccess.c =================================================================== ---- acpica-unix-20180313.orig/source/components/namespace/nsaccess.c -+++ acpica-unix-20180313/source/components/namespace/nsaccess.c +--- acpica-unix2-20180531.orig/source/components/namespace/nsaccess.c ++++ acpica-unix2-20180531/source/components/namespace/nsaccess.c @@ -313,6 +313,7 @@ AcpiNsLookup ( ACPI_OBJECT_TYPE ThisSearchType; UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT; @@ -6089,10 +6094,10 @@ Index: acpica-unix-20180313/source/components/namespace/nsaccess.c AcpiUtGetTypeName (ThisNode->Type), AcpiUtGetTypeName (TypeToCheckFor))); } -Index: acpica-unix-20180313/source/components/namespace/nsparse.c +Index: acpica-unix2-20180531/source/components/namespace/nsparse.c =================================================================== ---- acpica-unix-20180313.orig/source/components/namespace/nsparse.c -+++ acpica-unix-20180313/source/components/namespace/nsparse.c +--- acpica-unix2-20180531.orig/source/components/namespace/nsparse.c ++++ acpica-unix2-20180531/source/components/namespace/nsparse.c @@ -206,13 +206,14 @@ AcpiNsOneCompleteParse ( /* Table must consist of at least a complete header */ @@ -6110,10 +6115,10 @@ Index: acpica-unix-20180313/source/components/namespace/nsparse.c Status = AcpiTbGetOwnerId (TableIndex, &OwnerId); if (ACPI_FAILURE (Status)) -Index: acpica-unix-20180313/source/components/tables/tbdata.c +Index: acpica-unix2-20180531/source/components/tables/tbdata.c =================================================================== ---- acpica-unix-20180313.orig/source/components/tables/tbdata.c -+++ acpica-unix-20180313/source/components/tables/tbdata.c +--- acpica-unix2-20180531.orig/source/components/tables/tbdata.c ++++ acpica-unix2-20180531/source/components/tables/tbdata.c @@ -552,6 +552,7 @@ AcpiTbVerifyTempTable ( UINT32 *TableIndex) { @@ -6132,10 +6137,10 @@ Index: acpica-unix-20180313/source/components/tables/tbdata.c if (ACPI_FAILURE (Status)) { ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY, -Index: acpica-unix-20180313/source/components/tables/tbfadt.c +Index: acpica-unix2-20180531/source/components/tables/tbfadt.c =================================================================== ---- acpica-unix-20180313.orig/source/components/tables/tbfadt.c -+++ acpica-unix-20180313/source/components/tables/tbfadt.c +--- acpica-unix2-20180531.orig/source/components/tables/tbfadt.c ++++ acpica-unix2-20180531/source/components/tables/tbfadt.c @@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt ( ACPI_TABLE_HEADER *Table, UINT32 Length) @@ -6247,10 +6252,10 @@ Index: acpica-unix-20180313/source/components/tables/tbfadt.c "PmRegisters", 0); } } -Index: acpica-unix-20180313/source/components/tables/tbfind.c +Index: acpica-unix2-20180531/source/components/tables/tbfind.c =================================================================== ---- acpica-unix-20180313.orig/source/components/tables/tbfind.c -+++ acpica-unix-20180313/source/components/tables/tbfind.c +--- acpica-unix2-20180531.orig/source/components/tables/tbfind.c ++++ acpica-unix2-20180531/source/components/tables/tbfind.c @@ -108,8 +108,11 @@ AcpiTbFindTable ( (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES); for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) @@ -6264,10 +6269,10 @@ Index: acpica-unix-20180313/source/components/tables/tbfind.c { /* Not the requested table */ -Index: acpica-unix-20180313/source/components/tables/tbprint.c +Index: acpica-unix2-20180531/source/components/tables/tbprint.c =================================================================== ---- acpica-unix-20180313.orig/source/components/tables/tbprint.c -+++ acpica-unix-20180313/source/components/tables/tbprint.c +--- acpica-unix2-20180531.orig/source/components/tables/tbprint.c ++++ acpica-unix2-20180531/source/components/tables/tbprint.c @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader ( ACPI_TABLE_HEADER *Header) { @@ -6309,10 +6314,10 @@ Index: acpica-unix-20180313/source/components/tables/tbprint.c } } -Index: acpica-unix-20180313/source/components/tables/tbutils.c +Index: acpica-unix2-20180531/source/components/tables/tbutils.c =================================================================== ---- acpica-unix-20180313.orig/source/components/tables/tbutils.c -+++ acpica-unix-20180313/source/components/tables/tbutils.c +--- acpica-unix2-20180531.orig/source/components/tables/tbutils.c ++++ acpica-unix2-20180531/source/components/tables/tbutils.c @@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry ( * 64-bit platform, XSDT: Move (unaligned) 64-bit to local, * return 64-bit @@ -6372,10 +6377,10 @@ Index: acpica-unix-20180313/source/components/tables/tbutils.c { AcpiGbl_FadtIndex = TableIndex; AcpiTbParseFadt (); -Index: acpica-unix-20180313/source/components/tables/tbxface.c +Index: acpica-unix2-20180531/source/components/tables/tbxface.c =================================================================== ---- acpica-unix-20180313.orig/source/components/tables/tbxface.c -+++ acpica-unix-20180313/source/components/tables/tbxface.c +--- acpica-unix2-20180531.orig/source/components/tables/tbxface.c ++++ acpica-unix2-20180531/source/components/tables/tbxface.c @@ -293,8 +293,11 @@ AcpiGetTableHeader ( for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++) @@ -6389,10 +6394,10 @@ Index: acpica-unix-20180313/source/components/tables/tbxface.c { continue; } -Index: acpica-unix-20180313/source/components/tables/tbxfload.c +Index: acpica-unix2-20180531/source/components/tables/tbxfload.c =================================================================== ---- acpica-unix-20180313.orig/source/components/tables/tbxfload.c -+++ acpica-unix-20180313/source/components/tables/tbxfload.c +--- acpica-unix2-20180531.orig/source/components/tables/tbxfload.c ++++ acpica-unix2-20180531/source/components/tables/tbxfload.c @@ -159,6 +159,7 @@ AcpiTbLoadNamespace ( ACPI_TABLE_DESC *Table; UINT32 TablesLoaded = 0; @@ -6412,10 +6417,10 @@ Index: acpica-unix-20180313/source/components/tables/tbxfload.c ACPI_FAILURE (AcpiTbValidateTable (Table))) { Status = AE_NO_ACPI_TABLES; -Index: acpica-unix-20180313/source/tools/acpiexec/aetables.c +Index: acpica-unix2-20180531/source/tools/acpiexec/aetables.c =================================================================== ---- acpica-unix-20180313.orig/source/tools/acpiexec/aetables.c -+++ acpica-unix-20180313/source/tools/acpiexec/aetables.c +--- acpica-unix2-20180531.orig/source/tools/acpiexec/aetables.c ++++ acpica-unix2-20180531/source/tools/acpiexec/aetables.c @@ -146,21 +146,25 @@ AeInitializeTableHeader ( char *Signature, UINT32 Length) @@ -6567,10 +6572,10 @@ Index: acpica-unix-20180313/source/tools/acpiexec/aetables.c } return (AE_OK); -Index: acpica-unix-20180313/source/common/dmswitch.c +Index: acpica-unix2-20180531/source/common/dmswitch.c =================================================================== ---- acpica-unix-20180313.orig/source/common/dmswitch.c -+++ acpica-unix-20180313/source/common/dmswitch.c +--- acpica-unix2-20180531.orig/source/common/dmswitch.c ++++ acpica-unix2-20180531/source/common/dmswitch.c @@ -88,13 +88,15 @@ AcpiDmProcessSwitch ( ACPI_PARSE_OBJECT_LIST *Current; ACPI_PARSE_OBJECT_LIST *Previous; diff --git a/cve-2017-13694.patch b/cve-2017-13694.patch index 988afba..c753108 100644 --- a/cve-2017-13694.patch +++ b/cve-2017-13694.patch @@ -130,11 +130,11 @@ Github-Location: https://github.com/acpica/acpica/pull/278/commits/4a0243ecb4c94 source/components/parser/psobject.c | 44 ++++++++++++++----------------------- 1 file changed, 16 insertions(+), 28 deletions(-) -Index: acpica-unix2-20180209/source/components/parser/psobject.c +Index: acpica-unix2-20180531/source/components/parser/psobject.c =================================================================== ---- acpica-unix2-20180209.orig/source/components/parser/psobject.c -+++ acpica-unix2-20180209/source/components/parser/psobject.c -@@ -680,7 +680,8 @@ AcpiPsCompleteFinalOp ( +--- acpica-unix2-20180531.orig/source/components/parser/psobject.c ++++ acpica-unix2-20180531/source/components/parser/psobject.c +@@ -709,7 +709,8 @@ AcpiPsCompleteFinalOp ( ACPI_PARSE_OBJECT *Op, ACPI_STATUS Status) { @@ -144,7 +144,7 @@ Index: acpica-unix2-20180209/source/components/parser/psobject.c ACPI_FUNCTION_TRACE_PTR (PsCompleteFinalOp, WalkState); -@@ -697,7 +698,7 @@ AcpiPsCompleteFinalOp ( +@@ -726,7 +727,7 @@ AcpiPsCompleteFinalOp ( { if (Op) { @@ -153,7 +153,7 @@ Index: acpica-unix2-20180209/source/components/parser/psobject.c { WalkState->Op = Op; WalkState->OpInfo = AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode); -@@ -716,41 +717,28 @@ AcpiPsCompleteFinalOp ( +@@ -745,41 +746,28 @@ AcpiPsCompleteFinalOp ( if (Status == AE_CTRL_TERMINATE) { @@ -207,7 +207,7 @@ Index: acpica-unix2-20180209/source/components/parser/psobject.c } } -@@ -759,5 +747,5 @@ AcpiPsCompleteFinalOp ( +@@ -788,5 +776,5 @@ AcpiPsCompleteFinalOp ( } while (Op); diff --git a/int-format.patch b/int-format.patch index 29c6a32..fcdf86e 100644 --- a/int-format.patch +++ b/int-format.patch @@ -24,10 +24,10 @@ From: Al Stone source/tools/acpiexec/aemain.c | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) -Index: acpica-unix2-20180313/source/compiler/aslcompile.c +Index: acpica-unix2-20180531/source/compiler/aslcompile.c =================================================================== ---- acpica-unix2-20180313.orig/source/compiler/aslcompile.c -+++ acpica-unix2-20180313/source/compiler/aslcompile.c +--- acpica-unix2-20180531.orig/source/compiler/aslcompile.c ++++ acpica-unix2-20180531/source/compiler/aslcompile.c @@ -750,7 +750,7 @@ CmCleanupAndExit ( if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) @@ -37,10 +37,10 @@ Index: acpica-unix2-20180313/source/compiler/aslcompile.c ASL_MAX_ERROR_COUNT); } -Index: acpica-unix2-20180313/source/compiler/aslerror.c +Index: acpica-unix2-20180531/source/compiler/aslerror.c =================================================================== ---- acpica-unix2-20180313.orig/source/compiler/aslerror.c -+++ acpica-unix2-20180313/source/compiler/aslerror.c +--- acpica-unix2-20180531.orig/source/compiler/aslerror.c ++++ acpica-unix2-20180531/source/compiler/aslerror.c @@ -880,7 +880,7 @@ AslLogNewError ( Gbl_ExceptionCount[Level]++; if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) @@ -59,10 +59,10 @@ Index: acpica-unix2-20180313/source/compiler/aslerror.c ASL_MAX_DISABLED_MESSAGES); return (AE_LIMIT); } -Index: acpica-unix2-20180313/source/compiler/aslopt.c +Index: acpica-unix2-20180531/source/compiler/aslopt.c =================================================================== ---- acpica-unix2-20180313.orig/source/compiler/aslopt.c -+++ acpica-unix2-20180313/source/compiler/aslopt.c +--- acpica-unix2-20180531.orig/source/compiler/aslopt.c ++++ acpica-unix2-20180531/source/compiler/aslopt.c @@ -584,7 +584,7 @@ OptOptimizeNamePath ( } @@ -72,10 +72,10 @@ Index: acpica-unix2-20180313/source/compiler/aslopt.c Op->Asl.LogicalLineNumber, AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode), AcpiPsGetOpcodeName (Op->Common.AmlOpcode))); -Index: acpica-unix2-20180313/source/compiler/aslpredef.c +Index: acpica-unix2-20180531/source/compiler/aslpredef.c =================================================================== ---- acpica-unix2-20180313.orig/source/compiler/aslpredef.c -+++ acpica-unix2-20180313/source/compiler/aslpredef.c +--- acpica-unix2-20180531.orig/source/compiler/aslpredef.c ++++ acpica-unix2-20180531/source/compiler/aslpredef.c @@ -114,7 +114,7 @@ ApCheckForPredefinedMethod ( if (MethodInfo->NumArguments != 0) @@ -85,10 +85,10 @@ Index: acpica-unix2-20180313/source/compiler/aslpredef.c AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op, MsgBuffer); -Index: acpica-unix2-20180313/source/compiler/aslprepkg.c +Index: acpica-unix2-20180531/source/compiler/aslprepkg.c =================================================================== ---- acpica-unix2-20180313.orig/source/compiler/aslprepkg.c -+++ acpica-unix2-20180313/source/compiler/aslprepkg.c +--- acpica-unix2-20180531.orig/source/compiler/aslprepkg.c ++++ acpica-unix2-20180531/source/compiler/aslprepkg.c @@ -309,7 +309,7 @@ ApCheckPackage ( if (Count & 1) @@ -98,10 +98,10 @@ Index: acpica-unix2-20180313/source/compiler/aslprepkg.c Predefined->Info.Name, Count); AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH, -Index: acpica-unix2-20180313/source/components/debugger/dbexec.c +Index: acpica-unix2-20180531/source/components/debugger/dbexec.c =================================================================== ---- acpica-unix2-20180313.orig/source/components/debugger/dbexec.c -+++ acpica-unix2-20180313/source/components/debugger/dbexec.c +--- acpica-unix2-20180531.orig/source/components/debugger/dbexec.c ++++ acpica-unix2-20180531/source/components/debugger/dbexec.c @@ -230,7 +230,7 @@ AcpiDbExecuteMethod ( ACPI_ERROR ((AE_INFO, "Possible overflow of internal debugger " @@ -111,10 +111,10 @@ Index: acpica-unix2-20180313/source/components/debugger/dbexec.c } } -Index: acpica-unix2-20180313/source/components/dispatcher/dsmthdat.c +Index: acpica-unix2-20180531/source/components/dispatcher/dsmthdat.c =================================================================== ---- acpica-unix2-20180313.orig/source/components/dispatcher/dsmthdat.c -+++ acpica-unix2-20180313/source/components/dispatcher/dsmthdat.c +--- acpica-unix2-20180531.orig/source/components/dispatcher/dsmthdat.c ++++ acpica-unix2-20180531/source/components/dispatcher/dsmthdat.c @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode ( if (Index > ACPI_METHOD_MAX_LOCAL) { @@ -133,10 +133,10 @@ Index: acpica-unix2-20180313/source/components/dispatcher/dsmthdat.c Index, ACPI_METHOD_MAX_ARG)); return_ACPI_STATUS (AE_AML_INVALID_INDEX); } -Index: acpica-unix2-20180313/source/components/dispatcher/dsutils.c +Index: acpica-unix2-20180531/source/components/dispatcher/dsutils.c =================================================================== ---- acpica-unix2-20180313.orig/source/components/dispatcher/dsutils.c -+++ acpica-unix2-20180313/source/components/dispatcher/dsutils.c +--- acpica-unix2-20180531.orig/source/components/dispatcher/dsutils.c ++++ acpica-unix2-20180531/source/components/dispatcher/dsutils.c @@ -788,7 +788,7 @@ AcpiDsCreateOperands ( } @@ -146,10 +146,10 @@ Index: acpica-unix2-20180313/source/components/dispatcher/dsutils.c WalkState->NumOperands, ArgCount, Index)); /* Create the interpreter arguments, in reverse order */ -Index: acpica-unix2-20180313/source/components/dispatcher/dswscope.c +Index: acpica-unix2-20180531/source/components/dispatcher/dswscope.c =================================================================== ---- acpica-unix2-20180313.orig/source/components/dispatcher/dswscope.c -+++ acpica-unix2-20180313/source/components/dispatcher/dswscope.c +--- acpica-unix2-20180531.orig/source/components/dispatcher/dswscope.c ++++ acpica-unix2-20180531/source/components/dispatcher/dswscope.c @@ -149,7 +149,7 @@ AcpiDsScopeStackPush ( WalkState->ScopeDepth++; @@ -159,7 +159,7 @@ Index: acpica-unix2-20180313/source/components/dispatcher/dswscope.c OldScopeInfo = WalkState->ScopeInfo; if (OldScopeInfo) -@@ -212,7 +212,7 @@ AcpiDsScopeStackPop ( +@@ -211,7 +211,7 @@ AcpiDsScopeStackPop ( WalkState->ScopeDepth--; ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, @@ -168,10 +168,10 @@ Index: acpica-unix2-20180313/source/components/dispatcher/dswscope.c (UINT32) WalkState->ScopeDepth, AcpiUtGetNodeName (ScopeInfo->Scope.Node), AcpiUtGetTypeName (ScopeInfo->Common.Value))); -Index: acpica-unix2-20180313/source/components/events/evgpe.c +Index: acpica-unix2-20180531/source/components/events/evgpe.c =================================================================== ---- acpica-unix2-20180313.orig/source/components/events/evgpe.c -+++ acpica-unix2-20180313/source/components/events/evgpe.c +--- acpica-unix2-20180531.orig/source/components/events/evgpe.c ++++ acpica-unix2-20180531/source/components/events/evgpe.c @@ -481,7 +481,7 @@ AcpiEvGpeDetect ( "Ignore disabled registers for GPE %02X-%02X: " "RunEnable=%02X, WakeEnable=%02X\n", @@ -181,10 +181,10 @@ Index: acpica-unix2-20180313/source/components/events/evgpe.c GpeRegisterInfo->EnableForRun, GpeRegisterInfo->EnableForWake)); continue; -Index: acpica-unix2-20180313/source/components/executer/exdump.c +Index: acpica-unix2-20180531/source/components/executer/exdump.c =================================================================== ---- acpica-unix2-20180313.orig/source/components/executer/exdump.c -+++ acpica-unix2-20180313/source/components/executer/exdump.c +--- acpica-unix2-20180531.orig/source/components/executer/exdump.c ++++ acpica-unix2-20180531/source/components/executer/exdump.c @@ -678,7 +678,7 @@ AcpiExDumpOperand ( if (Depth > 0) { @@ -194,10 +194,10 @@ Index: acpica-unix2-20180313/source/components/executer/exdump.c } else { -Index: acpica-unix2-20180313/source/components/executer/exfldio.c +Index: acpica-unix2-20180531/source/components/executer/exfldio.c =================================================================== ---- acpica-unix2-20180313.orig/source/components/executer/exfldio.c -+++ acpica-unix2-20180313/source/components/executer/exfldio.c +--- acpica-unix2-20180531.orig/source/components/executer/exfldio.c ++++ acpica-unix2-20180531/source/components/executer/exfldio.c @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule ( ACPI_ERROR ((AE_INFO, @@ -209,10 +209,10 @@ Index: acpica-unix2-20180313/source/components/executer/exfldio.c return_ACPI_STATUS (AE_AML_OPERAND_VALUE); } } -Index: acpica-unix2-20180313/source/components/executer/exnames.c +Index: acpica-unix2-20180531/source/components/executer/exnames.c =================================================================== ---- acpica-unix2-20180313.orig/source/components/executer/exnames.c -+++ acpica-unix2-20180313/source/components/executer/exnames.c +--- acpica-unix2-20180531.orig/source/components/executer/exnames.c ++++ acpica-unix2-20180531/source/components/executer/exnames.c @@ -237,7 +237,7 @@ AcpiExNameSegment ( */ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, @@ -231,10 +231,10 @@ Index: acpica-unix2-20180313/source/components/executer/exnames.c } *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress); -Index: acpica-unix2-20180313/source/components/hardware/hwregs.c +Index: acpica-unix2-20180531/source/components/hardware/hwregs.c =================================================================== ---- acpica-unix2-20180313.orig/source/components/hardware/hwregs.c -+++ acpica-unix2-20180313/source/components/hardware/hwregs.c +--- acpica-unix2-20180531.orig/source/components/hardware/hwregs.c ++++ acpica-unix2-20180531/source/components/hardware/hwregs.c @@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus ( @@ -244,10 +244,10 @@ Index: acpica-unix2-20180313/source/components/hardware/hwregs.c ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address))); LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock); -Index: acpica-unix2-20180313/source/components/tables/tbfadt.c +Index: acpica-unix2-20180531/source/components/tables/tbfadt.c =================================================================== ---- acpica-unix2-20180313.orig/source/components/tables/tbfadt.c -+++ acpica-unix2-20180313/source/components/tables/tbfadt.c +--- acpica-unix2-20180531.orig/source/components/tables/tbfadt.c ++++ acpica-unix2-20180531/source/components/tables/tbfadt.c @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress ( if (!(Flags & ACPI_FADT_GPE_REGISTER)) { @@ -275,10 +275,10 @@ Index: acpica-unix2-20180313/source/components/tables/tbfadt.c Name, Address32, ACPI_FORMAT_UINT64 (Address64->Address), AcpiGbl_Use32BitFadtAddresses ? 32 : 64)); -Index: acpica-unix2-20180313/source/components/tables/tbxfroot.c +Index: acpica-unix2-20180531/source/components/tables/tbxfroot.c =================================================================== ---- acpica-unix2-20180313.orig/source/components/tables/tbxfroot.c -+++ acpica-unix2-20180313/source/components/tables/tbxfroot.c +--- acpica-unix2-20180531.orig/source/components/tables/tbxfroot.c ++++ acpica-unix2-20180531/source/components/tables/tbxfroot.c @@ -177,7 +177,7 @@ AcpiFindRootPointer ( { ACPI_ERROR ((AE_INFO, @@ -306,10 +306,10 @@ Index: acpica-unix2-20180313/source/components/tables/tbxfroot.c return_ACPI_STATUS (AE_NO_MEMORY); } -Index: acpica-unix2-20180313/source/components/utilities/utownerid.c +Index: acpica-unix2-20180531/source/components/utilities/utownerid.c =================================================================== ---- acpica-unix2-20180313.orig/source/components/utilities/utownerid.c -+++ acpica-unix2-20180313/source/components/utilities/utownerid.c +--- acpica-unix2-20180531.orig/source/components/utilities/utownerid.c ++++ acpica-unix2-20180531/source/components/utilities/utownerid.c @@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId ( else { @@ -319,11 +319,11 @@ Index: acpica-unix2-20180313/source/components/utilities/utownerid.c } (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES); -Index: acpica-unix2-20180313/source/tools/acpiexec/aemain.c +Index: acpica-unix2-20180531/source/tools/acpiexec/aemain.c =================================================================== ---- acpica-unix2-20180313.orig/source/tools/acpiexec/aemain.c -+++ acpica-unix2-20180313/source/tools/acpiexec/aemain.c -@@ -205,7 +205,7 @@ AeDoOptions ( +--- acpica-unix2-20180531.orig/source/tools/acpiexec/aemain.c ++++ acpica-unix2-20180531/source/tools/acpiexec/aemain.c +@@ -209,7 +209,7 @@ AeDoOptions ( if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1)) { diff --git a/sources b/sources index b3d6ba8..38dcadf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (acpica-unix2-20180508.tar.gz) = 5f54e3cbcaed256ca046eb02e3825c4d3384d134d87cefeb2de86d3a4529a6cf6202fca225a4fdd49fa993f936aa6373dfb0618baae213227a0c0738bb5191f5 -SHA512 (acpitests-unix-20180508.tar.gz) = 72c848b668dcbafdd281781c9dc405103e33ff3ad14c3f5a9726138d4b0b923686184dd1a75f1ac95003a6b3bff89acac66a93f43f88301a2d237b5152468166 +SHA512 (acpica-unix2-20180531.tar.gz) = e56ec1df83462597c36a3bc0352dc5c09e4e060384aa120da0132c006f6af74b8f5dc894a24314645da40cc06b3b656fa5182d6704a1427bbf0aded13e2740a8 +SHA512 (acpitests-unix-20180531.tar.gz) = b24d481752f7d48a8c9046604da9b6bd157f03187966fd50b833248467032b138b60169c1b29b724a784ce5a66f327dba104a35fc442a8d7366a89ff12444cb7