Changeset 3f03199 in mainline for kernel/generic/src/lib/ra.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• kernel/generic/src/lib/ra.c (modified) (2 diffs)

kernel/generic/src/lib/ra.c

@@ -391 +391 @@
 
         irq_spinlock_lock(&arena->lock, true);
-        list_foreach(arena->spans, cur) {
-                ra_span_t *span = list_get_instance(cur, ra_span_t, span_link);
-
+        list_foreach(arena->spans, span_link, ra_span_t, span) {
                 base = ra_span_alloc(span, size, alignment);
                 if (base)
@@ -407 +405 @@
 {
         irq_spinlock_lock(&arena->lock, true);
-        list_foreach(arena->spans, cur) {
-                ra_span_t *span = list_get_instance(cur, ra_span_t, span_link);
-
+        list_foreach(arena->spans, span_link, ra_span_t, span) {
                 if (iswithin(span->base, span->size, base, size)) {
                         ra_span_free(span, base, size);