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

Timestamp:

2014-09-12T13:22:33Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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) (3 diffs)

kernel/generic/src/mm/as.c

@@ -572 +572 @@
  * @param attrs        Attributes of the area.
  * @param backend      Address space area backend. NULL if no backend is used.
- * @param backend_data NULL or a pointer to an array holding two void *.
+ * @param backend_data NULL or a pointer to custom backend data.
  * @param base         Starting virtual address of the area.
  *                     If set to -1, a suitable mappable area is found.
@@ -1725 +1725 @@
         ASSERT(count);
         
-        btree_node_t *leaf;
+        btree_node_t *leaf = NULL;
         size_t pages = (size_t) btree_search(&area->used_space, page, &leaf);
         if (pages) {
@@ -1733 +1733 @@
                 return false;
         }
+
+        ASSERT(leaf != NULL);
         
         if (!leaf->keys) {