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

Timestamp:

2010-07-02T14:19:30Z (14 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_ht.c (modified) (3 diffs)

kernel/genarch/src/mm/page_ht.c

@@ -185 +185 @@
         };
 
-        ASSERT(interrupts_disabled());
         ASSERT(page_table_locked(as));
         
@@ -226 +225 @@
         };
 
-        ASSERT(interrupts_disabled());
         ASSERT(page_table_locked(as));
         
@@ -254 +252 @@
         };
 
-        ASSERT(interrupts_disabled());
         ASSERT(page_table_locked(as));