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

Timestamp:

2012-02-10T09:54:10Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

03934c9e, 591762c6, cfb79747, edd7c63c

Parents:

bb6f135 (diff), 96d9cdd (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) (2 diffs)

kernel/generic/src/mm/km.c

@@ -151 +151 @@
 {
         uintptr_t offs;
-        size_t align;
         ipl_t ipl;
 
@@ -170 +169 @@
         page_table_unlock(AS_KERNEL, true);
 
-        /*
-         * 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));
+        km_page_free(vaddr, size);
 }