Changeset 3d4750f in mainline for kernel/genarch/src/acpi/acpi.c

Timestamp:

2012-01-31T22:52:06Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

512a7df, 70922c2, b7068da, bb6f135

Parents:

bf31e3f (diff), 7b5789e (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 from lp:~jakub/helenos/mm.

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);