Changeset 92574f4 in mainline for kernel/generic/include/mm/as.h

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

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

kernel/generic/include/mm/as.h

@@ -115 +115 @@
         
         /**
-         * Number of processors on wich is this address space active.
-         * Protected by asidlock.
+         * Number of processors on which this
+         * address space is active. Protected by
+         * asidlock.
          */
         size_t cpu_refcount;
         
-        /**
-         * Address space identifier.
-         * Constant on architectures that do not support ASIDs.
-         * Protected by asidlock.
+        /** Address space identifier.
+         *
+         * Constant on architectures that do not
+         * support ASIDs. Protected by asidlock.
+         *
          */
         asid_t asid;
         
-        /** Number of references (i.e tasks that reference this as). */
+        /** Number of references (i.e. tasks that reference this as). */
         atomic_t refcount;
         
@@ -199 +201 @@
 typedef struct {
         mutex_t lock;
+        
         /** Containing address space. */
         as_t *as;
         
-        /**
-         * Flags related to the memory represented by the address space area.
-         */
+        /** Memory flags. */
         unsigned int flags;
         
-        /** Attributes related to the address space area itself. */
+        /** Address space area attributes. */
         unsigned int attributes;
-        /** Size of this area in multiples of PAGE_SIZE. */
+        
+        /** Number of pages in the area. */
         size_t pages;
+        
+        /** Number of resident pages in the area. */
+        size_t resident;
+        
         /** Base address of this area. */
         uintptr_t base;
+        
         /** Map of used space. */
         btree_t used_space;
         
         /**
-         * If the address space area has been shared, this pointer will
-         * reference the share info structure.
+         * If the address space area is shared. this is
+         * a reference to the share info structure.
          */
         share_info_t *sh_info;
@@ -261 +268 @@
 extern bool as_area_check_access(as_area_t *, pf_access_t);
 extern size_t as_area_get_size(uintptr_t);
-extern int used_space_insert(as_area_t *, uintptr_t, size_t);
-extern int used_space_remove(as_area_t *, uintptr_t, size_t);
-
+extern bool used_space_insert(as_area_t *, uintptr_t, size_t);
+extern bool used_space_remove(as_area_t *, uintptr_t, size_t);
 
 /* Interface to be implemented by architectures. */
@@ -307 +313 @@
 extern sysarg_t sys_as_area_change_flags(uintptr_t, unsigned int);
 extern sysarg_t sys_as_area_destroy(uintptr_t);
+extern sysarg_t sys_as_get_unmapped_area(uintptr_t, size_t);
 
 /* Introspection functions. */