Ignore:
Timestamp:
2015-03-16T16:07:21Z (10 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2003739
Parents:
6069061 (diff), 795e2bf (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:

Mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/include/synch/condvar.h

    r6069061 r58775d30  
    3939#include <synch/waitq.h>
    4040#include <synch/mutex.h>
     41#include <synch/spinlock.h>
    4142#include <abi/synch.h>
    4243
     
    5051        _condvar_wait_timeout((cv), (mtx), (usec), SYNCH_FLAGS_NONE)
    5152
     53#ifdef CONFIG_SMP
     54#define _condvar_wait_timeout_spinlock(cv, lock, usec, flags) \
     55        _condvar_wait_timeout_spinlock_impl((cv), (lock), (usec), (flags))
     56#else
     57#define _condvar_wait_timeout_spinlock(cv, lock, usec, flags) \
     58        _condvar_wait_timeout_spinlock_impl((cv), NULL, (usec), (flags))
     59#endif
     60
    5261extern void condvar_initialize(condvar_t *cv);
    5362extern void condvar_signal(condvar_t *cv);
     
    5564extern int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec,
    5665    int flags);
     66extern int _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock,
     67        uint32_t usec, int flags);
     68extern int _condvar_wait_timeout_irq_spinlock(condvar_t *cv,
     69        irq_spinlock_t *irq_lock, uint32_t usec, int flags);
     70
    5771
    5872#endif
Note: See TracChangeset for help on using the changeset viewer.