Changeset eaeb056 in mainline for kernel/generic/src/mm/backend_anon.c


Ignore:
Timestamp:
2011-05-22T20:05:26Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
34efa8a
Parents:
9ea8fdb4 (diff), 2bdf8313 (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.
Message:

Merge from lp:~jakub/helenos/mm.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/mm/backend_anon.c

    r9ea8fdb4 reaeb056  
    122122                                page_table_lock(area->as, false);
    123123                                pte = page_mapping_find(area->as,
    124                                     base + j * PAGE_SIZE);
     124                                    base + P2SZ(j), false);
    125125                                ASSERT(pte && PTE_VALID(pte) &&
    126126                                    PTE_PRESENT(pte));
    127127                                btree_insert(&area->sh_info->pagemap,
    128                                     (base + j * PAGE_SIZE) - area->base,
     128                                    (base + P2SZ(j)) - area->base,
    129129                                    (void *) PTE_GET_FRAME(pte), NULL);
    130130                                page_table_unlock(area->as, false);
Note: See TracChangeset for help on using the changeset viewer.