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

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• kernel/generic/src/mm/backend_phys.c (modified) (1 diff)

kernel/generic/src/mm/backend_phys.c

@@ -81 +81 @@
         page_mapping_insert(AS, addr, base + (addr - area->base),
             as_area_get_flags(area));
-        if (!used_space_insert(area, ALIGN_DOWN(addr, PAGE_SIZE), 1))
-                panic("Cannot insert used space.");
+        
+        if (!used_space_insert(area, ALIGN_DOWN(addr, PAGE_SIZE), 1))
+                panic("Cannot insert used space.");
 
         return AS_PF_OK;