Changeset 1d432f9 in mainline for kernel/generic/src/mm/page.c

Timestamp:

2010-05-31T22:33:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

179d052

Parents:

3a2b636

Message:

Reflect assumptions about lock and interrupt state in functions themselves.

File:

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

kernel/generic/src/mm/page.c

@@ -120 +120 @@
     unsigned int flags)
 {
+        ASSERT(interrupts_disabled());
+        ASSERT(page_table_locked(as));
+        
         ASSERT(page_mapping_operations);
         ASSERT(page_mapping_operations->mapping_insert);
-        
+
         page_mapping_operations->mapping_insert(as, page, frame, flags);
         
@@ -143 +146 @@
 void page_mapping_remove(as_t *as, uintptr_t page)
 {
+        ASSERT(interrupts_disabled());
+        ASSERT(page_table_locked(as));
+        
         ASSERT(page_mapping_operations);
         ASSERT(page_mapping_operations->mapping_remove);
@@ -167 +173 @@
 pte_t *page_mapping_find(as_t *as, uintptr_t page)
 {
+        ASSERT(interrupts_disabled());
+        ASSERT(page_table_locked(as));
+        
         ASSERT(page_mapping_operations);
         ASSERT(page_mapping_operations->mapping_find);