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

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:

• kernel/generic/include/mm/as.h (modified) (3 diffs)

kernel/generic/include/mm/as.h

@@ -61 +61 @@
 #define USER_ADDRESS_SPACE_END      USER_ADDRESS_SPACE_END_ARCH
 
-#ifdef USTACK_ADDRESS_ARCH
-        #define USTACK_ADDRESS  USTACK_ADDRESS_ARCH
-#else
-        #define USTACK_ADDRESS  (USER_ADDRESS_SPACE_END - (STACK_SIZE - 1))
-#endif
-
 /** Kernel address space. */
 #define FLAG_AS_KERNEL  (1 << 0)
@@ -74 +68 @@
 #define AS_AREA_ATTR_PARTIAL  1  /**< Not fully initialized area. */
 
+/** The page fault was resolved by as_page_fault(). */
+#define AS_PF_OK     0 
+
+/** The page fault was caused by memcpy_from_uspace() or memcpy_to_uspace(). */
+#define AS_PF_DEFER  1
+
 /** The page fault was not resolved by as_page_fault(). */
-#define AS_PF_FAULT  0
-
-/** The page fault was resolved by as_page_fault(). */
-#define AS_PF_OK  1
-
-/** The page fault was caused by memcpy_from_uspace() or memcpy_to_uspace(). */
-#define AS_PF_DEFER  2
+#define AS_PF_FAULT  2
+
+/** The page fault was not resolved by as_page_fault(). Non-verbose version. */
+#define AS_PF_SILENT 3
 
 /** Address space structure.
@@ -224 +221 @@
         void (* destroy)(as_area_t *);
 
+        bool (* is_resizable)(as_area_t *);
+        bool (* is_shareable)(as_area_t *);
+
         int (* page_fault)(as_area_t *, uintptr_t, pf_access_t);
         void (* frame_free)(as_area_t *, uintptr_t, uintptr_t);