diff --git a/.gitignore b/.gitignore
index 44d655f..2e7eaf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,3 +129,5 @@ series
 /acpitests-unix-20200214.tar.gz
 /acpica-unix2-20200326.tar.gz
 /acpitests-unix-20200326.tar.gz
+/acpica-unix2-20200430.tar.gz
+/acpitests-unix-20200430.tar.gz
diff --git a/OPT_LDFLAGS.patch b/OPT_LDFLAGS.patch
index 5d9a21f..610d66d 100644
--- a/OPT_LDFLAGS.patch
+++ b/OPT_LDFLAGS.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20191018/generate/unix/Makefile.config
+Index: acpica-unix2-20200528/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix-20191018.orig/generate/unix/Makefile.config
-+++ acpica-unix-20191018/generate/unix/Makefile.config
+--- acpica-unix2-20200528.orig/generate/unix/Makefile.config
++++ acpica-unix2-20200528/generate/unix/Makefile.config
 @@ -23,6 +23,9 @@
  # OPT_CFLAGS can be overridden on the make command line by
  #   adding OPT_CFLAGS="..." to the invocation.
@@ -12,7 +12,7 @@ Index: acpica-unix-20191018/generate/unix/Makefile.config
  # Notes:
  #   gcc should be version 4 or greater, otherwise some of the options
  #     used will not be recognized.
-@@ -165,6 +168,11 @@ LDFLAGS +=-m32
+@@ -164,6 +167,11 @@ LDFLAGS +=-m32
  endif
  
  #
diff --git a/acpica-tools.spec b/acpica-tools.spec
index a8b36ba..4868994 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,5 +1,5 @@
 Name:           acpica-tools
-Version:        20200326
+Version:        20200430
 Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
@@ -241,6 +241,9 @@ fi
 
 
 %changelog
+* Thu Jun 8 2020 Al Stone <ahs3@redhat.com> - 202004306-1
+- Update to 202004306 source tree, including patch refreshes
+
 * Wed Apr 1 2020 Al Stone <ahs3@redhat.com> - 20200326-1
 - Update to 20200326 source tree, including patch refreshes
 - Removed a couple of patches that got included upstream
diff --git a/big-endian-dmtbdump2.patch b/big-endian-dmtbdump2.patch
index 0ba1a44..0997b5b 100644
--- a/big-endian-dmtbdump2.patch
+++ b/big-endian-dmtbdump2.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20209326/source/common/dmtbdump2.c
+Index: acpica-unix2-20200528/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix-20209326.orig/source/common/dmtbdump2.c
-+++ acpica-unix-20209326/source/common/dmtbdump2.c
+--- acpica-unix2-20200528.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200528/source/common/dmtbdump2.c
 @@ -75,16 +75,23 @@ AcpiDmDumpIort (
      ACPI_IORT_SMMU          *IortSmmu = NULL;
      UINT32                  Offset;
@@ -243,7 +243,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -427,7 +448,7 @@ AcpiDmDumpIvrs (
+@@ -429,7 +450,7 @@ AcpiDmDumpIvrs (
                      sizeof (ACPI_IVRS_HARDWARE2));
              }
  
@@ -252,7 +252,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              {
                  AcpiOsPrintf ("\n");
                  /*
-@@ -489,7 +510,7 @@ AcpiDmDumpIvrs (
+@@ -491,7 +512,7 @@ AcpiDmDumpIvrs (
  
                  /* Dump the Device Entry */
  
@@ -261,7 +261,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                      DeviceEntry, EntryLength, InfoTable);
                  if (ACPI_FAILURE (Status))
                  {
-@@ -505,8 +526,8 @@ AcpiDmDumpIvrs (
+@@ -507,8 +528,8 @@ AcpiDmDumpIvrs (
  NextSubtable:
          /* Point to next subtable */
  
@@ -272,7 +272,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      }
  }
  
-@@ -532,7 +553,7 @@ AcpiDmDumpLpit (
+@@ -534,7 +555,7 @@ AcpiDmDumpLpit (
  {
      ACPI_STATUS             Status;
      ACPI_LPIT_HEADER        *Subtable;
@@ -281,7 +281,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      UINT32                  Offset = sizeof (ACPI_TABLE_LPIT);
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  SubtableLength;
-@@ -540,8 +561,9 @@ AcpiDmDumpLpit (
+@@ -542,8 +563,9 @@ AcpiDmDumpLpit (
  
      /* Subtables */
  
@@ -292,7 +292,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      {
          /* Common subtable header */
  
-@@ -605,13 +627,14 @@ AcpiDmDumpMadt (
+@@ -607,13 +629,14 @@ AcpiDmDumpMadt (
  {
      ACPI_STATUS             Status;
      ACPI_SUBTABLE_HEADER    *Subtable;
@@ -308,7 +308,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMadt);
      if (ACPI_FAILURE (Status))
      {
-@@ -621,7 +644,7 @@ AcpiDmDumpMadt (
+@@ -623,7 +646,7 @@ AcpiDmDumpMadt (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
@@ -317,7 +317,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      {
          /* Common subtable header */
  
-@@ -767,11 +790,13 @@ AcpiDmDumpMcfg (
+@@ -769,11 +792,13 @@ AcpiDmDumpMcfg (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MCFG);
      ACPI_MCFG_ALLOCATION    *Subtable;
@@ -332,7 +332,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -780,17 +805,17 @@ AcpiDmDumpMcfg (
+@@ -782,17 +807,17 @@ AcpiDmDumpMcfg (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
@@ -354,7 +354,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0);
          if (ACPI_FAILURE (Status))
          {
-@@ -824,6 +849,7 @@ AcpiDmDumpMpst (
+@@ -826,6 +851,7 @@ AcpiDmDumpMpst (
  {
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MPST);
@@ -362,7 +362,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      ACPI_MPST_POWER_NODE    *Subtable0;
      ACPI_MPST_POWER_STATE   *Subtable0A;
      ACPI_MPST_COMPONENT     *Subtable0B;
-@@ -832,11 +858,13 @@ AcpiDmDumpMpst (
+@@ -834,11 +860,13 @@ AcpiDmDumpMpst (
      UINT16                  SubtableCount;
      UINT32                  PowerStateCount;
      UINT32                  ComponentCount;
@@ -377,7 +377,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -844,13 +872,14 @@ AcpiDmDumpMpst (
+@@ -846,13 +874,14 @@ AcpiDmDumpMpst (
  
      /* Subtable: Memory Power Node(s) */
  
@@ -395,7 +395,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
          if (ACPI_FAILURE (Status))
          {
-@@ -859,8 +888,8 @@ AcpiDmDumpMpst (
+@@ -861,8 +890,8 @@ AcpiDmDumpMpst (
  
          /* Extract the sub-subtable counts */
  
@@ -406,7 +406,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          Offset += sizeof (ACPI_MPST_POWER_NODE);
  
          /* Sub-subtables - Memory Power State Structure(s) */
-@@ -871,7 +900,7 @@ AcpiDmDumpMpst (
+@@ -873,7 +902,7 @@ AcpiDmDumpMpst (
          while (PowerStateCount)
          {
              AcpiOsPrintf ("\n");
@@ -415,7 +415,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                  sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
              if (ACPI_FAILURE (Status))
              {
-@@ -881,7 +910,7 @@ AcpiDmDumpMpst (
+@@ -883,7 +912,7 @@ AcpiDmDumpMpst (
              Subtable0A++;
              PowerStateCount--;
              Offset += sizeof (ACPI_MPST_POWER_STATE);
@@ -424,7 +424,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
  
          /* Sub-subtables - Physical Component ID Structure(s) */
  
-@@ -894,7 +923,7 @@ AcpiDmDumpMpst (
+@@ -896,7 +925,7 @@ AcpiDmDumpMpst (
  
          while (ComponentCount)
          {
@@ -433,7 +433,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                  sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
              if (ACPI_FAILURE (Status))
              {
-@@ -909,17 +938,19 @@ AcpiDmDumpMpst (
+@@ -911,17 +940,19 @@ AcpiDmDumpMpst (
          /* Point to next Memory Power Node subtable */
  
          SubtableCount--;
@@ -456,7 +456,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1);
      if (ACPI_FAILURE (Status))
      {
-@@ -934,10 +965,10 @@ AcpiDmDumpMpst (
+@@ -936,10 +967,10 @@ AcpiDmDumpMpst (
      Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
          sizeof (ACPI_MPST_DATA_HDR));
  
@@ -469,7 +469,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
          if (ACPI_FAILURE (Status))
          {
-@@ -970,11 +1001,13 @@ AcpiDmDumpMsct (
+@@ -972,11 +1003,13 @@ AcpiDmDumpMsct (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MSCT);
      ACPI_MSCT_PROXIMITY     *Subtable;
@@ -484,7 +484,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -983,12 +1016,12 @@ AcpiDmDumpMsct (
+@@ -985,12 +1018,12 @@ AcpiDmDumpMsct (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
@@ -499,7 +499,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0);
          if (ACPI_FAILURE (Status))
          {
-@@ -1023,11 +1056,13 @@ AcpiDmDumpMtmr (
+@@ -1025,11 +1058,13 @@ AcpiDmDumpMtmr (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MTMR);
      ACPI_MTMR_ENTRY         *Subtable;
@@ -514,7 +514,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1036,12 +1071,12 @@ AcpiDmDumpMtmr (
+@@ -1038,12 +1073,12 @@ AcpiDmDumpMtmr (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
@@ -529,7 +529,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
          if (ACPI_FAILURE (Status))
          {
-@@ -1083,11 +1118,17 @@ AcpiDmDumpNfit (
+@@ -1085,11 +1120,17 @@ AcpiDmDumpNfit (
      ACPI_NFIT_SMBIOS        *SmbiosInfo = NULL;
      ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
      UINT32                  i;
@@ -548,7 +548,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1096,19 +1137,21 @@ AcpiDmDumpNfit (
+@@ -1098,19 +1139,21 @@ AcpiDmDumpNfit (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
@@ -574,7 +574,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          {
          case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
  
-@@ -1163,7 +1206,7 @@ AcpiDmDumpNfit (
+@@ -1165,7 +1208,7 @@ AcpiDmDumpNfit (
  
              /* Attempt to continue */
  
@@ -583,7 +583,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              {
                  AcpiOsPrintf ("Invalid zero length subtable\n");
                  return;
-@@ -1172,8 +1215,8 @@ AcpiDmDumpNfit (
+@@ -1174,8 +1217,8 @@ AcpiDmDumpNfit (
          }
  
          AcpiOsPrintf ("\n");
@@ -594,7 +594,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1181,14 +1224,15 @@ AcpiDmDumpNfit (
+@@ -1183,14 +1226,15 @@ AcpiDmDumpNfit (
  
          /* Per-subtable variable-length fields */
  
@@ -613,7 +613,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                      &Interleave->LineOffset[i],
                      sizeof (UINT32), AcpiDmTableInfoNfit2a);
                  if (ACPI_FAILURE (Status))
-@@ -1202,12 +1246,11 @@ AcpiDmDumpNfit (
+@@ -1204,12 +1248,11 @@ AcpiDmDumpNfit (
  
          case ACPI_NFIT_TYPE_SMBIOS:
  
@@ -628,7 +628,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                      sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
                      SmbiosInfo,
                      Length, AcpiDmTableInfoNfit3a);
-@@ -1222,9 +1265,10 @@ AcpiDmDumpNfit (
+@@ -1224,9 +1267,10 @@ AcpiDmDumpNfit (
          case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
  
              Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable);
@@ -641,7 +641,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                      &Hint->HintAddress[i],
                      sizeof (UINT64), AcpiDmTableInfoNfit6a);
                  if (ACPI_FAILURE (Status))
-@@ -1243,8 +1287,8 @@ AcpiDmDumpNfit (
+@@ -1245,8 +1289,8 @@ AcpiDmDumpNfit (
  NextSubtable:
          /* Point to next subtable */
  
@@ -652,7 +652,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      }
  }
  
-@@ -1269,12 +1313,13 @@ AcpiDmDumpPcct (
+@@ -1271,12 +1315,13 @@ AcpiDmDumpPcct (
      ACPI_STATUS             Status;
      ACPI_PCCT_SUBSPACE      *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
@@ -667,7 +667,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct);
      if (ACPI_FAILURE (Status))
      {
-@@ -1284,7 +1329,7 @@ AcpiDmDumpPcct (
+@@ -1286,7 +1331,7 @@ AcpiDmDumpPcct (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
@@ -676,7 +676,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      {
          /* Common subtable header */
  
-@@ -1424,16 +1469,21 @@ AcpiDmDumpPmtt (
+@@ -1426,16 +1471,21 @@ AcpiDmDumpPmtt (
      ACPI_PMTT_HEADER        *MemSubtable;
      ACPI_PMTT_HEADER        *DimmSubtable;
      ACPI_PMTT_DOMAIN        *DomainArray;
@@ -700,7 +700,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt);
      if (ACPI_FAILURE (Status))
      {
-@@ -1443,13 +1493,14 @@ AcpiDmDumpPmtt (
+@@ -1445,13 +1495,14 @@ AcpiDmDumpPmtt (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
@@ -717,7 +717,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1468,7 +1519,7 @@ AcpiDmDumpPmtt (
+@@ -1470,7 +1521,7 @@ AcpiDmDumpPmtt (
          /* Dump the fixed-length portion of the subtable */
  
          Status = AcpiDmDumpTable (Length, Offset, Subtable,
@@ -726,7 +726,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1480,15 +1531,16 @@ AcpiDmDumpPmtt (
+@@ -1482,15 +1533,16 @@ AcpiDmDumpPmtt (
          MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable,
              sizeof (ACPI_PMTT_SOCKET));
  
@@ -746,7 +746,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -1508,7 +1560,7 @@ AcpiDmDumpPmtt (
+@@ -1510,7 +1562,7 @@ AcpiDmDumpPmtt (
  
              Status = AcpiDmDumpTable (Length,
                  Offset + MemOffset, MemSubtable,
@@ -755,7 +755,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -1516,13 +1568,14 @@ AcpiDmDumpPmtt (
+@@ -1518,13 +1570,14 @@ AcpiDmDumpPmtt (
  
              /* Walk the variable count of proximity domains */
  
@@ -773,7 +773,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                  DomainCount)
              {
                  Status = AcpiDmDumpTable (Length,
-@@ -1550,15 +1603,16 @@ AcpiDmDumpPmtt (
+@@ -1552,15 +1605,16 @@ AcpiDmDumpPmtt (
              DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubtable,
                  DomainOffset);
  
@@ -793,7 +793,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                  if (ACPI_FAILURE (Status))
                  {
                      return;
-@@ -1578,7 +1632,7 @@ AcpiDmDumpPmtt (
+@@ -1580,7 +1634,7 @@ AcpiDmDumpPmtt (
  
                  Status = AcpiDmDumpTable (Length,
                      Offset + MemOffset + DimmOffset, DimmSubtable,
@@ -802,7 +802,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                  if (ACPI_FAILURE (Status))
                  {
                      return;
-@@ -1586,23 +1640,22 @@ AcpiDmDumpPmtt (
+@@ -1588,23 +1642,22 @@ AcpiDmDumpPmtt (
  
                  /* Point to next DIMM subtable */
  
@@ -832,7 +832,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      }
  }
  
-@@ -1763,6 +1816,8 @@ AcpiDmDumpS3pt (
+@@ -1765,6 +1818,8 @@ AcpiDmDumpS3pt (
      ACPI_FPDT_HEADER        *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
      ACPI_TABLE_S3PT         *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
@@ -841,7 +841,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
  
  
      /* Main table */
-@@ -1773,20 +1828,22 @@ AcpiDmDumpS3pt (
+@@ -1775,20 +1830,22 @@ AcpiDmDumpS3pt (
          return 0;
      }
  
@@ -867,7 +867,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          {
          case ACPI_S3PT_TYPE_RESUME:
  
-@@ -1801,7 +1858,7 @@ AcpiDmDumpS3pt (
+@@ -1803,7 +1860,7 @@ AcpiDmDumpS3pt (
          default:
  
              AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
@@ -876,7 +876,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
  
              /* Attempt to continue */
  
-@@ -1814,7 +1871,7 @@ AcpiDmDumpS3pt (
+@@ -1816,7 +1873,7 @@ AcpiDmDumpS3pt (
          }
  
          AcpiOsPrintf ("\n");
diff --git a/big-endian.patch b/big-endian.patch
index 8d89a5b..284bc46 100644
--- a/big-endian.patch
+++ b/big-endian.patch
@@ -8,10 +8,10 @@ To date, this has been critical for the s390x architecture only.
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 
-Index: acpica-unix-20200214/source/compiler/aslcodegen.c
+Index: acpica-unix2-20200528/source/compiler/aslcodegen.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslcodegen.c
-+++ acpica-unix-20200214/source/compiler/aslcodegen.c
+--- acpica-unix2-20200528.orig/source/compiler/aslcodegen.c
++++ acpica-unix2-20200528/source/compiler/aslcodegen.c
 @@ -237,16 +237,12 @@ CgWriteAmlOpcode (
      ACPI_PARSE_OBJECT       *Op)
  {
@@ -253,10 +253,10 @@ Index: acpica-unix-20200214/source/compiler/aslcodegen.c
  
      case AML_RAW_DATA_BUFFER:
  
-Index: acpica-unix-20200214/source/compiler/aslopcodes.c
+Index: acpica-unix2-20200528/source/compiler/aslopcodes.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslopcodes.c
-+++ acpica-unix-20200214/source/compiler/aslopcodes.c
+--- acpica-unix2-20200528.orig/source/compiler/aslopcodes.c
++++ acpica-unix2-20200528/source/compiler/aslopcodes.c
 @@ -485,6 +485,7 @@ OpcDoUnicode (
      UINT32                  i;
      UINT8                   *AsciiString;
@@ -275,10 +275,10 @@ Index: acpica-unix-20200214/source/compiler/aslopcodes.c
      }
  
      /*
-Index: acpica-unix-20200214/source/compiler/aslrestype1.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype1.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype1.c
-+++ acpica-unix-20200214/source/compiler/aslrestype1.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype1.c
++++ acpica-unix2-20200528/source/compiler/aslrestype1.c
 @@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
      ACPI_PARSE_OBJECT       *LengthOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -475,10 +475,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
              break;
-Index: acpica-unix-20200214/source/compiler/aslrestype1i.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype1i.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype1i.c
-+++ acpica-unix-20200214/source/compiler/aslrestype1i.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype1i.c
++++ acpica-unix2-20200528/source/compiler/aslrestype1i.c
 @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -615,10 +615,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype1i.c
 +    ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
      return (Rnode);
  }
-Index: acpica-unix-20200214/source/compiler/aslrestype2.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype2.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype2.c
-+++ acpica-unix-20200214/source/compiler/aslrestype2.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype2.c
++++ acpica-unix2-20200528/source/compiler/aslrestype2.c
 @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -759,10 +759,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype2.c
  
      /* Point to end-of-descriptor for vendor data */
  
-Index: acpica-unix-20200214/source/compiler/aslrestype2d.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype2d.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype2d.c
-+++ acpica-unix-20200214/source/compiler/aslrestype2d.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype2d.c
++++ acpica-unix2-20200528/source/compiler/aslrestype2d.c
 @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1118,10 +1118,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype2d.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20200214/source/compiler/aslrestype2e.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype2e.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype2e.c
-+++ acpica-unix-20200214/source/compiler/aslrestype2e.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype2e.c
++++ acpica-unix2-20200528/source/compiler/aslrestype2e.c
 @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1227,10 +1227,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype2e.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
          StringLength;
      return (Rnode);
-Index: acpica-unix-20200214/source/compiler/aslrestype2q.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype2q.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype2q.c
-+++ acpica-unix-20200214/source/compiler/aslrestype2q.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype2q.c
++++ acpica-unix2-20200528/source/compiler/aslrestype2q.c
 @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT8                   *OptionalFields;
@@ -1569,10 +1569,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype2q.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20200214/source/compiler/aslrestype2s.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype2s.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype2s.c
-+++ acpica-unix-20200214/source/compiler/aslrestype2s.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype2s.c
++++ acpica-unix2-20200528/source/compiler/aslrestype2s.c
 @@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
      UINT16                  VendorLength;
      UINT16                  InterruptLength;
@@ -2038,10 +2038,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype2s.c
      MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
      return (Rnode);
  }
-Index: acpica-unix-20200214/source/compiler/aslrestype2w.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype2w.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype2w.c
-+++ acpica-unix-20200214/source/compiler/aslrestype2w.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype2w.c
++++ acpica-unix2-20200528/source/compiler/aslrestype2w.c
 @@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
      UINT8                   *OptionalFields;
      UINT16                  StringLength = 0;
@@ -2385,10 +2385,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype2w.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20200214/source/include/acmacros.h
+Index: acpica-unix2-20200528/source/include/acmacros.h
 ===================================================================
---- acpica-unix-20200214.orig/source/include/acmacros.h
-+++ acpica-unix-20200214/source/include/acmacros.h
+--- acpica-unix2-20200528.orig/source/include/acmacros.h
++++ acpica-unix2-20200528/source/include/acmacros.h
 @@ -98,9 +98,12 @@
                                             ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
                                             ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
@@ -2467,10 +2467,10 @@ Index: acpica-unix-20200214/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-20200214/source/include/platform/aclinux.h
+Index: acpica-unix2-20200528/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix-20200214.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20200214/source/include/platform/aclinux.h
+--- acpica-unix2-20200528.orig/source/include/platform/aclinux.h
++++ acpica-unix2-20200528/source/include/platform/aclinux.h
 @@ -198,6 +198,7 @@
  
  #ifdef ACPI_USE_STANDARD_HEADERS
@@ -2490,10 +2490,10 @@ Index: acpica-unix-20200214/source/include/platform/aclinux.h
  #endif /* __KERNEL__ */
  
  #endif /* __ACLINUX_H__ */
-Index: acpica-unix-20200214/source/compiler/aslanalyze.c
+Index: acpica-unix2-20200528/source/compiler/aslanalyze.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslanalyze.c
-+++ acpica-unix-20200214/source/compiler/aslanalyze.c
+--- acpica-unix2-20200528.orig/source/compiler/aslanalyze.c
++++ acpica-unix2-20200528/source/compiler/aslanalyze.c
 @@ -469,7 +469,7 @@ ApCheckForGpeNameConflict (
  
      /* Need a null-terminated string version of NameSeg */
@@ -2512,10 +2512,10 @@ Index: acpica-unix-20200214/source/compiler/aslanalyze.c
  
      /* Inject opposite letter ("L" versus "E") */
  
-Index: acpica-unix-20200214/source/compiler/asllookup.c
+Index: acpica-unix2-20200528/source/compiler/asllookup.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/asllookup.c
-+++ acpica-unix-20200214/source/compiler/asllookup.c
+--- acpica-unix2-20200528.orig/source/compiler/asllookup.c
++++ acpica-unix2-20200528/source/compiler/asllookup.c
 @@ -119,6 +119,7 @@ LkIsObjectUsed (
  {
      ACPI_NAMESPACE_NODE     *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
@@ -2546,10 +2546,10 @@ Index: acpica-unix-20200214/source/compiler/asllookup.c
              AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
                  LkGetNameOp (Node->Op), AslGbl_MsgBuffer);
              return (AE_OK);
-Index: acpica-unix-20200214/source/compiler/aslmain.c
+Index: acpica-unix2-20200528/source/compiler/aslmain.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslmain.c
-+++ acpica-unix-20200214/source/compiler/aslmain.c
+--- acpica-unix2-20200528.orig/source/compiler/aslmain.c
++++ acpica-unix2-20200528/source/compiler/aslmain.c
 @@ -101,18 +101,6 @@ main (
  
      signal (SIGINT, AslSignalHandler);
@@ -2569,10 +2569,10 @@ Index: acpica-unix-20200214/source/compiler/aslmain.c
      AcpiOsInitialize ();
      ACPI_DEBUG_INITIALIZE (); /* For debug version only */
  
-Index: acpica-unix-20200214/source/common/acfileio.c
+Index: acpica-unix2-20200528/source/common/acfileio.c
 ===================================================================
---- acpica-unix-20200214.orig/source/common/acfileio.c
-+++ acpica-unix-20200214/source/common/acfileio.c
+--- acpica-unix2-20200528.orig/source/common/acfileio.c
++++ acpica-unix2-20200528/source/common/acfileio.c
 @@ -280,6 +280,7 @@ AcGetOneTableFromFile (
      ACPI_TABLE_HEADER       *Table;
      INT32                   Count;
@@ -2639,10 +2639,10 @@ Index: acpica-unix-20200214/source/common/acfileio.c
              (UINT32) (FileSize - TableOffset));
          return (AE_BAD_HEADER);
      }
-Index: acpica-unix-20200214/source/common/dmtable.c
+Index: acpica-unix2-20200528/source/common/dmtable.c
 ===================================================================
---- acpica-unix-20200214.orig/source/common/dmtable.c
-+++ acpica-unix-20200214/source/common/dmtable.c
+--- acpica-unix2-20200528.orig/source/common/dmtable.c
++++ acpica-unix2-20200528/source/common/dmtable.c
 @@ -551,7 +551,7 @@ AcpiDmDumpDataTable (
       */
      if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
@@ -2741,10 +2741,10 @@ Index: acpica-unix-20200214/source/common/dmtable.c
                  AcpiDmNfitSubnames[Temp16]);
              break;
  
-Index: acpica-unix-20200214/source/common/dmtables.c
+Index: acpica-unix2-20200528/source/common/dmtables.c
 ===================================================================
---- acpica-unix-20200214.orig/source/common/dmtables.c
-+++ acpica-unix-20200214/source/common/dmtables.c
+--- acpica-unix2-20200528.orig/source/common/dmtables.c
++++ acpica-unix2-20200528/source/common/dmtables.c
 @@ -142,7 +142,9 @@ AdCreateTableHeader (
      ACPI_TABLE_HEADER       *Table)
  {
@@ -2810,10 +2810,10 @@ Index: acpica-unix-20200214/source/common/dmtables.c
      AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
  
      AcpiUtSetIntegerWidth (Table->Revision);
-Index: acpica-unix-20200214/source/compiler/dtfield.c
+Index: acpica-unix2-20200528/source/compiler/dtfield.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/dtfield.c
-+++ acpica-unix-20200214/source/compiler/dtfield.c
+--- acpica-unix2-20200528.orig/source/compiler/dtfield.c
++++ acpica-unix2-20200528/source/compiler/dtfield.c
 @@ -361,7 +361,27 @@ DtCompileInteger (
          DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
      }
@@ -2843,10 +2843,10 @@ Index: acpica-unix-20200214/source/compiler/dtfield.c
      return;
  }
  
-Index: acpica-unix-20200214/source/compiler/dtsubtable.c
+Index: acpica-unix2-20200528/source/compiler/dtsubtable.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/dtsubtable.c
-+++ acpica-unix-20200214/source/compiler/dtsubtable.c
+--- acpica-unix2-20200528.orig/source/compiler/dtsubtable.c
++++ acpica-unix2-20200528/source/compiler/dtsubtable.c
 @@ -378,6 +378,21 @@ DtSetSubtableLength (
          return;
      }
@@ -2871,10 +2871,10 @@ Index: acpica-unix-20200214/source/compiler/dtsubtable.c
 +        	Subtable->SizeOfLengthField);
 +    }
  }
-Index: acpica-unix-20200214/source/compiler/dttable1.c
+Index: acpica-unix2-20200528/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/dttable1.c
-+++ acpica-unix-20200214/source/compiler/dttable1.c
+--- acpica-unix2-20200528.orig/source/compiler/dttable1.c
++++ acpica-unix2-20200528/source/compiler/dttable1.c
 @@ -281,6 +281,8 @@ DtCompileCsrt (
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      UINT32                  DescriptorCount;
@@ -3246,10 +3246,10 @@ Index: acpica-unix-20200214/source/compiler/dttable1.c
      return (AE_OK);
  }
  
-Index: acpica-unix-20200214/source/compiler/dttable2.c
+Index: acpica-unix2-20200528/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/dttable2.c
-+++ acpica-unix-20200214/source/compiler/dttable2.c
+--- acpica-unix2-20200528.orig/source/compiler/dttable2.c
++++ acpica-unix2-20200528/source/compiler/dttable2.c
 @@ -345,7 +345,7 @@ DtCompileMpst (
      DtPushSubtable (Subtable);
  
@@ -3442,10 +3442,10 @@ Index: acpica-unix-20200214/source/compiler/dttable2.c
  
      ParentTable = DtPeekSubtable ();
      DtInsertSubtable (ParentTable, Subtable);
-Index: acpica-unix-20200214/source/components/disassembler/dmbuffer.c
+Index: acpica-unix2-20200528/source/components/disassembler/dmbuffer.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/disassembler/dmbuffer.c
-+++ acpica-unix-20200214/source/components/disassembler/dmbuffer.c
+--- acpica-unix2-20200528.orig/source/components/disassembler/dmbuffer.c
++++ acpica-unix2-20200528/source/components/disassembler/dmbuffer.c
 @@ -204,7 +204,7 @@ AcpiDmByteList (
  
  
@@ -3455,7 +3455,7 @@ Index: acpica-unix-20200214/source/components/disassembler/dmbuffer.c
  
      /*
       * The byte list belongs to a buffer, and can be produced by either
-@@ -304,7 +304,8 @@ AcpiDmIsUuidBuffer (
+@@ -308,7 +308,8 @@ AcpiDmIsUuidBuffer (
      /* Extract the byte list info */
  
      ByteData = NextOp->Named.Data;
@@ -3465,7 +3465,7 @@ Index: acpica-unix-20200214/source/components/disassembler/dmbuffer.c
  
      /* Byte count must be exactly 16 */
  
-@@ -424,7 +425,8 @@ AcpiDmIsUnicodeBuffer (
+@@ -432,7 +433,8 @@ AcpiDmIsUnicodeBuffer (
      /* Extract the byte list info */
  
      ByteData = NextOp->Named.Data;
@@ -3475,7 +3475,7 @@ Index: acpica-unix-20200214/source/components/disassembler/dmbuffer.c
      WordCount = ACPI_DIV_2 (ByteCount);
  
      /*
-@@ -852,19 +854,22 @@ AcpiDmUnicode (
+@@ -869,19 +871,22 @@ AcpiDmUnicode (
      UINT32                  WordCount;
      UINT32                  i;
      int                     OutputValue;
@@ -3500,7 +3500,7 @@ Index: acpica-unix-20200214/source/components/disassembler/dmbuffer.c
  
          /* Handle values that must be escaped */
  
-@@ -973,16 +978,18 @@ AcpiDmCheckForHardwareId (
+@@ -990,16 +995,18 @@ AcpiDmCheckForHardwareId (
      ACPI_PARSE_OBJECT       *Op)
  {
      UINT32                  Name;
@@ -3521,10 +3521,10 @@ Index: acpica-unix-20200214/source/components/disassembler/dmbuffer.c
  
      NextOp = AcpiPsGetDepthNext (NULL, Op);
      if (!NextOp)
-Index: acpica-unix-20200214/source/components/disassembler/dmopcode.c
+Index: acpica-unix2-20200528/source/components/disassembler/dmopcode.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/disassembler/dmopcode.c
-+++ acpica-unix-20200214/source/components/disassembler/dmopcode.c
+--- acpica-unix2-20200528.orig/source/components/disassembler/dmopcode.c
++++ acpica-unix2-20200528/source/components/disassembler/dmopcode.c
 @@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
      char                        *NameString;
      int                         LastCharIsDigit;
@@ -3595,10 +3595,10 @@ Index: acpica-unix-20200214/source/components/disassembler/dmopcode.c
  
              Info->Level += 1;
              Info->MappingOp = Op;
-Index: acpica-unix-20200214/source/components/disassembler/dmresrcl.c
+Index: acpica-unix2-20200528/source/components/disassembler/dmresrcl.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/disassembler/dmresrcl.c
-+++ acpica-unix-20200214/source/components/disassembler/dmresrcl.c
+--- acpica-unix2-20200528.orig/source/components/disassembler/dmresrcl.c
++++ acpica-unix2-20200528/source/components/disassembler/dmresrcl.c
 @@ -141,7 +141,8 @@ AcpiDmMemoryFields (
      UINT32                  Level)
  {
@@ -3747,10 +3747,10 @@ Index: acpica-unix-20200214/source/components/disassembler/dmresrcl.c
      }
  
      AcpiDmIndent (Level);
-Index: acpica-unix-20200214/source/components/disassembler/dmresrcl2.c
+Index: acpica-unix2-20200528/source/components/disassembler/dmresrcl2.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/disassembler/dmresrcl2.c
-+++ acpica-unix-20200214/source/components/disassembler/dmresrcl2.c
+--- acpica-unix2-20200528.orig/source/components/disassembler/dmresrcl2.c
++++ acpica-unix2-20200528/source/components/disassembler/dmresrcl2.c
 @@ -191,22 +191,24 @@ AcpiDmGpioCommon (
      char                    *DeviceName = NULL;
      UINT32                  PinCount;
@@ -3974,10 +3974,10 @@ Index: acpica-unix-20200214/source/components/disassembler/dmresrcl2.c
  
      DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
      AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-Index: acpica-unix-20200214/source/components/disassembler/dmresrcs.c
+Index: acpica-unix2-20200528/source/components/disassembler/dmresrcs.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/disassembler/dmresrcs.c
-+++ acpica-unix-20200214/source/components/disassembler/dmresrcs.c
+--- acpica-unix2-20200528.orig/source/components/disassembler/dmresrcs.c
++++ acpica-unix2-20200528/source/components/disassembler/dmresrcs.c
 @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
      UINT32                  Length,
      UINT32                  Level)
@@ -4034,11 +4034,11 @@ Index: acpica-unix-20200214/source/components/disassembler/dmresrcs.c
  
      AcpiDmIndent (Level + 1);
      AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
-Index: acpica-unix-20200214/source/components/dispatcher/dsfield.c
+Index: acpica-unix2-20200528/source/components/dispatcher/dsfield.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/dispatcher/dsfield.c
-+++ acpica-unix-20200214/source/components/dispatcher/dsfield.c
-@@ -324,6 +324,7 @@ AcpiDsGetFieldNames (
+--- acpica-unix2-20200528.orig/source/components/dispatcher/dsfield.c
++++ acpica-unix2-20200528/source/components/dispatcher/dsfield.c
+@@ -329,6 +329,7 @@ AcpiDsGetFieldNames (
      ACPI_STATUS             Status;
      UINT64                  Position;
      ACPI_PARSE_OBJECT       *Child;
@@ -4046,7 +4046,7 @@ Index: acpica-unix-20200214/source/components/dispatcher/dsfield.c
  
  #ifdef ACPI_EXEC_APP
      ACPI_OPERAND_OBJECT     *ResultDesc;
-@@ -437,10 +438,17 @@ AcpiDsGetFieldNames (
+@@ -442,10 +443,17 @@ AcpiDsGetFieldNames (
  
              /* Lookup the name, it should already exist */
  
@@ -4064,7 +4064,7 @@ Index: acpica-unix-20200214/source/components/dispatcher/dsfield.c
              if (ACPI_FAILURE (Status))
              {
                  ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
-@@ -689,9 +697,17 @@ AcpiDsInitFieldObjects (
+@@ -703,9 +711,17 @@ AcpiDsInitFieldObjects (
           */
          if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
          {
@@ -4082,10 +4082,10 @@ Index: acpica-unix-20200214/source/components/dispatcher/dsfield.c
              if (ACPI_FAILURE (Status))
              {
                  ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
-Index: acpica-unix-20200214/source/components/events/evgpeblk.c
+Index: acpica-unix2-20200528/source/components/events/evgpeblk.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/events/evgpeblk.c
-+++ acpica-unix-20200214/source/components/events/evgpeblk.c
+--- acpica-unix2-20200528.orig/source/components/events/evgpeblk.c
++++ acpica-unix2-20200528/source/components/events/evgpeblk.c
 @@ -380,6 +380,7 @@ AcpiEvCreateGpeBlock (
      ACPI_STATUS             Status;
      ACPI_GPE_BLOCK_INFO     *GpeBlock;
@@ -4118,10 +4118,10 @@ Index: acpica-unix-20200214/source/components/events/evgpeblk.c
          InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
  
      /* Update global count of currently available GPEs */
-Index: acpica-unix-20200214/source/components/hardware/hwregs.c
+Index: acpica-unix2-20200528/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/hardware/hwregs.c
-+++ acpica-unix-20200214/source/components/hardware/hwregs.c
+--- acpica-unix2-20200528.orig/source/components/hardware/hwregs.c
++++ acpica-unix2-20200528/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.
@@ -4131,10 +4131,10 @@ Index: acpica-unix-20200214/source/components/hardware/hwregs.c
      if (!(*Address))
      {
          return (AE_BAD_ADDRESS);
-Index: acpica-unix-20200214/source/components/hardware/hwvalid.c
+Index: acpica-unix2-20200528/source/components/hardware/hwvalid.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/hardware/hwvalid.c
-+++ acpica-unix-20200214/source/components/hardware/hwvalid.c
+--- acpica-unix2-20200528.orig/source/components/hardware/hwvalid.c
++++ acpica-unix2-20200528/source/components/hardware/hwvalid.c
 @@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
      UINT32                  ByteWidth;
      ACPI_IO_ADDRESS         LastAddress;
@@ -4156,10 +4156,10 @@ Index: acpica-unix-20200214/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-20200214/source/components/namespace/nsaccess.c
+Index: acpica-unix2-20200528/source/components/namespace/nsaccess.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/namespace/nsaccess.c
-+++ acpica-unix-20200214/source/components/namespace/nsaccess.c
+--- acpica-unix2-20200528.orig/source/components/namespace/nsaccess.c
++++ acpica-unix2-20200528/source/components/namespace/nsaccess.c
 @@ -349,6 +349,7 @@ AcpiNsLookup (
      UINT32                  SearchParentFlag = ACPI_NS_SEARCH_PARENT;
      UINT32                  LocalFlags;
@@ -4180,10 +4180,10 @@ Index: acpica-unix-20200214/source/components/namespace/nsaccess.c
                      AcpiUtGetTypeName (ThisNode->Type),
                      AcpiUtGetTypeName (TypeToCheckFor)));
              }
-Index: acpica-unix-20200214/source/components/namespace/nsparse.c
+Index: acpica-unix2-20200528/source/components/namespace/nsparse.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/namespace/nsparse.c
-+++ acpica-unix-20200214/source/components/namespace/nsparse.c
+--- acpica-unix2-20200528.orig/source/components/namespace/nsparse.c
++++ acpica-unix2-20200528/source/components/namespace/nsparse.c
 @@ -216,13 +216,14 @@ AcpiNsOneCompleteParse (
  
      /* Table must consist of at least a complete header */
@@ -4201,10 +4201,10 @@ Index: acpica-unix-20200214/source/components/namespace/nsparse.c
  
      Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
      if (ACPI_FAILURE (Status))
-Index: acpica-unix-20200214/source/components/tables/tbdata.c
+Index: acpica-unix2-20200528/source/components/tables/tbdata.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/tables/tbdata.c
-+++ acpica-unix-20200214/source/components/tables/tbdata.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbdata.c
++++ acpica-unix2-20200528/source/components/tables/tbdata.c
 @@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
      UINT32                  *TableIndex)
  {
@@ -4223,10 +4223,10 @@ Index: acpica-unix-20200214/source/components/tables/tbdata.c
          if (ACPI_FAILURE (Status))
          {
              ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
-Index: acpica-unix-20200214/source/components/tables/tbfadt.c
+Index: acpica-unix2-20200528/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/tables/tbfadt.c
-+++ acpica-unix-20200214/source/components/tables/tbfadt.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbfadt.c
++++ acpica-unix2-20200528/source/components/tables/tbfadt.c
 @@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
      ACPI_TABLE_HEADER       *Table,
      UINT32                  Length)
@@ -4338,10 +4338,10 @@ Index: acpica-unix-20200214/source/components/tables/tbfadt.c
                  "PmRegisters", 0);
          }
      }
-Index: acpica-unix-20200214/source/components/tables/tbfind.c
+Index: acpica-unix2-20200528/source/components/tables/tbfind.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/tables/tbfind.c
-+++ acpica-unix-20200214/source/components/tables/tbfind.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbfind.c
++++ acpica-unix2-20200528/source/components/tables/tbfind.c
 @@ -108,8 +108,11 @@ AcpiTbFindTable (
      (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
      for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
@@ -4355,10 +4355,10 @@ Index: acpica-unix-20200214/source/components/tables/tbfind.c
          {
              /* Not the requested table */
  
-Index: acpica-unix-20200214/source/components/tables/tbprint.c
+Index: acpica-unix2-20200528/source/components/tables/tbprint.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/tables/tbprint.c
-+++ acpica-unix-20200214/source/components/tables/tbprint.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbprint.c
++++ acpica-unix2-20200528/source/components/tables/tbprint.c
 @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
      ACPI_TABLE_HEADER       *Header)
  {
@@ -4400,10 +4400,10 @@ Index: acpica-unix-20200214/source/components/tables/tbprint.c
      }
  }
  
-Index: acpica-unix-20200214/source/components/tables/tbutils.c
+Index: acpica-unix2-20200528/source/components/tables/tbutils.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/tables/tbutils.c
-+++ acpica-unix-20200214/source/components/tables/tbutils.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbutils.c
++++ acpica-unix2-20200528/source/components/tables/tbutils.c
 @@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
           * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
           *  return 64-bit
@@ -4463,10 +4463,10 @@ Index: acpica-unix-20200214/source/components/tables/tbutils.c
          {
              AcpiGbl_FadtIndex = TableIndex;
              AcpiTbParseFadt ();
-Index: acpica-unix-20200214/source/components/tables/tbxface.c
+Index: acpica-unix2-20200528/source/components/tables/tbxface.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/tables/tbxface.c
-+++ acpica-unix-20200214/source/components/tables/tbxface.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbxface.c
++++ acpica-unix2-20200528/source/components/tables/tbxface.c
 @@ -293,8 +293,11 @@ AcpiGetTableHeader (
  
      for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
@@ -4480,10 +4480,10 @@ Index: acpica-unix-20200214/source/components/tables/tbxface.c
          {
              continue;
          }
-Index: acpica-unix-20200214/source/components/tables/tbxfload.c
+Index: acpica-unix2-20200528/source/components/tables/tbxfload.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/tables/tbxfload.c
-+++ acpica-unix-20200214/source/components/tables/tbxfload.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbxfload.c
++++ acpica-unix2-20200528/source/components/tables/tbxfload.c
 @@ -153,6 +153,7 @@ AcpiTbLoadNamespace (
      ACPI_TABLE_DESC         *Table;
      UINT32                  TablesLoaded = 0;
@@ -4503,10 +4503,10 @@ Index: acpica-unix-20200214/source/components/tables/tbxfload.c
           ACPI_FAILURE (AcpiTbValidateTable (Table)))
      {
          Status = AE_NO_ACPI_TABLES;
-Index: acpica-unix-20200214/source/tools/acpiexec/aetables.c
+Index: acpica-unix2-20200528/source/tools/acpiexec/aetables.c
 ===================================================================
---- acpica-unix-20200214.orig/source/tools/acpiexec/aetables.c
-+++ acpica-unix-20200214/source/tools/acpiexec/aetables.c
+--- acpica-unix2-20200528.orig/source/tools/acpiexec/aetables.c
++++ acpica-unix2-20200528/source/tools/acpiexec/aetables.c
 @@ -146,21 +146,25 @@ AeInitializeTableHeader (
      char                    *Signature,
      UINT32                  Length)
@@ -4658,10 +4658,10 @@ Index: acpica-unix-20200214/source/tools/acpiexec/aetables.c
      }
  
      return (AE_OK);
-Index: acpica-unix-20200214/source/common/dmswitch.c
+Index: acpica-unix2-20200528/source/common/dmswitch.c
 ===================================================================
---- acpica-unix-20200214.orig/source/common/dmswitch.c
-+++ acpica-unix-20200214/source/common/dmswitch.c
+--- acpica-unix2-20200528.orig/source/common/dmswitch.c
++++ acpica-unix2-20200528/source/common/dmswitch.c
 @@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
      ACPI_PARSE_OBJECT_LIST  *Current;
      ACPI_PARSE_OBJECT_LIST  *Previous;
diff --git a/f23-harden.patch b/f23-harden.patch
index eacb454..5e80d46 100644
--- a/f23-harden.patch
+++ b/f23-harden.patch
@@ -8,11 +8,11 @@ From: Al Stone <ahs3@redhat.com>
  generate/unix/iasl/Makefile   |   13 +++++++------
  2 files changed, 9 insertions(+), 6 deletions(-)
 
-Index: acpica-unix-20200214/generate/unix/Makefile.config
+Index: acpica-unix2-20200528/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix-20200214.orig/generate/unix/Makefile.config
-+++ acpica-unix-20200214/generate/unix/Makefile.config
-@@ -190,6 +190,8 @@ ifneq ($(NOFORTIFY),TRUE)
+--- acpica-unix2-20200528.orig/generate/unix/Makefile.config
++++ acpica-unix2-20200528/generate/unix/Makefile.config
+@@ -189,6 +189,8 @@ ifneq ($(NOFORTIFY),TRUE)
  OPT_CFLAGS += -D_FORTIFY_SOURCE=2
  endif
  
@@ -21,10 +21,10 @@ Index: acpica-unix-20200214/generate/unix/Makefile.config
  CFLAGS += \
      -D$(ACPI_HOST)\
      -D_GNU_SOURCE\
-Index: acpica-unix-20200214/generate/unix/iasl/Makefile
+Index: acpica-unix2-20200528/generate/unix/iasl/Makefile
 ===================================================================
---- acpica-unix-20200214.orig/generate/unix/iasl/Makefile
-+++ acpica-unix-20200214/generate/unix/iasl/Makefile
+--- acpica-unix2-20200528.orig/generate/unix/iasl/Makefile
++++ acpica-unix2-20200528/generate/unix/iasl/Makefile
 @@ -358,34 +358,35 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
  # Cannot use the common compile warning flags since the C files are created
  # by the utilities above and they are not necessarily ANSI C, etc.
diff --git a/facp.patch b/facp.patch
index 8b6bef7..a8e9fe9 100644
--- a/facp.patch
+++ b/facp.patch
@@ -13,11 +13,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbinfo.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/source/common/dmtbinfo.c b/source/common/dmtbinfo.c
-index 2e1c54f84..07d3ce099 100644
---- a/source/common/dmtbinfo.c
-+++ b/source/common/dmtbinfo.c
-@@ -292,7 +292,7 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoFacs[] =
+Index: acpica-unix2-20200528/source/common/dmtbinfo.c
+===================================================================
+--- acpica-unix2-20200528.orig/source/common/dmtbinfo.c
++++ acpica-unix2-20200528/source/common/dmtbinfo.c
+@@ -184,7 +184,7 @@ ACPI_DMTABLE_INFO           AcpiDmTableI
  ACPI_DMTABLE_INFO           AcpiDmTableInfoFadt1[] =
  {
      {ACPI_DMT_UINT32,   ACPI_FADT_OFFSET (Facs),                    "FACS Address", 0},
@@ -26,6 +26,3 @@ index 2e1c54f84..07d3ce099 100644
      {ACPI_DMT_UINT8,    ACPI_FADT_OFFSET (Model),                   "Model", 0},
      {ACPI_DMT_FADTPM,   ACPI_FADT_OFFSET (PreferredProfile),        "PM Profile", 0},
      {ACPI_DMT_UINT16,   ACPI_FADT_OFFSET (SciInterrupt),            "SCI Interrupt", 0},
--- 
-2.20.1
-
diff --git a/int-format.patch b/int-format.patch
index bf0b05c..5cbb5c3 100644
--- a/int-format.patch
+++ b/int-format.patch
@@ -21,11 +21,11 @@ From: Al Stone <ahs3@redhat.com>
  source/components/utilities/utownerid.c |    2 +-
  18 files changed, 28 insertions(+), 28 deletions(-)
 
-Index: acpica-unix-20191018/source/compiler/aslerror.c
+Index: acpica-unix2-20200528/source/compiler/aslerror.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslerror.c
-+++ acpica-unix-20191018/source/compiler/aslerror.c
-@@ -898,7 +898,7 @@ AslLogNewError (
+--- acpica-unix2-20200528.orig/source/compiler/aslerror.c
++++ acpica-unix2-20200528/source/compiler/aslerror.c
+@@ -917,7 +917,7 @@ AslLogNewError (
      AslGbl_ExceptionCount[ModifiedLevel]++;
      if (!AslGbl_IgnoreErrors && AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
      {
@@ -34,10 +34,10 @@ Index: acpica-unix-20191018/source/compiler/aslerror.c
  
          AslGbl_SourceLine = 0;
          AslGbl_NextError = AslGbl_ErrorLog;
-Index: acpica-unix-20191018/source/compiler/aslopt.c
+Index: acpica-unix2-20200528/source/compiler/aslopt.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslopt.c
-+++ acpica-unix-20191018/source/compiler/aslopt.c
+--- acpica-unix2-20200528.orig/source/compiler/aslopt.c
++++ acpica-unix2-20200528/source/compiler/aslopt.c
 @@ -583,7 +583,7 @@ OptOptimizeNamePath (
      }
  
@@ -47,10 +47,10 @@ Index: acpica-unix-20191018/source/compiler/aslopt.c
          Op->Asl.LogicalLineNumber,
          AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
          AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
-Index: acpica-unix-20191018/source/compiler/aslprepkg.c
+Index: acpica-unix2-20200528/source/compiler/aslprepkg.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslprepkg.c
-+++ acpica-unix-20191018/source/compiler/aslprepkg.c
+--- acpica-unix2-20200528.orig/source/compiler/aslprepkg.c
++++ acpica-unix2-20200528/source/compiler/aslprepkg.c
 @@ -309,7 +309,7 @@ ApCheckPackage (
  
          if (Count & 1)
@@ -60,10 +60,10 @@ Index: acpica-unix-20191018/source/compiler/aslprepkg.c
                  Predefined->Info.Name, Count);
  
              AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
-Index: acpica-unix-20191018/source/components/debugger/dbexec.c
+Index: acpica-unix2-20200528/source/components/debugger/dbexec.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/debugger/dbexec.c
-+++ acpica-unix-20191018/source/components/debugger/dbexec.c
+--- acpica-unix2-20200528.orig/source/components/debugger/dbexec.c
++++ acpica-unix2-20200528/source/components/debugger/dbexec.c
 @@ -230,7 +230,7 @@ AcpiDbExecuteMethod (
              ACPI_ERROR ((AE_INFO,
                  "Possible buffer overflow within AML Debugger "
@@ -73,10 +73,10 @@ Index: acpica-unix-20191018/source/components/debugger/dbexec.c
          }
      }
  
-Index: acpica-unix-20191018/source/components/dispatcher/dsmthdat.c
+Index: acpica-unix2-20200528/source/components/dispatcher/dsmthdat.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/dispatcher/dsmthdat.c
-+++ acpica-unix-20191018/source/components/dispatcher/dsmthdat.c
+--- acpica-unix2-20200528.orig/source/components/dispatcher/dsmthdat.c
++++ acpica-unix2-20200528/source/components/dispatcher/dsmthdat.c
 @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
          if (Index > ACPI_METHOD_MAX_LOCAL)
          {
@@ -95,10 +95,10 @@ Index: acpica-unix-20191018/source/components/dispatcher/dsmthdat.c
                  Index, ACPI_METHOD_MAX_ARG));
              return_ACPI_STATUS (AE_AML_INVALID_INDEX);
          }
-Index: acpica-unix-20191018/source/components/dispatcher/dsutils.c
+Index: acpica-unix2-20200528/source/components/dispatcher/dsutils.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix-20191018/source/components/dispatcher/dsutils.c
+--- acpica-unix2-20200528.orig/source/components/dispatcher/dsutils.c
++++ acpica-unix2-20200528/source/components/dispatcher/dsutils.c
 @@ -786,7 +786,7 @@ AcpiDsCreateOperands (
      }
  
@@ -108,10 +108,10 @@ Index: acpica-unix-20191018/source/components/dispatcher/dsutils.c
          WalkState->NumOperands, ArgCount, Index));
  
      /* Create the interpreter arguments, in reverse order */
-Index: acpica-unix-20191018/source/components/dispatcher/dswscope.c
+Index: acpica-unix2-20200528/source/components/dispatcher/dswscope.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/dispatcher/dswscope.c
-+++ acpica-unix-20191018/source/components/dispatcher/dswscope.c
+--- acpica-unix2-20200528.orig/source/components/dispatcher/dswscope.c
++++ acpica-unix2-20200528/source/components/dispatcher/dswscope.c
 @@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
      WalkState->ScopeDepth++;
  
@@ -130,10 +130,10 @@ Index: acpica-unix-20191018/source/components/dispatcher/dswscope.c
          (UINT32) WalkState->ScopeDepth,
          AcpiUtGetNodeName (ScopeInfo->Scope.Node),
          AcpiUtGetTypeName (ScopeInfo->Common.Value)));
-Index: acpica-unix-20191018/source/components/events/evgpe.c
+Index: acpica-unix2-20200528/source/components/events/evgpe.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/events/evgpe.c
-+++ acpica-unix-20191018/source/components/events/evgpe.c
+--- acpica-unix2-20200528.orig/source/components/events/evgpe.c
++++ acpica-unix2-20200528/source/components/events/evgpe.c
 @@ -488,7 +488,7 @@ AcpiEvGpeDetect (
                      "Ignore disabled registers for GPE %02X-%02X: "
                      "RunEnable=%02X, WakeEnable=%02X\n",
@@ -143,10 +143,10 @@ Index: acpica-unix-20191018/source/components/events/evgpe.c
                      GpeRegisterInfo->EnableForRun,
                      GpeRegisterInfo->EnableForWake));
                  continue;
-Index: acpica-unix-20191018/source/components/executer/exdump.c
+Index: acpica-unix2-20200528/source/components/executer/exdump.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/executer/exdump.c
-+++ acpica-unix-20191018/source/components/executer/exdump.c
+--- acpica-unix2-20200528.orig/source/components/executer/exdump.c
++++ acpica-unix2-20200528/source/components/executer/exdump.c
 @@ -678,7 +678,7 @@ AcpiExDumpOperand (
      if (Depth > 0)
      {
@@ -156,10 +156,10 @@ Index: acpica-unix-20191018/source/components/executer/exdump.c
      }
      else
      {
-Index: acpica-unix-20191018/source/components/executer/exfldio.c
+Index: acpica-unix2-20200528/source/components/executer/exfldio.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/executer/exfldio.c
-+++ acpica-unix-20191018/source/components/executer/exfldio.c
+--- acpica-unix2-20200528.orig/source/components/executer/exfldio.c
++++ acpica-unix2-20200528/source/components/executer/exfldio.c
 @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
  
              ACPI_ERROR ((AE_INFO,
@@ -171,10 +171,10 @@ Index: acpica-unix-20191018/source/components/executer/exfldio.c
              return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
          }
      }
-Index: acpica-unix-20191018/source/components/executer/exnames.c
+Index: acpica-unix2-20200528/source/components/executer/exnames.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/executer/exnames.c
-+++ acpica-unix-20191018/source/components/executer/exnames.c
+--- acpica-unix2-20200528.orig/source/components/executer/exnames.c
++++ acpica-unix2-20200528/source/components/executer/exnames.c
 @@ -237,7 +237,7 @@ AcpiExNameSegment (
           */
          ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
@@ -193,10 +193,10 @@ Index: acpica-unix-20191018/source/components/executer/exnames.c
      }
  
      *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
-Index: acpica-unix-20191018/source/components/hardware/hwregs.c
+Index: acpica-unix2-20200528/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/hardware/hwregs.c
-+++ acpica-unix-20191018/source/components/hardware/hwregs.c
+--- acpica-unix2-20200528.orig/source/components/hardware/hwregs.c
++++ acpica-unix2-20200528/source/components/hardware/hwregs.c
 @@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
  
  
@@ -206,10 +206,10 @@ Index: acpica-unix-20191018/source/components/hardware/hwregs.c
          ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
  
      LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
-Index: acpica-unix-20191018/source/components/tables/tbfadt.c
+Index: acpica-unix2-20200528/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbfadt.c
-+++ acpica-unix-20191018/source/components/tables/tbfadt.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbfadt.c
++++ acpica-unix2-20200528/source/components/tables/tbfadt.c
 @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
          if (!(Flags & ACPI_FADT_GPE_REGISTER))
          {
@@ -237,10 +237,10 @@ Index: acpica-unix-20191018/source/components/tables/tbfadt.c
                          Name, Address32,
                          ACPI_FORMAT_UINT64 (Address64->Address),
                          AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
-Index: acpica-unix-20191018/source/components/tables/tbxfroot.c
+Index: acpica-unix2-20200528/source/components/tables/tbxfroot.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbxfroot.c
-+++ acpica-unix-20191018/source/components/tables/tbxfroot.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbxfroot.c
++++ acpica-unix2-20200528/source/components/tables/tbxfroot.c
 @@ -177,7 +177,7 @@ AcpiFindRootPointer (
      {
          ACPI_ERROR ((AE_INFO,
@@ -268,10 +268,10 @@ Index: acpica-unix-20191018/source/components/tables/tbxfroot.c
  
          return_ACPI_STATUS (AE_NO_MEMORY);
      }
-Index: acpica-unix-20191018/source/components/utilities/utownerid.c
+Index: acpica-unix2-20200528/source/components/utilities/utownerid.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/utilities/utownerid.c
-+++ acpica-unix-20191018/source/components/utilities/utownerid.c
+--- acpica-unix2-20200528.orig/source/components/utilities/utownerid.c
++++ acpica-unix2-20200528/source/components/utilities/utownerid.c
 @@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
      else
      {
diff --git a/sources b/sources
index ef5e62e..400e9a2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20200326.tar.gz) = 5028fae5c976593b15cf429e62de30afef3af11ddac9351d9ec0de789d495b553d459e676bc4d3e862edc0c536487a7ee63a137d95c5d1783e6a17ab9114c202
-SHA512 (acpitests-unix-20200326.tar.gz) = 332b4ed016cee48662a5f4572e6d170461f02ee1386109a3970fbe8d104f2a2b14c19235ea43ae9b26e8faf9ef9597cb3d2148e498741361aca62978d0b62189
+SHA512 (acpica-unix2-20200430.tar.gz) = e6af40eba35ae2cee976267c1cccbdbe70ef038e217ffd4335585d0ffba323b50703546cb0b32d10ffc90ba7f90f6df9a34170155d7256b9fffdd7859b40cd11
+SHA512 (acpitests-unix-20200430.tar.gz) = f0c660f1dda45b89633da47d23b3c13b3865414bfa8b12af137d7d4de0e7ccb690aeee9c5fbe480801b5dc921c96af80054608d381a47637893d82d3a003467d