diff options
Diffstat (limited to 'include/asm-sparc64/uaccess.h')
| -rw-r--r-- | include/asm-sparc64/uaccess.h | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/include/asm-sparc64/uaccess.h b/include/asm-sparc64/uaccess.h index 72c2c6916..bf60670f4 100644 --- a/include/asm-sparc64/uaccess.h +++ b/include/asm-sparc64/uaccess.h @@ -1,4 +1,4 @@ -/* $Id: uaccess.h,v 1.32 1999/11/23 08:56:48 davem Exp $ */ +/* $Id: uaccess.h,v 1.33 2000/08/29 07:01:58 davem Exp $ */ #ifndef _ASM_UACCESS_H #define _ASM_UACCESS_H @@ -102,22 +102,12 @@ extern void __ret_efault(void); unsigned long __pu_addr = (unsigned long)(ptr); \ __put_user_nocheck((__typeof__(*(ptr)))(x),__pu_addr,sizeof(*(ptr))); }) -#define put_user_ret(x,ptr,retval) ({ \ -unsigned long __pu_addr = (unsigned long)(ptr); \ -__put_user_nocheck_ret((__typeof__(*(ptr)))(x),__pu_addr,sizeof(*(ptr)),retval); }) - #define get_user(x,ptr) ({ \ unsigned long __gu_addr = (unsigned long)(ptr); \ __get_user_nocheck((x),__gu_addr,sizeof(*(ptr)),__typeof__(*(ptr))); }) -#define get_user_ret(x,ptr,retval) ({ \ -unsigned long __gu_addr = (unsigned long)(ptr); \ -__get_user_nocheck_ret((x),__gu_addr,sizeof(*(ptr)),__typeof__(*(ptr)),retval); }) - #define __put_user(x,ptr) put_user(x,ptr) -#define __put_user_ret(x,ptr,retval) put_user_ret(x,ptr,retval) #define __get_user(x,ptr) get_user(x,ptr) -#define __get_user_ret(x,ptr,retval) get_user_ret(x,ptr,retval) struct __large_struct { unsigned long buf[100]; }; #define __m(x) ((struct __large_struct *)(x)) @@ -288,44 +278,14 @@ extern __kernel_size_t __copy_in_user(void *to, const void *from, __copy_from_user((void *)(to), \ (void *)(from), (__kernel_size_t)(n)) -#define copy_from_user_ret(to,from,n,retval) ({ \ -if (copy_from_user(to,from,n)) \ - return retval; \ -}) - -#define __copy_from_user_ret(to,from,n,retval) ({ \ -if (__copy_from_user(to,from,n)) \ - return retval; \ -}) - #define copy_to_user(to,from,n) \ __copy_to_user((void *)(to), \ (void *) (from), (__kernel_size_t)(n)) -#define copy_to_user_ret(to,from,n,retval) ({ \ -if (copy_to_user(to,from,n)) \ - return retval; \ -}) - -#define __copy_to_user_ret(to,from,n,retval) ({ \ -if (__copy_to_user(to,from,n)) \ - return retval; \ -}) - #define copy_in_user(to,from,n) \ __copy_in_user((void *)(to), \ (void *) (from), (__kernel_size_t)(n)) -#define copy_in_user_ret(to,from,n,retval) ({ \ -if (copy_in_user(to,from,n)) \ - return retval; \ -}) - -#define __copy_in_user_ret(to,from,n,retval) ({ \ -if (__copy_in_user(to,from,n)) \ - return retval; \ -}) - extern __inline__ __kernel_size_t __clear_user(void *addr, __kernel_size_t size) { extern __kernel_size_t __bzero_noasi(void *addr, __kernel_size_t size); @@ -336,11 +296,6 @@ extern __inline__ __kernel_size_t __clear_user(void *addr, __kernel_size_t size) #define clear_user(addr,n) \ __clear_user((void *)(addr), (__kernel_size_t)(n)) -#define clear_user_ret(addr,size,retval) ({ \ -if (clear_user(addr,size)) \ - return retval; \ -}) - extern int __strncpy_from_user(unsigned long dest, unsigned long src, int count); #define strncpy_from_user(dest,src,count) \ |