Changeset 8565a42 in mainline for boot/generic/src/balloc.c
- Timestamp:
- 2018-03-02T20:34:50Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a1a81f69, d5e5fd1
- Parents:
- 3061bc1 (diff), 34e1206 (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. - git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)
- git-committer:
- GitHub <noreply@…> (2018-03-02 20:34:50)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/generic/src/balloc.c
r3061bc1 r8565a42 49 49 if (alignment == 0) 50 50 return NULL; 51 51 52 52 /* Enforce minimal alignment. */ 53 53 alignment = ALIGN_UP(alignment, 4); 54 54 55 55 uintptr_t addr = phys_base + ALIGN_UP(ballocs->size, alignment); 56 56 57 57 if (ALIGN_UP(ballocs->size, alignment) + size >= max_size) 58 58 return NULL; 59 59 60 60 ballocs->size = ALIGN_UP(ballocs->size, alignment) + size; 61 61 62 62 return (void *) addr; 63 63 }
Note:
See TracChangeset
for help on using the changeset viewer.