Changes in kernel/generic/src/synch/spinlock.c [9d58539:8d2d308f] in mainline

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;
 }