Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/acpica/dist/tables Don't unmap Rsdp until w...



details:   https://anonhg.NetBSD.org/src/rev/c84c93623382
branches:  trunk
changeset: 327898:c84c93623382
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Mar 20 13:40:02 2014 +0000

description:
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...

diffstat:

 sys/external/bsd/acpica/dist/tables/tbutils.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (29 lines):

diff -r b94840c091c0 -r c84c93623382 sys/external/bsd/acpica/dist/tables/tbutils.c
--- a/sys/external/bsd/acpica/dist/tables/tbutils.c     Thu Mar 20 13:34:35 2014 +0000
+++ b/sys/external/bsd/acpica/dist/tables/tbutils.c     Thu Mar 20 13:40:02 2014 +0000
@@ -545,12 +545,6 @@
     }
 
     /*
-     * 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 @@
         }
     }
 
+    /*
+     * 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));



Home | Main Index | Thread Index | Old Index