Index: kernel/generic/include/synch/condvar.h
===================================================================
--- kernel/generic/include/synch/condvar.h	(revision 897fd8f11ec6c9c4a63697b4ccc6ab67c8be92f2)
+++ kernel/generic/include/synch/condvar.h	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -62,9 +62,9 @@
 extern void condvar_signal(condvar_t *cv);
 extern void condvar_broadcast(condvar_t *cv);
-extern int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec,
+extern errno_t _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec,
     int flags);
-extern int _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock, 
+extern errno_t _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, 
+extern errno_t _condvar_wait_timeout_irq_spinlock(condvar_t *cv,
 	irq_spinlock_t *irq_lock, uint32_t usec, int flags);
 
Index: kernel/generic/include/synch/futex.h
===================================================================
--- kernel/generic/include/synch/futex.h	(revision 897fd8f11ec6c9c4a63697b4ccc6ab67c8be92f2)
+++ kernel/generic/include/synch/futex.h	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -53,6 +53,6 @@
 
 extern void futex_init(void);
-extern sysarg_t sys_futex_sleep(uintptr_t);
-extern sysarg_t sys_futex_wakeup(uintptr_t);
+extern sys_errno_t sys_futex_sleep(uintptr_t);
+extern sys_errno_t sys_futex_wakeup(uintptr_t);
 
 extern void futex_task_cleanup(void);
Index: kernel/generic/include/synch/mutex.h
===================================================================
--- kernel/generic/include/synch/mutex.h	(revision 897fd8f11ec6c9c4a63697b4ccc6ab67c8be92f2)
+++ kernel/generic/include/synch/mutex.h	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -67,5 +67,5 @@
 extern void mutex_initialize(mutex_t *, mutex_type_t);
 extern bool mutex_locked(mutex_t *);
-extern int _mutex_lock_timeout(mutex_t *, uint32_t, unsigned int);
+extern errno_t _mutex_lock_timeout(mutex_t *, uint32_t, unsigned int);
 extern void mutex_unlock(mutex_t *);
 
Index: kernel/generic/include/synch/semaphore.h
===================================================================
--- kernel/generic/include/synch/semaphore.h	(revision 897fd8f11ec6c9c4a63697b4ccc6ab67c8be92f2)
+++ kernel/generic/include/synch/semaphore.h	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -59,5 +59,5 @@
 
 extern void semaphore_initialize(semaphore_t *, int);
-extern int _semaphore_down_timeout(semaphore_t *, uint32_t, unsigned int);
+extern errno_t _semaphore_down_timeout(semaphore_t *, uint32_t, unsigned int);
 extern void semaphore_up(semaphore_t *);
 extern int semaphore_count_get(semaphore_t *);
Index: kernel/generic/include/synch/smc.h
===================================================================
--- kernel/generic/include/synch/smc.h	(revision 897fd8f11ec6c9c4a63697b4ccc6ab67c8be92f2)
+++ kernel/generic/include/synch/smc.h	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -36,5 +36,5 @@
 #define KERN_SMC_H_
 
-extern sysarg_t sys_smc_coherence(uintptr_t, size_t);
+extern sys_errno_t sys_smc_coherence(uintptr_t, size_t);
 
 #endif
Index: kernel/generic/include/synch/smp_memory_barrier.h
===================================================================
--- kernel/generic/include/synch/smp_memory_barrier.h	(revision 897fd8f11ec6c9c4a63697b4ccc6ab67c8be92f2)
+++ kernel/generic/include/synch/smp_memory_barrier.h	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -38,5 +38,5 @@
 #include <typedefs.h>
 
-extern sysarg_t sys_smp_memory_barrier(void);
+extern sys_errno_t sys_smp_memory_barrier(void);
 
 #endif
Index: kernel/generic/include/synch/waitq.h
===================================================================
--- kernel/generic/include/synch/waitq.h	(revision 897fd8f11ec6c9c4a63697b4ccc6ab67c8be92f2)
+++ kernel/generic/include/synch/waitq.h	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -72,7 +72,7 @@
 
 extern void waitq_initialize(waitq_t *);
-extern int waitq_sleep_timeout(waitq_t *, uint32_t, unsigned int, bool *);
+extern errno_t waitq_sleep_timeout(waitq_t *, uint32_t, unsigned int, bool *);
 extern ipl_t waitq_sleep_prepare(waitq_t *);
-extern int waitq_sleep_timeout_unsafe(waitq_t *, uint32_t, unsigned int, bool *);
+extern errno_t waitq_sleep_timeout_unsafe(waitq_t *, uint32_t, unsigned int, bool *);
 extern void waitq_sleep_finish(waitq_t *, bool, ipl_t);
 extern void waitq_wakeup(waitq_t *, wakeup_mode_t);