Changeset 315b7e3 in mainline
- Timestamp:
- 2015-06-04T14:12:19Z (10 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 7ec3c56
- Parents:
- 09024119
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/mm/as.c
r09024119 r315b7e3 834 834 if ((cond = (bool) node->keys)) { 835 835 uintptr_t ptr = node->key[node->keys - 1]; 836 size_t size =836 size_t node_size = 837 837 (size_t) node->value[node->keys - 1]; 838 838 size_t i = 0; 839 839 840 if (overlaps(ptr, P2SZ( size), area->base,840 if (overlaps(ptr, P2SZ(node_size), area->base, 841 841 P2SZ(pages))) { 842 842 843 if (ptr + P2SZ( size) <= start_free) {843 if (ptr + P2SZ(node_size) <= start_free) { 844 844 /* 845 845 * The whole interval fits … … 860 860 i = (start_free - ptr) >> PAGE_WIDTH; 861 861 if (!used_space_remove(area, start_free, 862 size - i))862 node_size - i)) 863 863 panic("Cannot remove used space."); 864 864 } else { … … 867 867 * completely removed. 868 868 */ 869 if (!used_space_remove(area, ptr, size))869 if (!used_space_remove(area, ptr, node_size)) 870 870 panic("Cannot remove used space."); 871 871 } … … 887 887 area->pages - pages); 888 888 889 for (; i < size; i++) {889 for (; i < node_size; i++) { 890 890 pte_t *pte = page_mapping_find(as, 891 891 ptr + P2SZ(i), false);
Note:
See TracChangeset
for help on using the changeset viewer.