Changeset 492ddc9 in mainline

Timestamp:

2012-02-09T22:15:46Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

96d9cdd, bb6f135

Parents:

33ca0f5

Message:

Match km_page_free() size parameter in km_unmap_aligned() with that of
km_page_alloc() in km_map_aligned().

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