Changeset 3fe58d3c in mainline for kernel/generic/src/mm/page.c

Timestamp:

2012-01-20T22:35:26Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e86b8f0

Parents:

321052f7 (diff), 7943c43 (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/page.c (modified) (1 diff)

kernel/generic/src/mm/page.c

@@ -202 +202 @@
         asize = ALIGN_UP(size, PAGE_SIZE);
         align = ispwr2(size) ? size : (1U << (fnzb(size) + 1));
-        virtaddr = km_page_alloc(asize, align);
+        virtaddr = km_page_alloc(asize, max(PAGE_SIZE, align));
 
         page_table_lock(AS_KERNEL, true);