Changeset 371bd7d in mainline for kernel/generic/include/mm/as.h

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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 changes.

File:

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

kernel/generic/include/mm/as.h

@@ -36 +36 @@
 #define KERN_AS_H_
 
+#ifdef KERNEL
+        #include <typedefs.h>
+#else
+        #include <sys/types.h>
+#endif
+
 /** Address space area flags. */
 #define AS_AREA_READ            1
@@ -42 +48 @@
 #define AS_AREA_CACHEABLE       8
 
+/** Address space area info exported to userspace. */
+typedef struct {
+        /** Starting address */
+        uintptr_t start_addr;
+
+        /** Area size */
+        size_t size;
+
+        /** Area flags */
+        int flags;
+} as_area_info_t;
+
 #ifdef KERNEL
 
@@ -47 +65 @@
 #include <arch/mm/as.h>
 #include <arch/mm/asid.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <synch/mutex.h>
@@ -268 +286 @@
 
 /* Introspection functions. */
+extern void as_get_area_info(as_t *as, as_area_info_t **obuf, size_t *osize);
 extern void as_print(as_t *as);