diff options
Diffstat (limited to 'include/asm-cris/uaccess.h')
-rw-r--r-- | include/asm-cris/uaccess.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/asm-cris/uaccess.h b/include/asm-cris/uaccess.h index 7d50086eb5ea..69d48a2dc8e1 100644 --- a/include/asm-cris/uaccess.h +++ b/include/asm-cris/uaccess.h | |||
@@ -213,7 +213,7 @@ extern unsigned long __copy_user(void *to, const void *from, unsigned long n); | |||
213 | extern unsigned long __copy_user_zeroing(void *to, const void *from, unsigned long n); | 213 | extern unsigned long __copy_user_zeroing(void *to, const void *from, unsigned long n); |
214 | extern unsigned long __do_clear_user(void *to, unsigned long n); | 214 | extern unsigned long __do_clear_user(void *to, unsigned long n); |
215 | 215 | ||
216 | extern inline unsigned long | 216 | static inline unsigned long |
217 | __generic_copy_to_user(void __user *to, const void *from, unsigned long n) | 217 | __generic_copy_to_user(void __user *to, const void *from, unsigned long n) |
218 | { | 218 | { |
219 | if (access_ok(VERIFY_WRITE, to, n)) | 219 | if (access_ok(VERIFY_WRITE, to, n)) |
@@ -221,7 +221,7 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n) | |||
221 | return n; | 221 | return n; |
222 | } | 222 | } |
223 | 223 | ||
224 | extern inline unsigned long | 224 | static inline unsigned long |
225 | __generic_copy_from_user(void *to, const void __user *from, unsigned long n) | 225 | __generic_copy_from_user(void *to, const void __user *from, unsigned long n) |
226 | { | 226 | { |
227 | if (access_ok(VERIFY_READ, from, n)) | 227 | if (access_ok(VERIFY_READ, from, n)) |
@@ -229,7 +229,7 @@ __generic_copy_from_user(void *to, const void __user *from, unsigned long n) | |||
229 | return n; | 229 | return n; |
230 | } | 230 | } |
231 | 231 | ||
232 | extern inline unsigned long | 232 | static inline unsigned long |
233 | __generic_clear_user(void __user *to, unsigned long n) | 233 | __generic_clear_user(void __user *to, unsigned long n) |
234 | { | 234 | { |
235 | if (access_ok(VERIFY_WRITE, to, n)) | 235 | if (access_ok(VERIFY_WRITE, to, n)) |
@@ -237,13 +237,13 @@ __generic_clear_user(void __user *to, unsigned long n) | |||
237 | return n; | 237 | return n; |
238 | } | 238 | } |
239 | 239 | ||
240 | extern inline long | 240 | static inline long |
241 | __strncpy_from_user(char *dst, const char __user *src, long count) | 241 | __strncpy_from_user(char *dst, const char __user *src, long count) |
242 | { | 242 | { |
243 | return __do_strncpy_from_user(dst, src, count); | 243 | return __do_strncpy_from_user(dst, src, count); |
244 | } | 244 | } |
245 | 245 | ||
246 | extern inline long | 246 | static inline long |
247 | strncpy_from_user(char *dst, const char __user *src, long count) | 247 | strncpy_from_user(char *dst, const char __user *src, long count) |
248 | { | 248 | { |
249 | long res = -EFAULT; | 249 | long res = -EFAULT; |
@@ -256,7 +256,7 @@ strncpy_from_user(char *dst, const char __user *src, long count) | |||
256 | /* Note that if these expand awfully if made into switch constructs, so | 256 | /* Note that if these expand awfully if made into switch constructs, so |
257 | don't do that. */ | 257 | don't do that. */ |
258 | 258 | ||
259 | extern inline unsigned long | 259 | static inline unsigned long |
260 | __constant_copy_from_user(void *to, const void __user *from, unsigned long n) | 260 | __constant_copy_from_user(void *to, const void __user *from, unsigned long n) |
261 | { | 261 | { |
262 | unsigned long ret = 0; | 262 | unsigned long ret = 0; |
@@ -306,7 +306,7 @@ __constant_copy_from_user(void *to, const void __user *from, unsigned long n) | |||
306 | 306 | ||
307 | /* Ditto, don't make a switch out of this. */ | 307 | /* Ditto, don't make a switch out of this. */ |
308 | 308 | ||
309 | extern inline unsigned long | 309 | static inline unsigned long |
310 | __constant_copy_to_user(void __user *to, const void *from, unsigned long n) | 310 | __constant_copy_to_user(void __user *to, const void *from, unsigned long n) |
311 | { | 311 | { |
312 | unsigned long ret = 0; | 312 | unsigned long ret = 0; |
@@ -356,7 +356,7 @@ __constant_copy_to_user(void __user *to, const void *from, unsigned long n) | |||
356 | 356 | ||
357 | /* No switch, please. */ | 357 | /* No switch, please. */ |
358 | 358 | ||
359 | extern inline unsigned long | 359 | static inline unsigned long |
360 | __constant_clear_user(void __user *to, unsigned long n) | 360 | __constant_clear_user(void __user *to, unsigned long n) |
361 | { | 361 | { |
362 | unsigned long ret = 0; | 362 | unsigned long ret = 0; |
@@ -406,19 +406,19 @@ __constant_clear_user(void __user *to, unsigned long n) | |||
406 | * used in fast paths and have only a small space overhead. | 406 | * used in fast paths and have only a small space overhead. |
407 | */ | 407 | */ |
408 | 408 | ||
409 | extern inline unsigned long | 409 | static inline unsigned long |
410 | __generic_copy_from_user_nocheck(void *to, const void *from, unsigned long n) | 410 | __generic_copy_from_user_nocheck(void *to, const void *from, unsigned long n) |
411 | { | 411 | { |
412 | return __copy_user_zeroing(to,from,n); | 412 | return __copy_user_zeroing(to,from,n); |
413 | } | 413 | } |
414 | 414 | ||
415 | extern inline unsigned long | 415 | static inline unsigned long |
416 | __generic_copy_to_user_nocheck(void *to, const void *from, unsigned long n) | 416 | __generic_copy_to_user_nocheck(void *to, const void *from, unsigned long n) |
417 | { | 417 | { |
418 | return __copy_user(to,from,n); | 418 | return __copy_user(to,from,n); |
419 | } | 419 | } |
420 | 420 | ||
421 | extern inline unsigned long | 421 | static inline unsigned long |
422 | __generic_clear_user_nocheck(void *to, unsigned long n) | 422 | __generic_clear_user_nocheck(void *to, unsigned long n) |
423 | { | 423 | { |
424 | return __do_clear_user(to,n); | 424 | return __do_clear_user(to,n); |