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

Timestamp:

2012-02-14T20:21:33Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dd22cc4

Parents:

b7068da (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 mainline changes

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