Changeset 925a21e in mainline for kernel/generic/include/mm/as.h

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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) (2 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
-#define AS_AREA_WRITE      2
-#define AS_AREA_EXEC       4
-#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 */
-        unsigned int flags;
-} as_area_info_t;
-
-#ifdef KERNEL
-
+#include <typedefs.h>
+#include <abi/mm/as.h>
 #include <arch/mm/page.h>
 #include <arch/mm/as.h>
@@ -318 +294 @@
 extern void as_print(as_t *);
 
-#endif /* KERNEL */
-
 #endif