Changeset bb6f135 in mainline for kernel/generic/src/mm/km.c
- Timestamp:
- 2012-02-09T22:19:06Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- e10d41a
- Parents:
- 3d4750f (diff), 492ddc9 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/mm/km.c
r3d4750f rbb6f135 134 134 ASSERT(ALIGN_UP(size, FRAME_SIZE) == size); 135 135 136 /* Enforce natural or at least PAGE_SIZE alignment. */ 136 137 align = ispwr2(size) ? size : (1U << (fnzb(size) + 1)); 137 138 vaddr = km_page_alloc(size, max(PAGE_SIZE, align)); … … 150 151 { 151 152 uintptr_t offs; 153 size_t align; 152 154 ipl_t ipl; 153 155 … … 168 170 page_table_unlock(AS_KERNEL, true); 169 171 170 km_page_free(vaddr, size); 172 /* 173 * Match the size parameter with that of km_page_alloc() in 174 * km_map_aligned(). 175 */ 176 align = ispwr2(size) ? size : (1U << (fnzb(size) + 1)); 177 km_page_free(vaddr, max(PAGE_SIZE, align)); 171 178 } 172 179
Note:
See TracChangeset
for help on using the changeset viewer.