Changeset 25eec4e in mainline for kernel/generic/include/mm/as.h


Ignore:
Timestamp:
2013-04-19T18:38:18Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6d717a4
Parents:
a1e2df13 (diff), 289cb7dd (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 mainline chages.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/include/mm/as.h

    ra1e2df13 r25eec4e  
    6161#define USER_ADDRESS_SPACE_END      USER_ADDRESS_SPACE_END_ARCH
    6262
    63 #ifdef USTACK_ADDRESS_ARCH
    64         #define USTACK_ADDRESS  USTACK_ADDRESS_ARCH
    65 #else
    66         #define USTACK_ADDRESS  (USER_ADDRESS_SPACE_END - (STACK_SIZE - 1))
    67 #endif
    68 
    6963/** Kernel address space. */
    7064#define FLAG_AS_KERNEL  (1 << 0)
     
    7468#define AS_AREA_ATTR_PARTIAL  1  /**< Not fully initialized area. */
    7569
     70/** The page fault was resolved by as_page_fault(). */
     71#define AS_PF_OK     0
     72
     73/** The page fault was caused by memcpy_from_uspace() or memcpy_to_uspace(). */
     74#define AS_PF_DEFER  1
     75
    7676/** The page fault was not resolved by as_page_fault(). */
    77 #define AS_PF_FAULT  0
    78 
    79 /** The page fault was resolved by as_page_fault(). */
    80 #define AS_PF_OK  1
    81 
    82 /** The page fault was caused by memcpy_from_uspace() or memcpy_to_uspace(). */
    83 #define AS_PF_DEFER  2
     77#define AS_PF_FAULT  2
     78
     79/** The page fault was not resolved by as_page_fault(). Non-verbose version. */
     80#define AS_PF_SILENT 3
    8481
    8582/** Address space structure.
     
    224221        void (* destroy)(as_area_t *);
    225222
     223        bool (* is_resizable)(as_area_t *);
     224        bool (* is_shareable)(as_area_t *);
     225
    226226        int (* page_fault)(as_area_t *, uintptr_t, pf_access_t);
    227227        void (* frame_free)(as_area_t *, uintptr_t, uintptr_t);
Note: See TracChangeset for help on using the changeset viewer.