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

Timestamp:

2012-11-07T18:44:33Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

fc89e32

Parents:

2708f6a

Message:

Fixed build for sparc64/ultra, sparc64/niagara, ppc32, mips32/GXemul.

File:

• kernel/generic/include/synch/condvar.h (modified) (2 diffs)

kernel/generic/include/synch/condvar.h

@@ -51 +51 @@
         _condvar_wait_timeout((cv), (mtx), (usec), SYNCH_FLAGS_NONE)
 
+#ifdef CONFIG_SMP
+#define _condvar_wait_timeout_spinlock(cv, lock, usec, flags) \
+        _condvar_wait_timeout_spinlock_impl((cv), (lock), (usec), (flags))
+#else
+#define _condvar_wait_timeout_spinlock(cv, lock, usec, flags) \
+        _condvar_wait_timeout_spinlock_impl((cv), NULL, (usec), (flags))
+#endif
+
 extern void condvar_initialize(condvar_t *cv);
 extern void condvar_signal(condvar_t *cv);
@@ -56 +64 @@
 extern int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec,
     int flags);
-extern int _condvar_wait_timeout_spinlock(condvar_t *cv, spinlock_t *lock, 
+extern int _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock, 
         uint32_t usec, int flags);
 extern int _condvar_wait_timeout_irq_spinlock(condvar_t *cv,