Index: kernel/generic/include/synch/futex.h
===================================================================
--- kernel/generic/include/synch/futex.h	(revision 7e752b2a0d66c871748e5fa9e8bbe3a27c70a202)
+++ kernel/generic/include/synch/futex.h	(revision dd8d5a73bdea8475dd6109269d442c9d31c454a6)
@@ -52,6 +52,6 @@
 
 extern void futex_init(void);
-extern unative_t sys_futex_sleep(uintptr_t);
-extern unative_t sys_futex_wakeup(uintptr_t);
+extern sysarg_t sys_futex_sleep(uintptr_t);
+extern sysarg_t sys_futex_wakeup(uintptr_t);
 
 extern void futex_cleanup(void);
Index: kernel/generic/include/synch/smc.h
===================================================================
--- kernel/generic/include/synch/smc.h	(revision 7e752b2a0d66c871748e5fa9e8bbe3a27c70a202)
+++ kernel/generic/include/synch/smc.h	(revision dd8d5a73bdea8475dd6109269d442c9d31c454a6)
@@ -36,5 +36,5 @@
 #define KERN_SMC_H_
 
-extern unative_t sys_smc_coherence(uintptr_t va, size_t size);
+extern sysarg_t sys_smc_coherence(uintptr_t va, size_t size);
 
 #endif