Changeset c621f4aa in mainline for kernel/generic/src/mm/backend_phys.c

Timestamp:

2010-07-25T10:11:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

• kernel/generic/src/mm/backend_phys.c (modified) (3 diffs)

kernel/generic/src/mm/backend_phys.c

@@ -38 +38 @@
 
 #include <debug.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/as.h>
 #include <mm/page.h>
@@ -72 +72 @@
         uintptr_t base = area->backend_data.base;
 
+        ASSERT(page_table_locked(AS));
+        ASSERT(mutex_locked(&area->lock));
+
         if (!as_area_check_access(area, access))
                 return AS_PF_FAULT;
@@ -93 +96 @@
 void phys_share(as_area_t *area)
 {
+        ASSERT(mutex_locked(&area->as->lock));
+        ASSERT(mutex_locked(&area->lock));
 }