Changeset 8ff0bd2 in mainline for kernel/generic/src/mm/buddy.c

Timestamp:

2011-09-04T11:30:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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/buddy.c (modified) (2 diffs)

kernel/generic/src/mm/buddy.c

@@ -82 +82 @@
          * Use memory after our own structure.
          */
-        b->order = (link_t *) (&b[1]);
+        b->order = (list_t *) (&b[1]);
         
         for (i = 0; i <= max_order; i++)
@@ -176 +176 @@
          * the request can be immediatelly satisfied.
          */
-        if (!list_empty(&b->order[i])) {
-                res = b->order[i].next;
+        res = list_first(&b->order[i]);
+        if (res != NULL) {
                 list_remove(res);
                 b->op->mark_busy(b, res);