Changeset 3bacee1 in mainline for kernel/generic/src/mm/frame.c
- Timestamp:
- 2018-04-12T16:27:17Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 3cf22f9
- Parents:
- 76d0981d
- git-author:
- Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)
- git-committer:
- Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/mm/frame.c
r76d0981d r3bacee1 198 198 size_t i = hint; 199 199 do { 200 if ((zones.info[i].base <= frame) 201 &&(zones.info[i].base + zones.info[i].count >= frame + count))200 if ((zones.info[i].base <= frame) && 201 (zones.info[i].base + zones.info[i].count >= frame + count)) 202 202 return i; 203 203 … … 551 551 552 552 pfn_t cframes = SIZE2FRAMES(zone_conf_size( 553 zones.info[z2].base - zones.info[z1].base 554 +zones.info[z2].count));553 zones.info[z2].base - zones.info[z1].base + 554 zones.info[z2].count)); 555 555 556 556 /* Allocate merged zone data inside one of the zones */ … … 704 704 * the assert 705 705 */ 706 assert(confframe != ADDR2PFN((uintptr_t 706 assert(confframe != ADDR2PFN((uintptr_t) NULL)); 707 707 708 708 /* Update the known end of physical memory. */ … … 1206 1206 size_t free_highprio = 0; 1207 1207 1208 for (size_t i = 0; ; i++) {1208 for (size_t i = 0; ; i++) { 1209 1209 irq_spinlock_lock(&zones.lock, true); 1210 1210
Note:
See TracChangeset
for help on using the changeset viewer.