Changeset b0f00a9 in mainline for kernel/generic/include/mm

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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.

Location:

kernel/generic/include/mm

Files:

• as.h (modified) (4 diffs)
• buddy.h (modified) (1 diff)
• page.h (modified) (2 diffs)
• slab.h (modified) (1 diff)
• tlb.h (modified) (1 diff)

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>
 #include <arch/mm/asid.h>
+#include <arch/istate.h>
 #include <typedefs.h>
 #include <synch/spinlock.h>
@@ -254 +231 @@
 
 extern as_operations_t *as_operations;
-extern link_t inactive_as_with_asid_head;
+extern list_t inactive_as_with_asid_list;
 
 extern void as_init(void);
@@ -306 +283 @@
 extern mem_backend_t phys_backend;
 
-/**
- * This flags is passed when running the loader, otherwise elf_load()
- * would return with a EE_LOADER error code.
- *
- */
-#define ELD_F_NONE    0
-#define ELD_F_LOADER  1
-
-extern unsigned int elf_load(elf_header_t *, as_t *, unsigned int);
-
 /* Address space area related syscalls. */
 extern sysarg_t sys_as_area_create(uintptr_t, size_t, unsigned int);
@@ -327 +294 @@
 extern void as_print(as_t *);
 
-#endif /* KERNEL */
-
 #endif
 

kernel/generic/include/mm/buddy.h

@@ -72 +72 @@
         /** Maximal order of block which can be stored by buddy system. */
         uint8_t max_order;
-        link_t *order;
+        list_t *order;
         buddy_system_operations_t *op;
         /** Pointer to be used by the implementation. */

kernel/generic/include/mm/page.h

@@ -37 +37 @@
 
 #include <typedefs.h>
+#include <proc/task.h>
 #include <mm/as.h>
 #include <arch/mm/page.h>
@@ -65 +66 @@
 extern uintptr_t hw_map(uintptr_t, size_t);
 
+extern sysarg_t sys_page_find_mapping(uintptr_t, uintptr_t *);
+
 #endif
 

kernel/generic/include/mm/slab.h

@@ -111 +111 @@
         
         /* Slabs */
-        link_t full_slabs;     /**< List of full slabs */
-        link_t partial_slabs;  /**< List of partial slabs */
+        list_t full_slabs;     /**< List of full slabs */
+        list_t partial_slabs;  /**< List of partial slabs */
         SPINLOCK_DECLARE(slablock);
         /* Magazines */
-        link_t magazines;  /**< List o full magazines */
+        list_t magazines;  /**< List o full magazines */
         SPINLOCK_DECLARE(maglock);
         

kernel/generic/include/mm/tlb.h

@@ -86 +86 @@
 extern void tlb_invalidate_asid(asid_t);
 extern void tlb_invalidate_pages(asid_t, uintptr_t, size_t);
+
 #endif