diff options
Diffstat (limited to 'arch/tile/include/asm/futex.h')
-rw-r--r-- | arch/tile/include/asm/futex.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/arch/tile/include/asm/futex.h b/arch/tile/include/asm/futex.h index 9eaeb3c08786..fe0d10dcae57 100644 --- a/arch/tile/include/asm/futex.h +++ b/arch/tile/include/asm/futex.h | |||
@@ -29,14 +29,14 @@ | |||
29 | #include <linux/uaccess.h> | 29 | #include <linux/uaccess.h> |
30 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
31 | 31 | ||
32 | extern struct __get_user futex_set(int *v, int i); | 32 | extern struct __get_user futex_set(int __user *v, int i); |
33 | extern struct __get_user futex_add(int *v, int n); | 33 | extern struct __get_user futex_add(int __user *v, int n); |
34 | extern struct __get_user futex_or(int *v, int n); | 34 | extern struct __get_user futex_or(int __user *v, int n); |
35 | extern struct __get_user futex_andn(int *v, int n); | 35 | extern struct __get_user futex_andn(int __user *v, int n); |
36 | extern struct __get_user futex_cmpxchg(int *v, int o, int n); | 36 | extern struct __get_user futex_cmpxchg(int __user *v, int o, int n); |
37 | 37 | ||
38 | #ifndef __tilegx__ | 38 | #ifndef __tilegx__ |
39 | extern struct __get_user futex_xor(int *v, int n); | 39 | extern struct __get_user futex_xor(int __user *v, int n); |
40 | #else | 40 | #else |
41 | static inline struct __get_user futex_xor(int __user *uaddr, int n) | 41 | static inline struct __get_user futex_xor(int __user *uaddr, int n) |
42 | { | 42 | { |
@@ -131,6 +131,11 @@ static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, | |||
131 | return asm_ret.err ? asm_ret.err : asm_ret.val; | 131 | return asm_ret.err ? asm_ret.err : asm_ret.val; |
132 | } | 132 | } |
133 | 133 | ||
134 | #ifndef __tilegx__ | ||
135 | /* Return failure from the atomic wrappers. */ | ||
136 | struct __get_user __atomic_bad_address(int __user *addr); | ||
137 | #endif | ||
138 | |||
134 | #endif /* !__ASSEMBLY__ */ | 139 | #endif /* !__ASSEMBLY__ */ |
135 | 140 | ||
136 | #endif /* _ASM_TILE_FUTEX_H */ | 141 | #endif /* _ASM_TILE_FUTEX_H */ |