- updated to 20220331 + current Fedora patch set; acpinames is gone

[packages/acpica.git] / ptr-cast.patch

diff --git a/ptr-cast.patch b/ptr-cast.patch
index 6112cc830d80d5b3c0264e8efbd4da4bcc9e8cc5..0a244291d28d659298e153b2752e33086cf0570a 100644 (file)
--- a/ptr-cast.patch
+++ b/ptr-cast.patch
@@ -1,12 +1,12 @@
-Index: acpica-unix-20191213/source/components/tables/tbutils.c
+Index: acpica-unix2-20220331/source/components/tables/tbutils.c
 ===================================================================
---- acpica-unix-20191213.orig/source/components/tables/tbutils.c
-+++ acpica-unix-20191213/source/components/tables/tbutils.c
+--- acpica-unix2-20220331.orig/source/components/tables/tbutils.c
++++ acpica-unix2-20220331/source/components/tables/tbutils.c
 @@ -238,9 +238,11 @@ AcpiTbGetRootTableEntry (
           * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
           *  return 64-bit
           */
--      Address64 = (UINT64) TableEntry;
+-        ACPI_MOVE_64_TO_64 (&Address64, TableEntry);
  
  #if ACPI_MACHINE_WIDTH == 32
 +      UINT32 Tmp32 = (UINT32) TableEntry;
@@ -15,7 +15,7 @@ Index: acpica-unix-20191213/source/components/tables/tbutils.c
          if (Address64 > ACPI_UINT32_MAX)
          {
              /* Will truncate 64-bit address to 32 bits, issue warning */
-@@ -250,9 +252,15 @@ AcpiTbGetRootTableEntry (
+@@ -250,8 +252,14 @@ AcpiTbGetRootTableEntry (
                  " truncating",
                  ACPI_FORMAT_UINT64 (Address64)));
          }
@@ -26,17 +26,16 @@ Index: acpica-unix-20191213/source/components/tables/tbutils.c
 +#else
 +      Address64 = (UINT64) TableEntry;
 +
-         return ((ACPI_PHYSICAL_ADDRESS) (*ACPI_CAST_PTR (
-             UINT64, Address64)));
+         return ((ACPI_PHYSICAL_ADDRESS) (Address64));
 +#endif
      }
  }
  
-Index: acpica-unix-20191213/source/compiler/aslparseop.c
+Index: acpica-unix2-20220331/source/compiler/aslparseop.c
 ===================================================================
---- acpica-unix-20191213.orig/source/compiler/aslparseop.c
-+++ acpica-unix-20191213/source/compiler/aslparseop.c
-@@ -287,7 +287,11 @@ TrCreateValuedLeafOp (
+--- acpica-unix2-20220331.orig/source/compiler/aslparseop.c
++++ acpica-unix2-20220331/source/compiler/aslparseop.c
+@@ -289,7 +289,11 @@ TrCreateValuedLeafOp (
          ParseOpcode == PARSEOP_NAMESEG ||
          ParseOpcode == PARSEOP_STRING_LITERAL)
      {