Changeset 2b3dd78 in mainline for kernel/generic/include/synch/condvar.h

Timestamp:

2018-01-31T12:02:00Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• kernel/generic/include/synch/condvar.h (modified) (1 diff)

kernel/generic/include/synch/condvar.h

@@ -65 +65 @@
     int flags);
 extern errno_t _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock,
-        uint32_t usec, int flags);
+    uint32_t usec, int flags);
 extern errno_t _condvar_wait_timeout_irq_spinlock(condvar_t *cv,
-        irq_spinlock_t *irq_lock, uint32_t usec, int flags);
+    irq_spinlock_t *irq_lock, uint32_t usec, int flags);