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

Timestamp:

2012-02-12T08:53:40Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

cd00f93

Parents:

50601ef (diff), e10d41a (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 with mainline

File:

• kernel/generic/src/mm/km.c (modified) (1 diff)

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