Changeset 8565a42 in mainline for kernel/arch/riscv64/src/mm/frame.c
- Timestamp:
- 2018-03-02T20:34:50Z (8 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
-
kernel/arch/riscv64/src/mm/frame.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/riscv64/src/mm/frame.c
r3061bc1 r8565a42 56 56 pfn_t minconf = 57 57 max3(ADDR2PFN(physmem_start), htif_frame + 1, pt_frame + 1); 58 58 59 59 for (size_t i = 0; i < memmap.cnt; i++) { 60 60 /* To be safe, make the available zone possibly smaller */ … … 63 63 size_t size = ALIGN_DOWN(memmap.zones[i].size - 64 64 (base - ((uintptr_t) memmap.zones[i].start)), FRAME_SIZE); 65 65 66 66 if (!frame_adjust_zone_bounds(low, &base, &size)) 67 67 return; 68 68 69 69 pfn_t pfn = ADDR2PFN(base); 70 70 size_t count = SIZE2FRAMES(size); 71 71 pfn_t conf; 72 72 73 73 if (low) { 74 74 if ((minconf < pfn) || (minconf >= pfn + count)) … … 76 76 else 77 77 conf = minconf; 78 78 79 79 zone_create(pfn, count, conf, 80 80 ZONE_AVAILABLE | ZONE_LOWMEM); … … 91 91 { 92 92 frame_common_arch_init(true); 93 93 94 94 frame_mark_unavailable(htif_frame, 1); 95 95 frame_mark_unavailable(pt_frame, 1);
Note:
See TracChangeset
for help on using the changeset viewer.
