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


Ignore:
Timestamp:
2012-07-10T11:53:50Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1e01a35
Parents:
a33706e (diff), 33fc3ae (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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/synch/spinlock.c

    ra33706e rb4ca0a9c  
    262262        int rc = spinlock_trylock(&(lock->lock));
    263263       
    264         ASSERT_IRQ_SPINLOCK(!rc || !lock->guard, lock);
     264        ASSERT_IRQ_SPINLOCK((!rc) || (!lock->guard), lock);
    265265        return rc;
    266266}
Note: See TracChangeset for help on using the changeset viewer.