Changeset cefb126 in mainline for kernel/genarch/src/mm/page_pt.c

Timestamp:

2010-07-02T14:19:30Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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.

File:

• kernel/genarch/src/mm/page_pt.c (modified) (3 diffs)

kernel/genarch/src/mm/page_pt.c

@@ -72 +72 @@
         pte_t *ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table);
 
-        ASSERT(interrupts_disabled());
         ASSERT(page_table_locked(as));
         
@@ -120 +119 @@
 void pt_mapping_remove(as_t *as, uintptr_t page)
 {
-        ASSERT(interrupts_disabled());
         ASSERT(page_table_locked(as));
 
@@ -251 +249 @@
 pte_t *pt_mapping_find(as_t *as, uintptr_t page)
 {
-        ASSERT(interrupts_disabled());
         ASSERT(page_table_locked(as));