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

Timestamp:

2012-05-10T07:28:31Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

81a7858

Parents:

5b26747 (diff), fce7b43 (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 with mainline

File:

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

kernel/generic/src/lib/ra.c

@@ -185 +185 @@
                 return NULL;
 
-        spinlock_initialize(&arena->lock, "arena_lock");
+        irq_spinlock_initialize(&arena->lock, "arena_lock");
         list_initialize(&arena->spans);
 
@@ -209 +209 @@
 
         /* TODO: check for overlaps */
-        spinlock_lock(&arena->lock);
+        irq_spinlock_lock(&arena->lock, true);
         list_append(&span->span_link, &arena->spans);
-        spinlock_unlock(&arena->lock);
+        irq_spinlock_unlock(&arena->lock, true);
         return true;
 }
@@ -390 +390 @@
         ASSERT(ispwr2(alignment));
 
-        spinlock_lock(&arena->lock);
+        irq_spinlock_lock(&arena->lock, true);
         list_foreach(arena->spans, cur) {
                 ra_span_t *span = list_get_instance(cur, ra_span_t, span_link);
@@ -398 +398 @@
                         break;
         }
-        spinlock_unlock(&arena->lock);
+        irq_spinlock_unlock(&arena->lock, true);
 
         return base;
@@ -406 +406 @@
 void ra_free(ra_arena_t *arena, uintptr_t base, size_t size)
 {
-        spinlock_lock(&arena->lock);
+        irq_spinlock_lock(&arena->lock, true);
         list_foreach(arena->spans, cur) {
                 ra_span_t *span = list_get_instance(cur, ra_span_t, span_link);
@@ -412 +412 @@
                 if (iswithin(span->base, span->size, base, size)) {
                         ra_span_free(span, base, size);
-                        spinlock_unlock(&arena->lock);
+                        irq_spinlock_unlock(&arena->lock, true);
                         return;
                 }
         }
-        spinlock_unlock(&arena->lock);
+        irq_spinlock_unlock(&arena->lock, true);
 
         panic("Freeing to wrong arena (base=%" PRIxn ", size=%" PRIdn ").",