Changeset 520acaf in mainline for kernel/generic/src/synch/spinlock.c

Timestamp:

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

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

5f679702

Parents:

11b9ad7 (diff), 3123d2a (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/synch/spinlock.c (modified) (1 diff)

kernel/generic/src/synch/spinlock.c

@@ -262 +262 @@
         int rc = spinlock_trylock(&(lock->lock));
         
-        ASSERT_IRQ_SPINLOCK(!rc || !lock->guard, lock);
+        ASSERT_IRQ_SPINLOCK((!rc) || (!lock->guard), lock);
         return rc;
 }