aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/uaccess.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/s390/include/asm/uaccess.h')
-rw-r--r--arch/s390/include/asm/uaccess.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
index 49885a518e5e..2710b41eed22 100644
--- a/arch/s390/include/asm/uaccess.h
+++ b/arch/s390/include/asm/uaccess.h
@@ -111,8 +111,8 @@ int __handle_fault(unsigned long, unsigned long, int);
111 * If some data could not be copied, this function will pad the copied 111 * If some data could not be copied, this function will pad the copied
112 * data to the requested size using zero bytes. 112 * data to the requested size using zero bytes.
113 */ 113 */
114size_t __must_check __copy_from_user(void *to, const void __user *from, 114unsigned long __must_check __copy_from_user(void *to, const void __user *from,
115 size_t n); 115 unsigned long n);
116 116
117/** 117/**
118 * __copy_to_user: - Copy a block of data into user space, with less checking. 118 * __copy_to_user: - Copy a block of data into user space, with less checking.
@@ -134,13 +134,13 @@ unsigned long __must_check __copy_to_user(void __user *to, const void *from,
134#define __copy_to_user_inatomic __copy_to_user 134#define __copy_to_user_inatomic __copy_to_user
135#define __copy_from_user_inatomic __copy_from_user 135#define __copy_from_user_inatomic __copy_from_user
136 136
137static inline int __put_user_fn(void *x, void __user *ptr, size_t size) 137static inline int __put_user_fn(void *x, void __user *ptr, unsigned long size)
138{ 138{
139 size = __copy_to_user(ptr, x, size); 139 size = __copy_to_user(ptr, x, size);
140 return size ? -EFAULT : 0; 140 return size ? -EFAULT : 0;
141} 141}
142 142
143static inline int __get_user_fn(void *x, const void __user *ptr, size_t size) 143static inline int __get_user_fn(void *x, const void __user *ptr, unsigned long size)
144{ 144{
145 size = __copy_from_user(x, ptr, size); 145 size = __copy_from_user(x, ptr, size);
146 return size ? -EFAULT : 0; 146 return size ? -EFAULT : 0;
@@ -308,9 +308,9 @@ strncpy_from_user(char *dst, const char __user *src, long count)
308 return __strncpy_from_user(dst, src, count); 308 return __strncpy_from_user(dst, src, count);
309} 309}
310 310
311size_t __must_check __strnlen_user(const char __user *src, size_t count); 311unsigned long __must_check __strnlen_user(const char __user *src, unsigned long count);
312 312
313static inline size_t strnlen_user(const char __user *src, size_t n) 313static inline unsigned long strnlen_user(const char __user *src, unsigned long n)
314{ 314{
315 might_fault(); 315 might_fault();
316 return __strnlen_user(src, n); 316 return __strnlen_user(src, n);
@@ -335,15 +335,15 @@ static inline size_t strnlen_user(const char __user *src, size_t n)
335/* 335/*
336 * Zero Userspace 336 * Zero Userspace
337 */ 337 */
338size_t __must_check __clear_user(void __user *to, size_t size); 338unsigned long __must_check __clear_user(void __user *to, unsigned long size);
339 339
340static inline size_t __must_check clear_user(void __user *to, size_t n) 340static inline unsigned long __must_check clear_user(void __user *to, unsigned long n)
341{ 341{
342 might_fault(); 342 might_fault();
343 return __clear_user(to, n); 343 return __clear_user(to, n);
344} 344}
345 345
346int copy_to_user_real(void __user *dest, void *src, size_t count); 346int copy_to_user_real(void __user *dest, void *src, unsigned long count);
347int copy_from_user_real(void *dest, void __user *src, size_t count); 347int copy_from_user_real(void *dest, void __user *src, unsigned long count);
348 348
349#endif /* __S390_UACCESS_H */ 349#endif /* __S390_UACCESS_H */