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

Timestamp:

2011-06-01T09:04:08Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0a7627b, c9f0975

Parents:

e51a514 (diff), 5d1b3aa (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

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

Location:

kernel/generic/include/mm

Files:

• as.h (modified) (1 diff)
• frame.h (modified) (1 diff)
• page.h (modified) (3 diffs)
• tlb.h (modified) (1 diff)

kernel/generic/include/mm/as.h

@@ -84 +84 @@
 #define USER_ADDRESS_SPACE_END      USER_ADDRESS_SPACE_END_ARCH
 
-#define USTACK_ADDRESS  USTACK_ADDRESS_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. */

kernel/generic/include/mm/frame.h

@@ -44 +44 @@
 #include <arch/mm/page.h>
 #include <arch/mm/frame.h>
-
-#define ONE_FRAME    0
-#define TWO_FRAMES   1
-#define FOUR_FRAMES  2
-
-
-#ifdef ARCH_STACK_FRAMES
-        #define STACK_FRAMES  ARCH_STACK_FRAMES
-#else
-        #define STACK_FRAMES  ONE_FRAME
-#endif
 
 /** Maximum number of zones in the system. */

kernel/generic/include/mm/page.h

@@ -39 +39 @@
 #include <proc/task.h>
 #include <mm/as.h>
-#include <memstr.h>
+#include <arch/mm/page.h>
+
+#define P2SZ(pages) \
+        ((pages) << PAGE_WIDTH) 
 
 /** Operations to manipulate page mappings. */
@@ -45 +48 @@
         void (* mapping_insert)(as_t *, uintptr_t, uintptr_t, unsigned int);
         void (* mapping_remove)(as_t *, uintptr_t);
-        pte_t *(* mapping_find)(as_t *, uintptr_t);
+        pte_t *(* mapping_find)(as_t *, uintptr_t, bool);
 } page_mapping_operations_t;
 
@@ -56 +59 @@
 extern void page_mapping_insert(as_t *, uintptr_t, uintptr_t, unsigned int);
 extern void page_mapping_remove(as_t *, uintptr_t);
-extern pte_t *page_mapping_find(as_t *, uintptr_t);
+extern pte_t *page_mapping_find(as_t *, uintptr_t, bool);
 extern pte_t *page_table_create(unsigned int);
 extern void page_table_destroy(pte_t *);

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