patch-2.4.0-test8 linux/include/asm-ia64/uaccess.h

• Lines: 36
• Date: Tue Aug 29 14:09:16 2000
• Orig file: v2.4.0-test7/linux/include/asm-ia64/uaccess.h
• Orig date: Wed Apr 26 16:34:09 2000

diff -u --recursive --new-file v2.4.0-test7/linux/include/asm-ia64/uaccess.h linux/include/asm-ia64/uaccess.h
@@ -86,16 +86,6 @@
 #define __put_user(x,ptr)	__put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
 #define __get_user(x,ptr)	__get_user_nocheck((x),(ptr),sizeof(*(ptr)))
   
-/*
- * The "xxx_ret" versions return constant specified in third argument, if
- * something bad happens. These macros can be optimized for the
- * case of just returning from the function xxx_ret is used.
- */
-#define put_user_ret(x,ptr,ret)		({ if (put_user(x,ptr)) return ret; })
-#define get_user_ret(x,ptr,ret)		({ if (get_user(x,ptr)) return ret; })
-#define __put_user_ret(x,ptr,ret)	({ if (__put_user(x,ptr)) return ret; })
-#define __get_user_ret(x,ptr,ret)	({ if (__get_user(x,ptr)) return ret; })
-
 extern void __get_user_unknown (void);
 
 #define __get_user_nocheck(x,ptr,size)				\
@@ -278,18 +268,6 @@
 		__cu_len = __copy_user(__cu_to, __cu_from, __cu_len);				\
 	}											\
 	__cu_len;										\
-})
-
-#define copy_to_user_ret(to,from,n,retval)	\
-({						\
-	if (copy_to_user(to,from,n))		\
-		return retval;			\
-})
-
-#define copy_from_user_ret(to,from,n,retval)	\
-({						\
-	if (copy_from_user(to,from,n))		\
-		return retval;			\
 })
 
 extern unsigned long __do_clear_user (void *, unsigned long);