Changeset cefb126 in mainline for kernel/generic/src/mm/page.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/generic/src/mm/page.c (modified) (4 diffs)

kernel/generic/src/mm/page.c

@@ -38 +38 @@
  * mappings between virtual addresses and physical addresses.
  * Functions here are mere wrappers that call the real implementation.
- * They however, define the single interface. 
+ * They however, define the single interface.
  *
  */
@@ -118 +118 @@
     unsigned int flags)
 {
-        ASSERT(interrupts_disabled());
         ASSERT(page_table_locked(as));
         
@@ -142 +141 @@
 void page_mapping_remove(as_t *as, uintptr_t page)
 {
-        ASSERT(interrupts_disabled());
         ASSERT(page_table_locked(as));
         
@@ -167 +165 @@
 pte_t *page_mapping_find(as_t *as, uintptr_t page)
 {
-        ASSERT(interrupts_disabled());
         ASSERT(page_table_locked(as));