Changeset bb6f135 in mainline for kernel/generic/src/mm/km.c

Timestamp:

2012-02-09T22:19:06Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e10d41a

Parents:

3d4750f (diff), 492ddc9 (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/generic/src/mm/km.c (modified) (3 diffs)

kernel/generic/src/mm/km.c

@@ -134 +134 @@
         ASSERT(ALIGN_UP(size, FRAME_SIZE) == size);
 
+        /* Enforce natural or at least PAGE_SIZE alignment. */
         align = ispwr2(size) ? size : (1U << (fnzb(size) + 1));
         vaddr = km_page_alloc(size, max(PAGE_SIZE, align));
@@ -150 +151 @@
 {
         uintptr_t offs;
+        size_t align;
         ipl_t ipl;
 
@@ -168 +170 @@
         page_table_unlock(AS_KERNEL, true);
 
-        km_page_free(vaddr, size);
+        /*
+         * Match the size parameter with that of km_page_alloc() in
+         * km_map_aligned().
+         */
+        align = ispwr2(size) ? size : (1U << (fnzb(size) + 1));
+        km_page_free(vaddr, max(PAGE_SIZE, align));
 }