Changeset 6a44ee4 in mainline for kernel/genarch/src/mm/asid.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/genarch/src/mm/asid.c (modified) (1 diff)

kernel/genarch/src/mm/asid.c

@@ -97 +97 @@
                  * inactive address space.
                  */
-                ASSERT(!list_empty(&inactive_as_with_asid_head));
-                tmp = inactive_as_with_asid_head.next;
+                tmp = list_first(&inactive_as_with_asid_list);
+                ASSERT(tmp != NULL);
                 list_remove(tmp);