Module Name:    src
Committed By:   riastradh
Date:           Thu Mar 20 13:40:02 UTC 2014

Modified Files:
        src/sys/external/bsd/acpica/dist/tables: tbutils.c

Log Message:
Don't unmap Rsdp until we've finished using it.

XXX Let me know how this is supposed to be upstreamed if you know and
have time...


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/tables/tbutils.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/acpica/dist/tables/tbutils.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbutils.c:1.4 src/sys/external/bsd/acpica/dist/tables/tbutils.c:1.5
--- src/sys/external/bsd/acpica/dist/tables/tbutils.c:1.4	Fri Dec 27 18:50:57 2013
+++ src/sys/external/bsd/acpica/dist/tables/tbutils.c	Thu Mar 20 13:40:02 2014
@@ -545,12 +545,6 @@ AcpiTbParseRootTable (
     }
 
     /*
-     * It is not possible to map more than one entry in some environments,
-     * so unmap the RSDP here before mapping other tables
-     */
-    AcpiOsUnmapMemory (Rsdp, sizeof (ACPI_TABLE_RSDP));
-
-    /*
      * If it is present and used, validate the XSDT for access/size
      * and ensure that all table entries are at least non-NULL
      */
@@ -569,6 +563,12 @@ AcpiTbParseRootTable (
         }
     }
 
+    /*
+     * It is not possible to map more than one entry in some environments,
+     * so unmap the RSDP here before mapping other tables
+     */
+    AcpiOsUnmapMemory (Rsdp, sizeof (ACPI_TABLE_RSDP));
+
     /* Map the RSDT/XSDT table header to get the full table length */
 
     Table = AcpiOsMapMemory (Address, sizeof (ACPI_TABLE_HEADER));

Reply via email to