Changeset 6843a9c in mainline for kernel/generic/src/synch/spinlock.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• kernel/generic/src/synch/spinlock.c (modified) (3 diffs)

kernel/generic/src/synch/spinlock.c

@@ -44 +44 @@
 #include <debug.h>
 #include <symtab.h>
+#include <stacktrace.h>
 
 #ifdef CONFIG_SMP
@@ -104 +105 @@
                             "caller=%p (%s)\n", CPU->id, lock, lock->name,
                             (void *) CALLER, symtab_fmt_name_lookup(CALLER));
+                        stack_trace();
                         
                         i = 0;
@@ -260 +262 @@
         int rc = spinlock_trylock(&(lock->lock));
         
-        ASSERT_IRQ_SPINLOCK(!lock->guard, lock);
+        ASSERT_IRQ_SPINLOCK((!rc) || (!lock->guard), lock);
         return rc;
 }