Changeset b0f00a9 in mainline for kernel/generic/src/mm/backend_elf.c

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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/backend_elf.c (modified) (2 diffs)

kernel/generic/src/mm/backend_elf.c

@@ -139 +139 @@
          */
         if (area->flags & AS_AREA_WRITE) {
-                node = list_get_instance(area->used_space.leaf_head.next,
+                node = list_get_instance(list_first(&area->used_space.leaf_list),
                     btree_node_t, leaf_link);
         } else {
@@ -153 +153 @@
          */
         mutex_lock(&area->sh_info->lock);
-        for (cur = &node->leaf_link; cur != &area->used_space.leaf_head;
+        for (cur = &node->leaf_link; cur != &area->used_space.leaf_list.head;
             cur = cur->next) {
                 unsigned int i;