Changeset 5892ec1 in mainline


Ignore:
Timestamp:
2012-11-07T11:01:22Z (12 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c387838
Parents:
9a9c805
Message:

Rename AS_AREA_NORESERVE to AS_AREA_LATE_RESERVE.

This reflects the fact that we still reserve memory for these areas,
but the reservation is done late during the page fault.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • abi/include/mm/as.h

    r9a9c805 r5892ec1  
    3737
    3838/** Address space area flags. */
    39 #define AS_AREA_READ       0x01
    40 #define AS_AREA_WRITE      0x02
    41 #define AS_AREA_EXEC       0x04
    42 #define AS_AREA_CACHEABLE  0x08
    43 #define AS_AREA_GUARD      0x10
    44 #define AS_AREA_NORESERVE 0x20
     39#define AS_AREA_READ         0x01
     40#define AS_AREA_WRITE        0x02
     41#define AS_AREA_EXEC         0x04
     42#define AS_AREA_CACHEABLE    0x08
     43#define AS_AREA_GUARD        0x10
     44#define AS_AREA_LATE_RESERVE 0x20
    4545
    4646/** Address space area info exported to uspace. */
  • kernel/generic/src/mm/backend_anon.c

    r9a9c805 r5892ec1  
    7474bool anon_create(as_area_t *area)
    7575{
    76         if (area->flags & AS_AREA_NORESERVE)
     76        if (area->flags & AS_AREA_LATE_RESERVE)
    7777                return true;
    7878
     
    8282bool anon_resize(as_area_t *area, size_t new_pages)
    8383{
    84         if (area->flags & AS_AREA_NORESERVE)
     84        if (area->flags & AS_AREA_LATE_RESERVE)
    8585                return true;
    8686
     
    106106        ASSERT(mutex_locked(&area->as->lock));
    107107        ASSERT(mutex_locked(&area->lock));
    108         ASSERT(!(area->flags & AS_AREA_NORESERVE));
     108        ASSERT(!(area->flags & AS_AREA_LATE_RESERVE));
    109109
    110110        /*
     
    146146void anon_destroy(as_area_t *area)
    147147{
    148         if (area->flags & AS_AREA_NORESERVE)
     148        if (area->flags & AS_AREA_LATE_RESERVE)
    149149                return;
    150150
     
    236236                 */
    237237
    238                 if (area->flags & AS_AREA_NORESERVE) {
     238                if (area->flags & AS_AREA_LATE_RESERVE) {
    239239                        /*
    240240                         * Reserve the memory for this page now.
     
    274274        ASSERT(mutex_locked(&area->lock));
    275275
    276         if (area->flags & AS_AREA_NORESERVE) {
    277                 /*
    278                  * In case of the NORESERVE areas, physical memory will not be
    279                  * unreserved when the area is destroyed so we need to use the
    280                  * normal unreserving frame_free().
     276        if (area->flags & AS_AREA_LATE_RESERVE) {
     277                /*
     278                 * In case of the late reserve areas, physical memory will not
     279                 * be unreserved when the area is destroyed so we need to use
     280                 * the normal unreserving frame_free().
    281281                 */
    282282                frame_free(frame);
  • uspace/lib/c/generic/fibril.c

    r9a9c805 r5892ec1  
    274274            FIBRIL_INITIAL_STACK_PAGES_NO * getpagesize(),
    275275            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD |
    276             AS_AREA_NORESERVE);
     276            AS_AREA_LATE_RESERVE);
    277277        if (fibril->stack == (void *) -1) {
    278278                fibril_teardown(fibril);
Note: See TracChangeset for help on using the changeset viewer.