1 files changed, 10 insertions, 13 deletions

diff --git a/sys/contrib/dev/acpica/tbconvrt.c b/sys/contrib/dev/acpica/tbconvrt.c
index c3502e5..502fb6d 100644
--- a/sys/contrib/dev/acpica/tbconvrt.c
+++ b/sys/contrib/dev/acpica/tbconvrt.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: tbconvrt - ACPI Table conversion utilities
- *              $Revision: 52 $
+ *              $Revision: 54 $
  *
  *****************************************************************************/
 
@@ -149,14 +149,11 @@ AcpiTbGetTableCount (
     ACPI_FUNCTION_ENTRY ();
 
 
-#if ACPI_MACHINE_WIDTH != 64
-
     if (RSDP->Revision < 2)
     {
         PointerSize = sizeof (UINT32);
     }
     else
-#endif
     {
         PointerSize = sizeof (UINT64);
     }
@@ -211,7 +208,7 @@ AcpiTbConvertToXsdt (
     /* Copy the header and set the length */
 
     ACPI_MEMCPY (NewTable, TableInfo->Pointer, sizeof (ACPI_TABLE_HEADER));
-    NewTable->Header.Length = (UINT32) TableSize;
+    NewTable->Length = (UINT32) TableSize;
 
     /* Copy the table pointers */
 
@@ -526,20 +523,20 @@ AcpiTbConvertTableFadt (void)
      * FADT length and version validation.  The table must be at least as
      * long as the version 1.0 FADT
      */
-    if (AcpiGbl_FADT->Header.Length < sizeof (FADT_DESCRIPTOR_REV1))
+    if (AcpiGbl_FADT->Length < sizeof (FADT_DESCRIPTOR_REV1))
     {
-        ACPI_REPORT_ERROR (("Invalid FADT table length: 0x%X\n", AcpiGbl_FADT->Header.Length));
+        ACPI_REPORT_ERROR (("Invalid FADT table length: 0x%X\n", AcpiGbl_FADT->Length));
         return_ACPI_STATUS (AE_INVALID_TABLE_LENGTH);
     }
 
-    if (AcpiGbl_FADT->Header.Revision >= FADT2_REVISION_ID)
+    if (AcpiGbl_FADT->Revision >= FADT2_REVISION_ID)
     {
-        if (AcpiGbl_FADT->Header.Length < sizeof (FADT_DESCRIPTOR_REV2))
+        if (AcpiGbl_FADT->Length < sizeof (FADT_DESCRIPTOR_REV2))
         {
             /* Length is too short to be a V2.0 table */
 
             ACPI_REPORT_WARNING (("Inconsistent FADT length (0x%X) and revision (0x%X), using FADT V1.0 portion of table\n",
-                        AcpiGbl_FADT->Header.Length, AcpiGbl_FADT->Header.Revision));
+                        AcpiGbl_FADT->Length, AcpiGbl_FADT->Revision));
 
             AcpiTbConvertFadt1 (LocalFadt, (void *) AcpiGbl_FADT);
         }
@@ -561,7 +558,7 @@ AcpiTbConvertTableFadt (void)
      * Global FADT pointer will point to the new common V2.0 FADT
      */
     AcpiGbl_FADT = LocalFadt;
-    AcpiGbl_FADT->Header.Length = sizeof (FADT_DESCRIPTOR);
+    AcpiGbl_FADT->Length = sizeof (FADT_DESCRIPTOR);
 
     /* Free the original table */
 
@@ -578,8 +575,8 @@ AcpiTbConvertTableFadt (void)
 
     ACPI_DEBUG_PRINT ((ACPI_DB_TABLES,
         "Hex dump of common internal FADT, size %d (%X)\n",
-        AcpiGbl_FADT->Header.Length, AcpiGbl_FADT->Header.Length));
-    ACPI_DUMP_BUFFER ((UINT8 *) (AcpiGbl_FADT), AcpiGbl_FADT->Header.Length);
+        AcpiGbl_FADT->Length, AcpiGbl_FADT->Length));
+    ACPI_DUMP_BUFFER ((UINT8 *) (AcpiGbl_FADT), AcpiGbl_FADT->Length);
 
     return_ACPI_STATUS (AE_OK);
 }