From 9b3daa9ea79f794323397115500964545463a5c3 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Nov 21 2017 01:33:29 +0000
Subject: Refresh patches, add newer patch from Debian packages


Signed-off-by: Al Stone <ahs3@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index 7d9e809..d447295 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,5 @@
 /acpitests-unix-20170831.tar.gz
 /acpica-unix2-20170929.tar.gz
 /acpitests-unix-20170929.tar.gz
+/acpica-unix2-20171110.tar.gz
+/acpitests-unix-20171110.tar.gz
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 7b68ea8..b51cf02 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,5 +1,5 @@
 Name:           acpica-tools
-Version:        20170929
+Version:        20171110
 Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
@@ -33,6 +33,7 @@ Patch6:		free.patch
 Patch7:		ppc64le.patch
 Patch8:		arm7hl.patch
 Patch9:		big-endian-v2.patch
+Patch10:	simple-64bit.patch
 
 BuildRequires:  bison patchutils flex
 
@@ -92,6 +93,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch7 -p1 -b .ppc64le
 %patch8 -p1 -b .arm7hl
 %patch9 -p1 -b .big-endian-v2
+%patch10 -p1 -b .simple-64bit
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
@@ -186,6 +188,11 @@ fi
 
 
 %changelog
+* Mon Nov 20 2017 Al Stone <ahs3@redhat.com> - 20171110-1
+- Update to 20171110 source tree, including patch refeshes
+- Add patch for mips64el build, should it ever be needed; it also cleans
+  up all 64-bit arches, so nice to have regardless
+
 * Fri Oct 6 2017 Al Stone <ahs3@redhat.com> - 20170929-1
 - Update to 20170929 source tree, including patch refeshes
 - Removed aslts-acpibin.patch to fix PATH problem in ASLTS; in upstream now
diff --git a/big-endian.patch b/big-endian.patch
index 9d42d62..f1894bd 100644
--- a/big-endian.patch
+++ b/big-endian.patch
@@ -23,10 +23,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/include/platform/aclinux.h |    8 ++
  12 files changed, 487 insertions(+), 283 deletions(-)
 
-Index: acpica-unix2-20170929/source/compiler/aslcodegen.c
+Index: acpica-unix-20171110/source/compiler/aslcodegen.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslcodegen.c
-+++ acpica-unix2-20170929/source/compiler/aslcodegen.c
+--- acpica-unix-20171110.orig/source/compiler/aslcodegen.c
++++ acpica-unix-20171110/source/compiler/aslcodegen.c
 @@ -240,16 +240,12 @@ CgWriteAmlOpcode (
      ACPI_PARSE_OBJECT       *Op)
  {
@@ -268,10 +268,10 @@ Index: acpica-unix2-20170929/source/compiler/aslcodegen.c
  
      case AML_RAW_DATA_BUFFER:
  
-Index: acpica-unix2-20170929/source/compiler/aslopcodes.c
+Index: acpica-unix-20171110/source/compiler/aslopcodes.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslopcodes.c
-+++ acpica-unix2-20170929/source/compiler/aslopcodes.c
+--- acpica-unix-20171110.orig/source/compiler/aslopcodes.c
++++ acpica-unix-20171110/source/compiler/aslopcodes.c
 @@ -485,6 +485,7 @@ OpcDoUnicode (
      UINT32                  i;
      UINT8                   *AsciiString;
@@ -290,10 +290,10 @@ Index: acpica-unix2-20170929/source/compiler/aslopcodes.c
      }
  
      /*
-Index: acpica-unix2-20170929/source/compiler/aslrestype1.c
+Index: acpica-unix-20171110/source/compiler/aslrestype1.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslrestype1.c
-+++ acpica-unix2-20170929/source/compiler/aslrestype1.c
+--- acpica-unix-20171110.orig/source/compiler/aslrestype1.c
++++ acpica-unix-20171110/source/compiler/aslrestype1.c
 @@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
      ACPI_PARSE_OBJECT       *LengthOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -490,10 +490,10 @@ Index: acpica-unix2-20170929/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
              break;
-Index: acpica-unix2-20170929/source/compiler/aslrestype1i.c
+Index: acpica-unix-20171110/source/compiler/aslrestype1i.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslrestype1i.c
-+++ acpica-unix2-20170929/source/compiler/aslrestype1i.c
+--- acpica-unix-20171110.orig/source/compiler/aslrestype1i.c
++++ acpica-unix-20171110/source/compiler/aslrestype1i.c
 @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -630,10 +630,10 @@ Index: acpica-unix2-20170929/source/compiler/aslrestype1i.c
 +    ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
      return (Rnode);
  }
-Index: acpica-unix2-20170929/source/compiler/aslrestype2.c
+Index: acpica-unix-20171110/source/compiler/aslrestype2.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslrestype2.c
-+++ acpica-unix2-20170929/source/compiler/aslrestype2.c
+--- acpica-unix-20171110.orig/source/compiler/aslrestype2.c
++++ acpica-unix-20171110/source/compiler/aslrestype2.c
 @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -774,10 +774,10 @@ Index: acpica-unix2-20170929/source/compiler/aslrestype2.c
  
      /* Point to end-of-descriptor for vendor data */
  
-Index: acpica-unix2-20170929/source/compiler/aslrestype2d.c
+Index: acpica-unix-20171110/source/compiler/aslrestype2d.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslrestype2d.c
-+++ acpica-unix2-20170929/source/compiler/aslrestype2d.c
+--- acpica-unix-20171110.orig/source/compiler/aslrestype2d.c
++++ acpica-unix-20171110/source/compiler/aslrestype2d.c
 @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1133,10 +1133,10 @@ Index: acpica-unix2-20170929/source/compiler/aslrestype2d.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix2-20170929/source/compiler/aslrestype2e.c
+Index: acpica-unix-20171110/source/compiler/aslrestype2e.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslrestype2e.c
-+++ acpica-unix2-20170929/source/compiler/aslrestype2e.c
+--- acpica-unix-20171110.orig/source/compiler/aslrestype2e.c
++++ acpica-unix-20171110/source/compiler/aslrestype2e.c
 @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1242,10 +1242,10 @@ Index: acpica-unix2-20170929/source/compiler/aslrestype2e.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
          StringLength;
      return (Rnode);
-Index: acpica-unix2-20170929/source/compiler/aslrestype2q.c
+Index: acpica-unix-20171110/source/compiler/aslrestype2q.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslrestype2q.c
-+++ acpica-unix2-20170929/source/compiler/aslrestype2q.c
+--- acpica-unix-20171110.orig/source/compiler/aslrestype2q.c
++++ acpica-unix-20171110/source/compiler/aslrestype2q.c
 @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT8                   *OptionalFields;
@@ -1584,10 +1584,10 @@ Index: acpica-unix2-20170929/source/compiler/aslrestype2q.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix2-20170929/source/compiler/aslrestype2s.c
+Index: acpica-unix-20171110/source/compiler/aslrestype2s.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslrestype2s.c
-+++ acpica-unix2-20170929/source/compiler/aslrestype2s.c
+--- acpica-unix-20171110.orig/source/compiler/aslrestype2s.c
++++ acpica-unix-20171110/source/compiler/aslrestype2s.c
 @@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
      UINT16                  VendorLength;
      UINT16                  InterruptLength;
@@ -2053,10 +2053,10 @@ Index: acpica-unix2-20170929/source/compiler/aslrestype2s.c
      MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
      return (Rnode);
  }
-Index: acpica-unix2-20170929/source/compiler/aslrestype2w.c
+Index: acpica-unix-20171110/source/compiler/aslrestype2w.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslrestype2w.c
-+++ acpica-unix2-20170929/source/compiler/aslrestype2w.c
+--- acpica-unix-20171110.orig/source/compiler/aslrestype2w.c
++++ acpica-unix-20171110/source/compiler/aslrestype2w.c
 @@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
      UINT8                   *OptionalFields;
      UINT16                  StringLength = 0;
@@ -2400,10 +2400,10 @@ Index: acpica-unix2-20170929/source/compiler/aslrestype2w.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix2-20170929/source/include/acmacros.h
+Index: acpica-unix-20171110/source/include/acmacros.h
 ===================================================================
---- acpica-unix2-20170929.orig/source/include/acmacros.h
-+++ acpica-unix2-20170929/source/include/acmacros.h
+--- acpica-unix-20171110.orig/source/include/acmacros.h
++++ acpica-unix-20171110/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-unix2-20170929/source/include/acmacros.h
  
  #define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
  
-Index: acpica-unix2-20170929/source/include/platform/aclinux.h
+Index: acpica-unix-20171110/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix2-20170929.orig/source/include/platform/aclinux.h
-+++ acpica-unix2-20170929/source/include/platform/aclinux.h
+--- acpica-unix-20171110.orig/source/include/platform/aclinux.h
++++ acpica-unix-20171110/source/include/platform/aclinux.h
 @@ -191,6 +191,7 @@
  
  #ifdef ACPI_USE_STANDARD_HEADERS
@@ -2505,10 +2505,10 @@ Index: acpica-unix2-20170929/source/include/platform/aclinux.h
  #endif /* __KERNEL__ */
  
  #endif /* __ACLINUX_H__ */
-Index: acpica-unix2-20170929/source/compiler/aslanalyze.c
+Index: acpica-unix-20171110/source/compiler/aslanalyze.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslanalyze.c
-+++ acpica-unix2-20170929/source/compiler/aslanalyze.c
+--- acpica-unix-20171110.orig/source/compiler/aslanalyze.c
++++ acpica-unix-20171110/source/compiler/aslanalyze.c
 @@ -461,7 +461,7 @@ ApCheckForGpeNameConflict (
  
      /* Need a null-terminated string version of NameSeg */
@@ -2527,10 +2527,10 @@ Index: acpica-unix2-20170929/source/compiler/aslanalyze.c
  
      /* Inject opposite letter ("L" versus "E") */
  
-Index: acpica-unix2-20170929/source/compiler/asllookup.c
+Index: acpica-unix-20171110/source/compiler/asllookup.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/asllookup.c
-+++ acpica-unix2-20170929/source/compiler/asllookup.c
+--- acpica-unix-20171110.orig/source/compiler/asllookup.c
++++ acpica-unix-20171110/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-unix2-20170929/source/compiler/asllookup.c
              AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
                  LkGetNameOp (Node->Op), MsgBuffer);
              return (AE_OK);
-Index: acpica-unix2-20170929/source/compiler/aslmain.c
+Index: acpica-unix-20171110/source/compiler/aslmain.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslmain.c
-+++ acpica-unix2-20170929/source/compiler/aslmain.c
+--- acpica-unix-20171110.orig/source/compiler/aslmain.c
++++ acpica-unix-20171110/source/compiler/aslmain.c
 @@ -102,18 +102,6 @@ main (
      signal (SIGINT, AslSignalHandler);
      signal (SIGSEGV, AslSignalHandler);
@@ -2584,10 +2584,10 @@ Index: acpica-unix2-20170929/source/compiler/aslmain.c
      AcpiOsInitialize ();
      ACPI_DEBUG_INITIALIZE (); /* For debug version only */
  
-Index: acpica-unix2-20170929/source/common/acfileio.c
+Index: acpica-unix-20171110/source/common/acfileio.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/common/acfileio.c
-+++ acpica-unix2-20170929/source/common/acfileio.c
+--- acpica-unix-20171110.orig/source/common/acfileio.c
++++ acpica-unix-20171110/source/common/acfileio.c
 @@ -280,6 +280,7 @@ AcGetOneTableFromFile (
      ACPI_TABLE_HEADER       *Table;
      INT32                   Count;
@@ -2649,11 +2649,11 @@ Index: acpica-unix2-20170929/source/common/acfileio.c
              (UINT32) (FileSize - TableOffset));
          return (AE_BAD_HEADER);
      }
-Index: acpica-unix2-20170929/source/common/dmtable.c
+Index: acpica-unix-20171110/source/common/dmtable.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/common/dmtable.c
-+++ acpica-unix2-20170929/source/common/dmtable.c
-@@ -549,7 +549,7 @@ AcpiDmDumpDataTable (
+--- acpica-unix-20171110.orig/source/common/dmtable.c
++++ acpica-unix-20171110/source/common/dmtable.c
+@@ -550,7 +550,7 @@ AcpiDmDumpDataTable (
       */
      if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS))
      {
@@ -2662,7 +2662,7 @@ Index: acpica-unix2-20170929/source/common/dmtable.c
          Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs);
          if (ACPI_FAILURE (Status))
          {
-@@ -563,13 +563,14 @@ AcpiDmDumpDataTable (
+@@ -564,13 +564,14 @@ AcpiDmDumpDataTable (
      else if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_S3PT))
      {
          Length = AcpiDmDumpS3pt (Table);
@@ -2678,7 +2678,7 @@ Index: acpica-unix2-20170929/source/common/dmtable.c
          Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader);
          if (ACPI_FAILURE (Status))
          {
-@@ -780,6 +781,7 @@ AcpiDmDumpTable (
+@@ -781,6 +782,7 @@ AcpiDmDumpTable (
      BOOLEAN                 LastOutputBlankLine = FALSE;
      ACPI_STATUS             Status;
      char                    RepairedName[8];
@@ -2686,7 +2686,7 @@ Index: acpica-unix2-20170929/source/common/dmtable.c
  
  
      if (!Info)
-@@ -1176,8 +1178,9 @@ AcpiDmDumpTable (
+@@ -1177,8 +1179,9 @@ AcpiDmDumpTable (
              /* Checksum, display and validate */
  
              AcpiOsPrintf ("%2.2X", *Target);
@@ -2698,7 +2698,7 @@ Index: acpica-unix2-20170929/source/common/dmtable.c
                  ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum);
  
              if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum)
-@@ -1242,14 +1245,14 @@ AcpiDmDumpTable (
+@@ -1243,14 +1246,14 @@ AcpiDmDumpTable (
  
              /* DMAR subtable types */
  
@@ -2716,7 +2716,7 @@ Index: acpica-unix2-20170929/source/common/dmtable.c
              break;
  
          case ACPI_DMT_DMAR_SCOPE:
-@@ -1340,14 +1343,14 @@ AcpiDmDumpTable (
+@@ -1341,14 +1344,14 @@ AcpiDmDumpTable (
  
              /* HEST subtable types */
  
@@ -2734,7 +2734,7 @@ Index: acpica-unix2-20170929/source/common/dmtable.c
              break;
  
          case ACPI_DMT_HESTNTFY:
-@@ -1427,13 +1430,14 @@ AcpiDmDumpTable (
+@@ -1428,13 +1431,14 @@ AcpiDmDumpTable (
  
              /* NFIT subtable types */
  
@@ -2751,10 +2751,10 @@ Index: acpica-unix2-20170929/source/common/dmtable.c
                  AcpiDmNfitSubnames[Temp16]);
              break;
  
-Index: acpica-unix2-20170929/source/common/dmtables.c
+Index: acpica-unix-20171110/source/common/dmtables.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/common/dmtables.c
-+++ acpica-unix2-20170929/source/common/dmtables.c
+--- acpica-unix-20171110.orig/source/common/dmtables.c
++++ acpica-unix-20171110/source/common/dmtables.c
 @@ -142,7 +142,9 @@ AdCreateTableHeader (
      ACPI_TABLE_HEADER       *Table)
  {
@@ -2820,10 +2820,10 @@ Index: acpica-unix2-20170929/source/common/dmtables.c
      AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
      ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
  
-Index: acpica-unix2-20170929/source/common/dmtbdump.c
+Index: acpica-unix-20171110/source/common/dmtbdump.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20170929/source/common/dmtbdump.c
+--- acpica-unix-20171110.orig/source/common/dmtbdump.c
++++ acpica-unix-20171110/source/common/dmtbdump.c
 @@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
      UINT32                  Entries;
      UINT32                  Offset;
@@ -4189,7 +4189,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
          {
          case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
  
-@@ -2959,7 +3043,7 @@ AcpiDmDumpNfit (
+@@ -2964,7 +3048,7 @@ AcpiDmDumpNfit (
  
              /* Attempt to continue */
  
@@ -4198,7 +4198,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
              {
                  AcpiOsPrintf ("Invalid zero length subtable\n");
                  return;
-@@ -2968,8 +3052,8 @@ AcpiDmDumpNfit (
+@@ -2973,8 +3057,8 @@ AcpiDmDumpNfit (
          }
  
          AcpiOsPrintf ("\n");
@@ -4209,7 +4209,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -2977,13 +3061,14 @@ AcpiDmDumpNfit (
+@@ -2982,13 +3066,14 @@ AcpiDmDumpNfit (
  
          /* Per-subtable variable-length fields */
  
@@ -4227,7 +4227,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
                      &Interleave->LineOffset[i],
                      sizeof (UINT32), AcpiDmTableInfoNfit2a);
                  if (ACPI_FAILURE (Status))
-@@ -2997,12 +3082,11 @@ AcpiDmDumpNfit (
+@@ -3002,12 +3087,11 @@ AcpiDmDumpNfit (
  
          case ACPI_NFIT_TYPE_SMBIOS:
  
@@ -4242,7 +4242,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
                      sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
                      SmbiosInfo,
                      Length, AcpiDmTableInfoNfit3a);
-@@ -3016,9 +3100,10 @@ AcpiDmDumpNfit (
+@@ -3021,9 +3105,10 @@ AcpiDmDumpNfit (
  
          case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
  
@@ -4255,7 +4255,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
                      &Hint->HintAddress[i],
                      sizeof (UINT64), AcpiDmTableInfoNfit6a);
                  if (ACPI_FAILURE (Status))
-@@ -3037,8 +3122,8 @@ AcpiDmDumpNfit (
+@@ -3042,8 +3127,8 @@ AcpiDmDumpNfit (
  NextSubtable:
          /* Point to next subtable */
  
@@ -4266,7 +4266,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
      }
  }
  
-@@ -3063,12 +3148,13 @@ AcpiDmDumpPcct (
+@@ -3068,12 +3153,13 @@ AcpiDmDumpPcct (
      ACPI_STATUS             Status;
      ACPI_PCCT_SUBSPACE      *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
@@ -4281,7 +4281,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct);
      if (ACPI_FAILURE (Status))
      {
-@@ -3078,7 +3164,7 @@ AcpiDmDumpPcct (
+@@ -3083,7 +3169,7 @@ AcpiDmDumpPcct (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
@@ -4290,7 +4290,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
      {
          /* Common subtable header */
  
-@@ -3218,16 +3304,21 @@ AcpiDmDumpPmtt (
+@@ -3223,16 +3309,21 @@ AcpiDmDumpPmtt (
      ACPI_PMTT_HEADER        *MemSubtable;
      ACPI_PMTT_HEADER        *DimmSubtable;
      ACPI_PMTT_DOMAIN        *DomainArray;
@@ -4314,7 +4314,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt);
      if (ACPI_FAILURE (Status))
      {
-@@ -3237,13 +3328,14 @@ AcpiDmDumpPmtt (
+@@ -3242,13 +3333,14 @@ AcpiDmDumpPmtt (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
@@ -4331,7 +4331,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -3262,7 +3354,7 @@ AcpiDmDumpPmtt (
+@@ -3267,7 +3359,7 @@ AcpiDmDumpPmtt (
          /* Dump the fixed-length portion of the subtable */
  
          Status = AcpiDmDumpTable (Length, Offset, Subtable,
@@ -4340,7 +4340,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -3274,15 +3366,16 @@ AcpiDmDumpPmtt (
+@@ -3279,15 +3371,16 @@ AcpiDmDumpPmtt (
          MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable,
              sizeof (ACPI_PMTT_SOCKET));
  
@@ -4360,7 +4360,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -3302,7 +3395,7 @@ AcpiDmDumpPmtt (
+@@ -3307,7 +3400,7 @@ AcpiDmDumpPmtt (
  
              Status = AcpiDmDumpTable (Length,
                  Offset + MemOffset, MemSubtable,
@@ -4369,7 +4369,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -3310,13 +3403,14 @@ AcpiDmDumpPmtt (
+@@ -3315,13 +3408,14 @@ AcpiDmDumpPmtt (
  
              /* Walk the variable count of proximity domains */
  
@@ -4387,7 +4387,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
                  DomainCount)
              {
                  Status = AcpiDmDumpTable (Length,
-@@ -3344,15 +3438,16 @@ AcpiDmDumpPmtt (
+@@ -3349,15 +3443,16 @@ AcpiDmDumpPmtt (
              DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubtable,
                  DomainOffset);
  
@@ -4407,7 +4407,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
                  if (ACPI_FAILURE (Status))
                  {
                      return;
-@@ -3372,7 +3467,7 @@ AcpiDmDumpPmtt (
+@@ -3377,7 +3472,7 @@ AcpiDmDumpPmtt (
  
                  Status = AcpiDmDumpTable (Length,
                      Offset + MemOffset + DimmOffset, DimmSubtable,
@@ -4416,7 +4416,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
                  if (ACPI_FAILURE (Status))
                  {
                      return;
-@@ -3380,23 +3475,22 @@ AcpiDmDumpPmtt (
+@@ -3385,23 +3480,22 @@ AcpiDmDumpPmtt (
  
                  /* Point to next DIMM subtable */
  
@@ -4446,7 +4446,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
      }
  }
  
-@@ -3552,6 +3646,8 @@ AcpiDmDumpS3pt (
+@@ -3557,6 +3651,8 @@ AcpiDmDumpS3pt (
      ACPI_FPDT_HEADER        *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
      ACPI_TABLE_S3PT         *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
@@ -4455,7 +4455,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
  
  
      /* Main table */
-@@ -3562,20 +3658,22 @@ AcpiDmDumpS3pt (
+@@ -3567,20 +3663,22 @@ AcpiDmDumpS3pt (
          return 0;
      }
  
@@ -4481,7 +4481,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
          {
          case ACPI_S3PT_TYPE_RESUME:
  
-@@ -3590,7 +3688,7 @@ AcpiDmDumpS3pt (
+@@ -3595,7 +3693,7 @@ AcpiDmDumpS3pt (
          default:
  
              AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
@@ -4490,7 +4490,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
  
              /* Attempt to continue */
  
-@@ -3603,7 +3701,7 @@ AcpiDmDumpS3pt (
+@@ -3608,7 +3706,7 @@ AcpiDmDumpS3pt (
          }
  
          AcpiOsPrintf ("\n");
@@ -4499,7 +4499,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
              Subtable->Length, InfoTable);
          if (ACPI_FAILURE (Status))
          {
-@@ -3805,9 +3903,11 @@ void
+@@ -3810,9 +3908,11 @@ void
  AcpiDmDumpSlic (
      ACPI_TABLE_HEADER       *Table)
  {
@@ -4513,7 +4513,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
  }
  
  
-@@ -3830,14 +3930,17 @@ AcpiDmDumpSlit (
+@@ -3835,14 +3935,17 @@ AcpiDmDumpSlit (
      ACPI_STATUS             Status;
      UINT32                  Offset;
      UINT8                   *Row;
@@ -4533,7 +4533,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -3845,7 +3948,8 @@ AcpiDmDumpSlit (
+@@ -3850,7 +3953,8 @@ AcpiDmDumpSlit (
  
      /* Display the Locality NxN Matrix */
  
@@ -4543,7 +4543,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
      Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]);
      Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry;
  
-@@ -3858,7 +3962,7 @@ AcpiDmDumpSlit (
+@@ -3863,7 +3967,7 @@ AcpiDmDumpSlit (
          {
              /* Check for beyond EOT */
  
@@ -4552,7 +4552,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
              {
                  AcpiOsPrintf (
                      "\n**** Not enough room in table for all localities\n");
-@@ -3910,11 +4014,13 @@ AcpiDmDumpSrat (
+@@ -3915,11 +4019,13 @@ AcpiDmDumpSrat (
      UINT32                  Offset = sizeof (ACPI_TABLE_SRAT);
      ACPI_SUBTABLE_HEADER    *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
@@ -4567,7 +4567,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -3923,12 +4029,12 @@ AcpiDmDumpSrat (
+@@ -3928,12 +4034,12 @@ AcpiDmDumpSrat (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
@@ -4582,7 +4582,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
              Subtable->Length, AcpiDmTableInfoSratHdr);
          if (ACPI_FAILURE (Status))
          {
-@@ -3977,7 +4083,7 @@ AcpiDmDumpSrat (
+@@ -3982,7 +4088,7 @@ AcpiDmDumpSrat (
          }
  
          AcpiOsPrintf ("\n");
@@ -4591,7 +4591,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
              Subtable->Length, InfoTable);
          if (ACPI_FAILURE (Status))
          {
-@@ -4014,13 +4120,14 @@ AcpiDmDumpStao (
+@@ -4019,13 +4125,14 @@ AcpiDmDumpStao (
  {
      ACPI_STATUS             Status;
      char                    *Namepath;
@@ -4607,7 +4607,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoStao);
      if (ACPI_FAILURE (Status))
      {
-@@ -4029,7 +4136,7 @@ AcpiDmDumpStao (
+@@ -4034,7 +4141,7 @@ AcpiDmDumpStao (
  
      /* The rest of the table consists of Namepath strings */
  
@@ -4616,7 +4616,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
      {
          Namepath = ACPI_ADD_PTR (char, Table, Offset);
          StringLength = strlen (Namepath) + 1;
-@@ -4071,11 +4178,14 @@ AcpiDmDumpTcpa (
+@@ -4076,11 +4183,14 @@ AcpiDmDumpTcpa (
      ACPI_TABLE_TCPA_HDR     *Subtable = ACPI_ADD_PTR (
                                  ACPI_TABLE_TCPA_HDR, Table, Offset);
      ACPI_STATUS             Status;
@@ -4632,7 +4632,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
          0, AcpiDmTableInfoTcpaHdr);
      if (ACPI_FAILURE (Status))
      {
-@@ -4086,18 +4196,19 @@ AcpiDmDumpTcpa (
+@@ -4091,18 +4201,19 @@ AcpiDmDumpTcpa (
       * Examine the PlatformClass field to determine the table type.
       * Either a client or server table. Only one.
       */
@@ -4657,7 +4657,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
          break;
  
      default:
-@@ -4192,11 +4303,13 @@ AcpiDmDumpVrtc (
+@@ -4197,11 +4308,13 @@ AcpiDmDumpVrtc (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_VRTC);
      ACPI_VRTC_ENTRY         *Subtable;
@@ -4672,7 +4672,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -4205,12 +4318,12 @@ AcpiDmDumpVrtc (
+@@ -4210,12 +4323,12 @@ AcpiDmDumpVrtc (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
@@ -4687,7 +4687,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
              sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0);
          if (ACPI_FAILURE (Status))
          {
-@@ -4245,11 +4358,13 @@ AcpiDmDumpWdat (
+@@ -4250,11 +4363,13 @@ AcpiDmDumpWdat (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_WDAT);
      ACPI_WDAT_ENTRY         *Subtable;
@@ -4702,7 +4702,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -4258,12 +4373,12 @@ AcpiDmDumpWdat (
+@@ -4263,12 +4378,12 @@ AcpiDmDumpWdat (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
@@ -4717,7 +4717,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
              sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0);
          if (ACPI_FAILURE (Status))
          {
-@@ -4298,12 +4413,13 @@ AcpiDmDumpWpbt (
+@@ -4303,12 +4418,13 @@ AcpiDmDumpWpbt (
  {
      ACPI_STATUS             Status;
      ACPI_TABLE_WPBT         *Subtable;
@@ -4732,7 +4732,7 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt);
      if (ACPI_FAILURE (Status))
      {
-@@ -4313,10 +4429,10 @@ AcpiDmDumpWpbt (
+@@ -4318,10 +4434,10 @@ AcpiDmDumpWpbt (
      /* Extract the arguments buffer length from the main table */
  
      Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
@@ -4745,10 +4745,10 @@ Index: acpica-unix2-20170929/source/common/dmtbdump.c
 +    (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
          AcpiDmTableInfoWpbt0);
  }
-Index: acpica-unix2-20170929/source/compiler/dtfield.c
+Index: acpica-unix-20171110/source/compiler/dtfield.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/dtfield.c
-+++ acpica-unix2-20170929/source/compiler/dtfield.c
+--- acpica-unix-20171110.orig/source/compiler/dtfield.c
++++ acpica-unix-20171110/source/compiler/dtfield.c
 @@ -359,7 +359,27 @@ DtCompileInteger (
          DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, MsgBuffer);
      }
@@ -4778,10 +4778,10 @@ Index: acpica-unix2-20170929/source/compiler/dtfield.c
      return;
  }
  
-Index: acpica-unix2-20170929/source/compiler/dtsubtable.c
+Index: acpica-unix-20171110/source/compiler/dtsubtable.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/dtsubtable.c
-+++ acpica-unix2-20170929/source/compiler/dtsubtable.c
+--- acpica-unix-20171110.orig/source/compiler/dtsubtable.c
++++ acpica-unix-20171110/source/compiler/dtsubtable.c
 @@ -378,6 +378,21 @@ DtSetSubtableLength (
          return;
      }
@@ -4806,10 +4806,10 @@ Index: acpica-unix2-20170929/source/compiler/dtsubtable.c
 +        	Subtable->SizeOfLengthField);
 +    }
  }
-Index: acpica-unix2-20170929/source/compiler/dttable1.c
+Index: acpica-unix-20171110/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20170929/source/compiler/dttable1.c
+--- acpica-unix-20171110.orig/source/compiler/dttable1.c
++++ acpica-unix-20171110/source/compiler/dttable1.c
 @@ -281,6 +281,8 @@ DtCompileCsrt (
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      UINT32                  DescriptorCount;
@@ -5181,10 +5181,10 @@ Index: acpica-unix2-20170929/source/compiler/dttable1.c
      return (AE_OK);
  }
  
-Index: acpica-unix2-20170929/source/compiler/dttable2.c
+Index: acpica-unix-20171110/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20170929/source/compiler/dttable2.c
+--- acpica-unix-20171110.orig/source/compiler/dttable2.c
++++ acpica-unix-20171110/source/compiler/dttable2.c
 @@ -345,7 +345,7 @@ DtCompileMpst (
      DtPushSubtable (Subtable);
  
@@ -5223,7 +5223,7 @@ Index: acpica-unix2-20170929/source/compiler/dttable2.c
          {
          case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
  
-@@ -605,7 +607,7 @@ DtCompileNfit (
+@@ -610,7 +612,7 @@ DtCompileNfit (
          DtInsertSubtable (ParentTable, Subtable);
          DtPopSubtable ();
  
@@ -5232,25 +5232,25 @@ Index: acpica-unix2-20170929/source/compiler/dttable2.c
          {
          case ACPI_NFIT_TYPE_INTERLEAVE:
  
-@@ -631,7 +633,7 @@ DtCompileNfit (
+@@ -636,7 +638,7 @@ DtCompileNfit (
                  Count++;
              }
  
 -            Interleave->LineCount = Count;
 +            ACPI_MOVE_32_TO_32(&Interleave->LineCount, &Count);
-             DtPopSubtable ();
              break;
  
-@@ -677,7 +679,7 @@ DtCompileNfit (
+         case ACPI_NFIT_TYPE_SMBIOS:
+@@ -681,7 +683,7 @@ DtCompileNfit (
                  Count++;
              }
  
 -            Hint->HintCount = (UINT16) Count;
 +            ACPI_MOVE_32_TO_16(&Hint->HintCount, &Count);
-             DtPopSubtable ();
              break;
  
-@@ -954,7 +956,7 @@ DtCompilePmtt (
+         default:
+@@ -957,7 +959,7 @@ DtCompilePmtt (
  
              PmttController = ACPI_CAST_PTR (ACPI_PMTT_CONTROLLER,
                  (Subtable->Buffer - sizeof (ACPI_PMTT_HEADER)));
@@ -5259,7 +5259,7 @@ Index: acpica-unix2-20170929/source/compiler/dttable2.c
  
              while (DomainCount)
              {
-@@ -1174,6 +1176,7 @@ DtCompileS3pt (
+@@ -1177,6 +1179,7 @@ DtCompileS3pt (
      DT_SUBTABLE             *ParentTable;
      ACPI_DMTABLE_INFO       *InfoTable;
      DT_FIELD                *SubtableStart;
@@ -5267,7 +5267,7 @@ Index: acpica-unix2-20170929/source/compiler/dttable2.c
  
  
      Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt,
-@@ -1201,7 +1204,8 @@ DtCompileS3pt (
+@@ -1204,7 +1207,8 @@ DtCompileS3pt (
  
          S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
  
@@ -5277,7 +5277,7 @@ Index: acpica-unix2-20170929/source/compiler/dttable2.c
          {
          case ACPI_S3PT_TYPE_RESUME:
  
-@@ -1511,6 +1515,7 @@ DtCompileSlit (
+@@ -1514,6 +1518,7 @@ DtCompileSlit (
      DT_FIELD                *FieldList;
      UINT32                  Localities;
      UINT8                   *LocalityBuffer;
@@ -5285,7 +5285,7 @@ Index: acpica-unix2-20170929/source/compiler/dttable2.c
  
  
      Status = DtCompileTable (PFieldList, AcpiDmTableInfoSlit,
-@@ -1523,7 +1528,8 @@ DtCompileSlit (
+@@ -1526,7 +1531,8 @@ DtCompileSlit (
      ParentTable = DtPeekSubtable ();
      DtInsertSubtable (ParentTable, Subtable);
  
@@ -5295,7 +5295,7 @@ Index: acpica-unix2-20170929/source/compiler/dttable2.c
      LocalityBuffer = UtLocalCalloc (Localities);
  
      /* Compile each locality buffer */
-@@ -1717,6 +1723,7 @@ DtCompileTcpa (
+@@ -1720,6 +1726,7 @@ DtCompileTcpa (
      ACPI_TABLE_TCPA_HDR     *TcpaHeader;
      DT_SUBTABLE             *ParentTable;
      ACPI_STATUS             Status;
@@ -5303,7 +5303,7 @@ Index: acpica-unix2-20170929/source/compiler/dttable2.c
  
  
      /* Compile the main table */
-@@ -1737,7 +1744,8 @@ DtCompileTcpa (
+@@ -1740,7 +1747,8 @@ DtCompileTcpa (
       */
      TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer);
  
@@ -5313,7 +5313,7 @@ Index: acpica-unix2-20170929/source/compiler/dttable2.c
      {
      case ACPI_TCPA_CLIENT_TABLE:
  
-@@ -2036,6 +2044,9 @@ DtCompileWpbt (
+@@ -2039,6 +2047,9 @@ DtCompileWpbt (
      ACPI_TABLE_WPBT         *Table;
      ACPI_STATUS             Status;
      UINT16                  Length;
@@ -5323,7 +5323,7 @@ Index: acpica-unix2-20170929/source/compiler/dttable2.c
  
  
      /* Compile the main table */
-@@ -2063,7 +2074,16 @@ DtCompileWpbt (
+@@ -2066,7 +2077,16 @@ DtCompileWpbt (
  
      Length = (UINT16) Subtable->TotalLength;
      Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
@@ -5341,10 +5341,10 @@ Index: acpica-unix2-20170929/source/compiler/dttable2.c
  
      ParentTable = DtPeekSubtable ();
      DtInsertSubtable (ParentTable, Subtable);
-Index: acpica-unix2-20170929/source/components/disassembler/dmbuffer.c
+Index: acpica-unix-20171110/source/components/disassembler/dmbuffer.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/disassembler/dmbuffer.c
-+++ acpica-unix2-20170929/source/components/disassembler/dmbuffer.c
+--- acpica-unix-20171110.orig/source/components/disassembler/dmbuffer.c
++++ acpica-unix-20171110/source/components/disassembler/dmbuffer.c
 @@ -204,7 +204,7 @@ AcpiDmByteList (
  
  
@@ -5420,10 +5420,10 @@ Index: acpica-unix2-20170929/source/components/disassembler/dmbuffer.c
  
      NextOp = AcpiPsGetDepthNext (NULL, Op);
      if (!NextOp)
-Index: acpica-unix2-20170929/source/components/disassembler/dmopcode.c
+Index: acpica-unix-20171110/source/components/disassembler/dmopcode.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/disassembler/dmopcode.c
-+++ acpica-unix2-20170929/source/components/disassembler/dmopcode.c
+--- acpica-unix-20171110.orig/source/components/disassembler/dmopcode.c
++++ acpica-unix-20171110/source/components/disassembler/dmopcode.c
 @@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
      char                        *NameString;
      int                         LastCharIsDigit;
@@ -5494,10 +5494,10 @@ Index: acpica-unix2-20170929/source/components/disassembler/dmopcode.c
  
              Info->Level += 1;
              Info->MappingOp = Op;
-Index: acpica-unix2-20170929/source/components/disassembler/dmresrcl.c
+Index: acpica-unix-20171110/source/components/disassembler/dmresrcl.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/disassembler/dmresrcl.c
-+++ acpica-unix2-20170929/source/components/disassembler/dmresrcl.c
+--- acpica-unix-20171110.orig/source/components/disassembler/dmresrcl.c
++++ acpica-unix-20171110/source/components/disassembler/dmresrcl.c
 @@ -141,7 +141,8 @@ AcpiDmMemoryFields (
      UINT32                  Level)
  {
@@ -5646,10 +5646,10 @@ Index: acpica-unix2-20170929/source/components/disassembler/dmresrcl.c
      }
  
      AcpiDmIndent (Level);
-Index: acpica-unix2-20170929/source/components/disassembler/dmresrcl2.c
+Index: acpica-unix-20171110/source/components/disassembler/dmresrcl2.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/disassembler/dmresrcl2.c
-+++ acpica-unix2-20170929/source/components/disassembler/dmresrcl2.c
+--- acpica-unix-20171110.orig/source/components/disassembler/dmresrcl2.c
++++ acpica-unix-20171110/source/components/disassembler/dmresrcl2.c
 @@ -191,22 +191,24 @@ AcpiDmGpioCommon (
      char                    *DeviceName = NULL;
      UINT32                  PinCount;
@@ -5873,10 +5873,10 @@ Index: acpica-unix2-20170929/source/components/disassembler/dmresrcl2.c
  
      DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
      AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-Index: acpica-unix2-20170929/source/components/disassembler/dmresrcs.c
+Index: acpica-unix-20171110/source/components/disassembler/dmresrcs.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/disassembler/dmresrcs.c
-+++ acpica-unix2-20170929/source/components/disassembler/dmresrcs.c
+--- acpica-unix-20171110.orig/source/components/disassembler/dmresrcs.c
++++ acpica-unix-20171110/source/components/disassembler/dmresrcs.c
 @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
      UINT32                  Length,
      UINT32                  Level)
@@ -5933,11 +5933,11 @@ Index: acpica-unix2-20170929/source/components/disassembler/dmresrcs.c
  
      AcpiDmIndent (Level + 1);
      AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
-Index: acpica-unix2-20170929/source/components/dispatcher/dsfield.c
+Index: acpica-unix-20171110/source/components/dispatcher/dsfield.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/dispatcher/dsfield.c
-+++ acpica-unix2-20170929/source/components/dispatcher/dsfield.c
-@@ -320,6 +320,7 @@ AcpiDsGetFieldNames (
+--- acpica-unix-20171110.orig/source/components/dispatcher/dsfield.c
++++ acpica-unix-20171110/source/components/dispatcher/dsfield.c
+@@ -321,6 +321,7 @@ AcpiDsGetFieldNames (
      ACPI_STATUS             Status;
      UINT64                  Position;
      ACPI_PARSE_OBJECT       *Child;
@@ -5945,7 +5945,7 @@ Index: acpica-unix2-20170929/source/components/dispatcher/dsfield.c
  
  
      ACPI_FUNCTION_TRACE_PTR (DsGetFieldNames, Info);
-@@ -426,10 +427,17 @@ AcpiDsGetFieldNames (
+@@ -428,10 +429,17 @@ AcpiDsGetFieldNames (
  
              /* Lookup the name, it should already exist */
  
@@ -5962,8 +5962,8 @@ Index: acpica-unix2-20170929/source/components/dispatcher/dsfield.c
 +	*/
              if (ACPI_FAILURE (Status))
              {
-                 ACPI_ERROR_NAMESPACE ((char *) &Arg->Named.Name, Status);
-@@ -656,9 +664,17 @@ AcpiDsInitFieldObjects (
+                 ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
+@@ -660,9 +668,17 @@ AcpiDsInitFieldObjects (
           */
          if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
          {
@@ -5980,11 +5980,11 @@ Index: acpica-unix2-20170929/source/components/dispatcher/dsfield.c
 +	*/
              if (ACPI_FAILURE (Status))
              {
-                 ACPI_ERROR_NAMESPACE ((char *) &Arg->Named.Name, Status);
-Index: acpica-unix2-20170929/source/components/events/evgpeblk.c
+                 ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
+Index: acpica-unix-20171110/source/components/events/evgpeblk.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/events/evgpeblk.c
-+++ acpica-unix2-20170929/source/components/events/evgpeblk.c
+--- acpica-unix-20171110.orig/source/components/events/evgpeblk.c
++++ acpica-unix-20171110/source/components/events/evgpeblk.c
 @@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock (
      ACPI_STATUS             Status;
      ACPI_GPE_BLOCK_INFO     *GpeBlock;
@@ -6017,10 +6017,10 @@ Index: acpica-unix2-20170929/source/components/events/evgpeblk.c
          InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
  
      /* Update global count of currently available GPEs */
-Index: acpica-unix2-20170929/source/components/hardware/hwregs.c
+Index: acpica-unix-20171110/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/hardware/hwregs.c
-+++ acpica-unix2-20170929/source/components/hardware/hwregs.c
+--- acpica-unix-20171110.orig/source/components/hardware/hwregs.c
++++ acpica-unix-20171110/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.
@@ -6030,10 +6030,10 @@ Index: acpica-unix2-20170929/source/components/hardware/hwregs.c
      if (!(*Address))
      {
          return (AE_BAD_ADDRESS);
-Index: acpica-unix2-20170929/source/components/hardware/hwvalid.c
+Index: acpica-unix-20171110/source/components/hardware/hwvalid.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/hardware/hwvalid.c
-+++ acpica-unix2-20170929/source/components/hardware/hwvalid.c
+--- acpica-unix-20171110.orig/source/components/hardware/hwvalid.c
++++ acpica-unix-20171110/source/components/hardware/hwvalid.c
 @@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
      UINT32                  ByteWidth;
      ACPI_IO_ADDRESS         LastAddress;
@@ -6055,10 +6055,10 @@ Index: acpica-unix2-20170929/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-unix2-20170929/source/components/namespace/nsaccess.c
+Index: acpica-unix-20171110/source/components/namespace/nsaccess.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/namespace/nsaccess.c
-+++ acpica-unix2-20170929/source/components/namespace/nsaccess.c
+--- acpica-unix-20171110.orig/source/components/namespace/nsaccess.c
++++ acpica-unix-20171110/source/components/namespace/nsaccess.c
 @@ -313,6 +313,7 @@ AcpiNsLookup (
      ACPI_OBJECT_TYPE        ThisSearchType;
      UINT32                  SearchParentFlag = ACPI_NS_SEARCH_PARENT;
@@ -6079,10 +6079,10 @@ Index: acpica-unix2-20170929/source/components/namespace/nsaccess.c
                      AcpiUtGetTypeName (ThisNode->Type),
                      AcpiUtGetTypeName (TypeToCheckFor)));
              }
-Index: acpica-unix2-20170929/source/components/namespace/nsparse.c
+Index: acpica-unix-20171110/source/components/namespace/nsparse.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/namespace/nsparse.c
-+++ acpica-unix2-20170929/source/components/namespace/nsparse.c
+--- acpica-unix-20171110.orig/source/components/namespace/nsparse.c
++++ acpica-unix-20171110/source/components/namespace/nsparse.c
 @@ -196,13 +196,14 @@ AcpiNsOneCompleteParse (
  
      /* Table must consist of at least a complete header */
@@ -6100,10 +6100,10 @@ Index: acpica-unix2-20170929/source/components/namespace/nsparse.c
  
      Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
      if (ACPI_FAILURE (Status))
-Index: acpica-unix2-20170929/source/components/tables/tbdata.c
+Index: acpica-unix-20171110/source/components/tables/tbdata.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/tables/tbdata.c
-+++ acpica-unix2-20170929/source/components/tables/tbdata.c
+--- acpica-unix-20171110.orig/source/components/tables/tbdata.c
++++ acpica-unix-20171110/source/components/tables/tbdata.c
 @@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
      UINT32                  *TableIndex)
  {
@@ -6122,10 +6122,10 @@ Index: acpica-unix2-20170929/source/components/tables/tbdata.c
          if (ACPI_FAILURE (Status))
          {
              ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
-Index: acpica-unix2-20170929/source/components/tables/tbfadt.c
+Index: acpica-unix-20171110/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/tables/tbfadt.c
-+++ acpica-unix2-20170929/source/components/tables/tbfadt.c
+--- acpica-unix-20171110.orig/source/components/tables/tbfadt.c
++++ acpica-unix-20171110/source/components/tables/tbfadt.c
 @@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
      ACPI_TABLE_HEADER       *Table,
      UINT32                  Length)
@@ -6237,10 +6237,10 @@ Index: acpica-unix2-20170929/source/components/tables/tbfadt.c
                  "PmRegisters", 0);
          }
      }
-Index: acpica-unix2-20170929/source/components/tables/tbfind.c
+Index: acpica-unix-20171110/source/components/tables/tbfind.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/tables/tbfind.c
-+++ acpica-unix2-20170929/source/components/tables/tbfind.c
+--- acpica-unix-20171110.orig/source/components/tables/tbfind.c
++++ acpica-unix-20171110/source/components/tables/tbfind.c
 @@ -108,8 +108,11 @@ AcpiTbFindTable (
      (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
      for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
@@ -6254,10 +6254,10 @@ Index: acpica-unix2-20170929/source/components/tables/tbfind.c
          {
              /* Not the requested table */
  
-Index: acpica-unix2-20170929/source/components/tables/tbprint.c
+Index: acpica-unix-20171110/source/components/tables/tbprint.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/tables/tbprint.c
-+++ acpica-unix2-20170929/source/components/tables/tbprint.c
+--- acpica-unix-20171110.orig/source/components/tables/tbprint.c
++++ acpica-unix-20171110/source/components/tables/tbprint.c
 @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
      ACPI_TABLE_HEADER       *Header)
  {
@@ -6299,10 +6299,10 @@ Index: acpica-unix2-20170929/source/components/tables/tbprint.c
      }
  }
  
-Index: acpica-unix2-20170929/source/components/tables/tbutils.c
+Index: acpica-unix-20171110/source/components/tables/tbutils.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/tables/tbutils.c
-+++ acpica-unix2-20170929/source/components/tables/tbutils.c
+--- acpica-unix-20171110.orig/source/components/tables/tbutils.c
++++ acpica-unix-20171110/source/components/tables/tbutils.c
 @@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
           * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
           *  return 64-bit
@@ -6362,10 +6362,10 @@ Index: acpica-unix2-20170929/source/components/tables/tbutils.c
          {
              AcpiGbl_FadtIndex = TableIndex;
              AcpiTbParseFadt ();
-Index: acpica-unix2-20170929/source/components/tables/tbxface.c
+Index: acpica-unix-20171110/source/components/tables/tbxface.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/tables/tbxface.c
-+++ acpica-unix2-20170929/source/components/tables/tbxface.c
+--- acpica-unix-20171110.orig/source/components/tables/tbxface.c
++++ acpica-unix-20171110/source/components/tables/tbxface.c
 @@ -293,8 +293,11 @@ AcpiGetTableHeader (
  
      for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
@@ -6379,10 +6379,10 @@ Index: acpica-unix2-20170929/source/components/tables/tbxface.c
          {
              continue;
          }
-Index: acpica-unix2-20170929/source/components/tables/tbxfload.c
+Index: acpica-unix-20171110/source/components/tables/tbxfload.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/tables/tbxfload.c
-+++ acpica-unix2-20170929/source/components/tables/tbxfload.c
+--- acpica-unix-20171110.orig/source/components/tables/tbxfload.c
++++ acpica-unix-20171110/source/components/tables/tbxfload.c
 @@ -156,6 +156,7 @@ AcpiTbLoadNamespace (
      ACPI_TABLE_DESC         *Table;
      UINT32                  TablesLoaded = 0;
@@ -6402,10 +6402,10 @@ Index: acpica-unix2-20170929/source/components/tables/tbxfload.c
           ACPI_FAILURE (AcpiTbValidateTable (Table)))
      {
          Status = AE_NO_ACPI_TABLES;
-Index: acpica-unix2-20170929/source/tools/acpiexec/aetables.c
+Index: acpica-unix-20171110/source/tools/acpiexec/aetables.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/tools/acpiexec/aetables.c
-+++ acpica-unix2-20170929/source/tools/acpiexec/aetables.c
+--- acpica-unix-20171110.orig/source/tools/acpiexec/aetables.c
++++ acpica-unix-20171110/source/tools/acpiexec/aetables.c
 @@ -146,21 +146,25 @@ AeInitializeTableHeader (
      char                    *Signature,
      UINT32                  Length)
@@ -6557,10 +6557,10 @@ Index: acpica-unix2-20170929/source/tools/acpiexec/aetables.c
      }
  
      return (AE_OK);
-Index: acpica-unix2-20170929/source/common/dmswitch.c
+Index: acpica-unix-20171110/source/common/dmswitch.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/common/dmswitch.c
-+++ acpica-unix2-20170929/source/common/dmswitch.c
+--- acpica-unix-20171110.orig/source/common/dmswitch.c
++++ acpica-unix-20171110/source/common/dmswitch.c
 @@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
      ACPI_PARSE_OBJECT_LIST  *Current;
      ACPI_PARSE_OBJECT_LIST  *Previous;
diff --git a/int-format.patch b/int-format.patch
index 2650dd5..17f5ab2 100644
--- a/int-format.patch
+++ b/int-format.patch
@@ -24,10 +24,10 @@ From: Al Stone <ahs3@redhat.com>
  source/tools/acpiexec/aemain.c          |    2 +-
  18 files changed, 28 insertions(+), 28 deletions(-)
 
-Index: acpica-unix2-20170929/source/compiler/aslcompile.c
+Index: acpica-unix-20171110/source/compiler/aslcompile.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslcompile.c
-+++ acpica-unix2-20170929/source/compiler/aslcompile.c
+--- acpica-unix-20171110.orig/source/compiler/aslcompile.c
++++ acpica-unix-20171110/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-20170929/source/compiler/aslcompile.c
              ASL_MAX_ERROR_COUNT);
      }
  
-Index: acpica-unix2-20170929/source/compiler/aslerror.c
+Index: acpica-unix-20171110/source/compiler/aslerror.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslerror.c
-+++ acpica-unix2-20170929/source/compiler/aslerror.c
+--- acpica-unix-20171110.orig/source/compiler/aslerror.c
++++ acpica-unix-20171110/source/compiler/aslerror.c
 @@ -873,7 +873,7 @@ AslLogNewError (
      Gbl_ExceptionCount[Level]++;
      if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
@@ -59,10 +59,10 @@ Index: acpica-unix2-20170929/source/compiler/aslerror.c
              ASL_MAX_DISABLED_MESSAGES);
          return (AE_LIMIT);
      }
-Index: acpica-unix2-20170929/source/compiler/aslopt.c
+Index: acpica-unix-20171110/source/compiler/aslopt.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslopt.c
-+++ acpica-unix2-20170929/source/compiler/aslopt.c
+--- acpica-unix-20171110.orig/source/compiler/aslopt.c
++++ acpica-unix-20171110/source/compiler/aslopt.c
 @@ -584,7 +584,7 @@ OptOptimizeNamePath (
      }
  
@@ -72,10 +72,10 @@ Index: acpica-unix2-20170929/source/compiler/aslopt.c
          Op->Asl.LogicalLineNumber,
          AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
          AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
-Index: acpica-unix2-20170929/source/compiler/aslpredef.c
+Index: acpica-unix-20171110/source/compiler/aslpredef.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslpredef.c
-+++ acpica-unix2-20170929/source/compiler/aslpredef.c
+--- acpica-unix-20171110.orig/source/compiler/aslpredef.c
++++ acpica-unix-20171110/source/compiler/aslpredef.c
 @@ -114,7 +114,7 @@ ApCheckForPredefinedMethod (
  
          if (MethodInfo->NumArguments != 0)
@@ -85,10 +85,10 @@ Index: acpica-unix2-20170929/source/compiler/aslpredef.c
  
              AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op,
                  MsgBuffer);
-Index: acpica-unix2-20170929/source/compiler/aslprepkg.c
+Index: acpica-unix-20171110/source/compiler/aslprepkg.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/compiler/aslprepkg.c
-+++ acpica-unix2-20170929/source/compiler/aslprepkg.c
+--- acpica-unix-20171110.orig/source/compiler/aslprepkg.c
++++ acpica-unix-20171110/source/compiler/aslprepkg.c
 @@ -309,7 +309,7 @@ ApCheckPackage (
  
          if (Count & 1)
@@ -98,11 +98,11 @@ Index: acpica-unix2-20170929/source/compiler/aslprepkg.c
                  Predefined->Info.Name, Count);
  
              AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
-Index: acpica-unix2-20170929/source/components/debugger/dbexec.c
+Index: acpica-unix-20171110/source/components/debugger/dbexec.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/debugger/dbexec.c
-+++ acpica-unix2-20170929/source/components/debugger/dbexec.c
-@@ -226,7 +226,7 @@ AcpiDbExecuteMethod (
+--- acpica-unix-20171110.orig/source/components/debugger/dbexec.c
++++ acpica-unix-20171110/source/components/debugger/dbexec.c
+@@ -230,7 +230,7 @@ AcpiDbExecuteMethod (
              ACPI_ERROR ((AE_INFO,
                  "Possible overflow of internal debugger "
                  "buffer (size 0x%X needed 0x%X)",
@@ -111,10 +111,10 @@ Index: acpica-unix2-20170929/source/components/debugger/dbexec.c
          }
      }
  
-Index: acpica-unix2-20170929/source/components/dispatcher/dsmthdat.c
+Index: acpica-unix-20171110/source/components/dispatcher/dsmthdat.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/dispatcher/dsmthdat.c
-+++ acpica-unix2-20170929/source/components/dispatcher/dsmthdat.c
+--- acpica-unix-20171110.orig/source/components/dispatcher/dsmthdat.c
++++ acpica-unix-20171110/source/components/dispatcher/dsmthdat.c
 @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
          if (Index > ACPI_METHOD_MAX_LOCAL)
          {
@@ -133,11 +133,11 @@ Index: acpica-unix2-20170929/source/components/dispatcher/dsmthdat.c
                  Index, ACPI_METHOD_MAX_ARG));
              return_ACPI_STATUS (AE_AML_INVALID_INDEX);
          }
-Index: acpica-unix2-20170929/source/components/dispatcher/dsutils.c
+Index: acpica-unix-20171110/source/components/dispatcher/dsutils.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix2-20170929/source/components/dispatcher/dsutils.c
-@@ -787,7 +787,7 @@ AcpiDsCreateOperands (
+--- acpica-unix-20171110.orig/source/components/dispatcher/dsutils.c
++++ acpica-unix-20171110/source/components/dispatcher/dsutils.c
+@@ -788,7 +788,7 @@ AcpiDsCreateOperands (
      }
  
      ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
@@ -146,10 +146,10 @@ Index: acpica-unix2-20170929/source/components/dispatcher/dsutils.c
          WalkState->NumOperands, ArgCount, Index));
  
      /* Create the interpreter arguments, in reverse order */
-Index: acpica-unix2-20170929/source/components/dispatcher/dswscope.c
+Index: acpica-unix-20171110/source/components/dispatcher/dswscope.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/dispatcher/dswscope.c
-+++ acpica-unix2-20170929/source/components/dispatcher/dswscope.c
+--- acpica-unix-20171110.orig/source/components/dispatcher/dswscope.c
++++ acpica-unix-20171110/source/components/dispatcher/dswscope.c
 @@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
      WalkState->ScopeDepth++;
  
@@ -168,10 +168,10 @@ Index: acpica-unix2-20170929/source/components/dispatcher/dswscope.c
          (UINT32) WalkState->ScopeDepth,
          AcpiUtGetNodeName (ScopeInfo->Scope.Node),
          AcpiUtGetTypeName (ScopeInfo->Common.Value)));
-Index: acpica-unix2-20170929/source/components/events/evgpe.c
+Index: acpica-unix-20171110/source/components/events/evgpe.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/events/evgpe.c
-+++ acpica-unix2-20170929/source/components/events/evgpe.c
+--- acpica-unix-20171110.orig/source/components/events/evgpe.c
++++ acpica-unix-20171110/source/components/events/evgpe.c
 @@ -494,7 +494,7 @@ AcpiEvGpeDetect (
                      "Ignore disabled registers for GPE %02X-%02X: "
                      "RunEnable=%02X, WakeEnable=%02X\n",
@@ -190,10 +190,10 @@ Index: acpica-unix2-20170929/source/components/events/evgpe.c
                  (UINT32) StatusReg, (UINT32) EnableReg,
                  GpeRegisterInfo->EnableForRun,
                  GpeRegisterInfo->EnableForWake));
-Index: acpica-unix2-20170929/source/components/executer/exdump.c
+Index: acpica-unix-20171110/source/components/executer/exdump.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/executer/exdump.c
-+++ acpica-unix2-20170929/source/components/executer/exdump.c
+--- acpica-unix-20171110.orig/source/components/executer/exdump.c
++++ acpica-unix-20171110/source/components/executer/exdump.c
 @@ -678,7 +678,7 @@ AcpiExDumpOperand (
      if (Depth > 0)
      {
@@ -203,10 +203,10 @@ Index: acpica-unix2-20170929/source/components/executer/exdump.c
      }
      else
      {
-Index: acpica-unix2-20170929/source/components/executer/exfldio.c
+Index: acpica-unix-20171110/source/components/executer/exfldio.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/executer/exfldio.c
-+++ acpica-unix2-20170929/source/components/executer/exfldio.c
+--- acpica-unix-20171110.orig/source/components/executer/exfldio.c
++++ acpica-unix-20171110/source/components/executer/exfldio.c
 @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
  
              ACPI_ERROR ((AE_INFO,
@@ -218,10 +218,10 @@ Index: acpica-unix2-20170929/source/components/executer/exfldio.c
              return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
          }
      }
-Index: acpica-unix2-20170929/source/components/executer/exnames.c
+Index: acpica-unix-20171110/source/components/executer/exnames.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/executer/exnames.c
-+++ acpica-unix2-20170929/source/components/executer/exnames.c
+--- acpica-unix-20171110.orig/source/components/executer/exnames.c
++++ acpica-unix-20171110/source/components/executer/exnames.c
 @@ -240,7 +240,7 @@ AcpiExNameSegment (
           */
          ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
@@ -240,10 +240,10 @@ Index: acpica-unix2-20170929/source/components/executer/exnames.c
      }
  
      *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
-Index: acpica-unix2-20170929/source/components/hardware/hwregs.c
+Index: acpica-unix-20171110/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/hardware/hwregs.c
-+++ acpica-unix2-20170929/source/components/hardware/hwregs.c
+--- acpica-unix-20171110.orig/source/components/hardware/hwregs.c
++++ acpica-unix-20171110/source/components/hardware/hwregs.c
 @@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
  
  
@@ -253,10 +253,10 @@ Index: acpica-unix2-20170929/source/components/hardware/hwregs.c
          ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
  
      LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
-Index: acpica-unix2-20170929/source/components/tables/tbfadt.c
+Index: acpica-unix-20171110/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/tables/tbfadt.c
-+++ acpica-unix2-20170929/source/components/tables/tbfadt.c
+--- acpica-unix-20171110.orig/source/components/tables/tbfadt.c
++++ acpica-unix-20171110/source/components/tables/tbfadt.c
 @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
          if (!(Flags & ACPI_FADT_GPE_REGISTER))
          {
@@ -284,10 +284,10 @@ Index: acpica-unix2-20170929/source/components/tables/tbfadt.c
                          Name, Address32,
                          ACPI_FORMAT_UINT64 (Address64->Address),
                          AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
-Index: acpica-unix2-20170929/source/components/tables/tbxfroot.c
+Index: acpica-unix-20171110/source/components/tables/tbxfroot.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/tables/tbxfroot.c
-+++ acpica-unix2-20170929/source/components/tables/tbxfroot.c
+--- acpica-unix-20171110.orig/source/components/tables/tbxfroot.c
++++ acpica-unix-20171110/source/components/tables/tbxfroot.c
 @@ -177,7 +177,7 @@ AcpiFindRootPointer (
      {
          ACPI_ERROR ((AE_INFO,
@@ -315,10 +315,10 @@ Index: acpica-unix2-20170929/source/components/tables/tbxfroot.c
  
          return_ACPI_STATUS (AE_NO_MEMORY);
      }
-Index: acpica-unix2-20170929/source/components/utilities/utownerid.c
+Index: acpica-unix-20171110/source/components/utilities/utownerid.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/components/utilities/utownerid.c
-+++ acpica-unix2-20170929/source/components/utilities/utownerid.c
+--- acpica-unix-20171110.orig/source/components/utilities/utownerid.c
++++ acpica-unix-20171110/source/components/utilities/utownerid.c
 @@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
      else
      {
@@ -328,10 +328,10 @@ Index: acpica-unix2-20170929/source/components/utilities/utownerid.c
      }
  
      (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES);
-Index: acpica-unix2-20170929/source/tools/acpiexec/aemain.c
+Index: acpica-unix-20171110/source/tools/acpiexec/aemain.c
 ===================================================================
---- acpica-unix2-20170929.orig/source/tools/acpiexec/aemain.c
-+++ acpica-unix2-20170929/source/tools/acpiexec/aemain.c
+--- acpica-unix-20171110.orig/source/tools/acpiexec/aemain.c
++++ acpica-unix-20171110/source/tools/acpiexec/aemain.c
 @@ -205,7 +205,7 @@ AeDoOptions (
  
          if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1))
diff --git a/simple-64bit.patch b/simple-64bit.patch
new file mode 100644
index 0000000..8bde2f4
--- /dev/null
+++ b/simple-64bit.patch
@@ -0,0 +1,18 @@
+Description: Stop listing all 64bit architectures
+ Check __LP64__ instead of maintaining a list of all
+ 64bit architectures.
+Author: Adrian Bunk <bunk@debian.org>
+
+--- acpica-unix-20170831.orig/source/include/platform/aclinux.h
++++ acpica-unix-20170831/source/include/platform/aclinux.h
+@@ -208,9 +208,7 @@
+ #define ACPI_FLUSH_CPU_CACHE()
+ #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread))
+ 
+-#if defined(__ia64__)    || defined(__x86_64__) ||\
+-    defined(__aarch64__) || defined(__PPC64__) ||\
+-    defined(__s390x__)
++#if defined(__LP64__)
+ #define ACPI_MACHINE_WIDTH          64
+ #define COMPILER_DEPENDENT_INT64    long
+ #define COMPILER_DEPENDENT_UINT64   unsigned long
diff --git a/sources b/sources
index e1a0e16..eb59b7c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20170929.tar.gz) = 038c4cb600c2a28c8099909278d21c00144026239e7f67f8e0e6714bccf2344d16acd69a415afeaa41ee6d1970d377db729564757516c1972a283afe6c3bca23
-SHA512 (acpitests-unix-20170929.tar.gz) = 0cac16f172ffe1f46aceee8e23d7b7f7f7f220e88f027d83d68ab8db0709eb2fef971a13606ee7969f8bb7b8e512ec44637b750dc7a5616a7c1665698807b1e8
+SHA512 (acpica-unix2-20171110.tar.gz) = e7add3a1a41894c997f4f71f9f4c1b889b246912f4c5525a6d99b37b099773b3840ebe9d1e050bdb0dbda9b0d784105247dcbb6e1b85801522db2ee1370f9962
+SHA512 (acpitests-unix-20171110.tar.gz) = 8d7842c431890541ae9ad7270020a995e09b80fdcd7528e534f9ad876ffa1f1b9a39452bca6747cc1a5b749a752d785c8bfedafbe9af29b28d1af3db079fb3d4