Changeset 04803bf in mainline for kernel/generic/src/mm/backend_anon.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• kernel/generic/src/mm/backend_anon.c (modified) (4 diffs)

kernel/generic/src/mm/backend_anon.c

@@ -47 +47 @@
 #include <adt/btree.h>
 #include <errno.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 #include <arch.h>
@@ -79 +79 @@
 {
         uintptr_t frame;
+
+        ASSERT(page_table_locked(AS));
+        ASSERT(mutex_locked(&area->lock));
 
         if (!as_area_check_access(area, access))
@@ -168 +171 @@
 void anon_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame)
 {
+        ASSERT(page_table_locked(area->as));
+        ASSERT(mutex_locked(&area->lock));
+
         frame_free(frame);
 }
@@ -183 +189 @@
 {
         link_t *cur;
+
+        ASSERT(mutex_locked(&area->as->lock));
+        ASSERT(mutex_locked(&area->lock));
 
         /*