Changeset 512a7df in mainline for kernel/genarch/src/acpi/acpi.c

Timestamp:

2012-02-01T19:17:43Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

565b6ff

Parents:

1d69c69 (diff), 3d4750f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

• kernel/genarch/src/acpi/acpi.c (modified) (1 diff)

kernel/genarch/src/acpi/acpi.c

@@ -102 +102 @@
 
         /* Start with mapping the header only. */
-        vhdr = (struct acpi_sdt_header *) km_map_structure((uintptr_t) psdt,
+        vhdr = (struct acpi_sdt_header *) km_map((uintptr_t) psdt,
             sizeof(struct acpi_sdt_header), PAGE_READ | PAGE_NOT_CACHEABLE); 
 
         /* Now we can map the entire structure. */
-        vsdt = (struct acpi_sdt_header *) km_map_structure((uintptr_t) psdt,
+        vsdt = (struct acpi_sdt_header *) km_map((uintptr_t) psdt,
             vhdr->length, PAGE_WRITE | PAGE_NOT_CACHEABLE);