Changeset b678410 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2011-04-27T20:01:13Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a6dffb8

Parents:

628d548 (diff), 933cadf (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/as.c (modified) (4 diffs)

kernel/generic/src/mm/as.c

@@ -80 +80 @@
 #include <arch/interrupt.h>
 
-#ifdef CONFIG_VIRT_IDX_DCACHE
-#include <arch/mm/cache.h>
-#endif /* CONFIG_VIRT_IDX_DCACHE */
-
 /**
  * Each architecture decides what functions will be used to carry out
@@ -447 +443 @@
         else
                 memsetb(&area->backend_data, sizeof(area->backend_data), 0);
+        
+        if (area->backend && area->backend->create) {
+                if (!area->backend->create(area)) {
+                        free(area);
+                        mutex_unlock(&as->lock);
+                        return NULL;
+                }
+        }
         
         btree_create(&area->used_space);
@@ -690 +694 @@
         }
         
+        if (area->backend && area->backend->resize) {
+                if (!area->backend->resize(area, pages)) {
+                        mutex_unlock(&area->lock);
+                        mutex_unlock(&as->lock);
+                        return ENOMEM;
+                }
+        }
+        
         area->pages = pages;
         
@@ -756 +768 @@
                 return ENOENT;
         }
+
+        if (area->backend && area->backend->destroy)
+                area->backend->destroy(area);
         
         uintptr_t base = area->base;