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

• Lines: 42
• Date: Tue Aug 29 14:09:15 2000
• Orig file: v2.4.0-test7/linux/include/asm-alpha/uaccess.h
• Orig date: Fri Jun 23 21:55:11 2000

diff -u --recursive --new-file v2.4.0-test7/linux/include/asm-alpha/uaccess.h linux/include/asm-alpha/uaccess.h
@@ -79,24 +79,6 @@
   __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; })
-
-/*
  * The "lda %1, 2b-1b(%0)" bits are magic to get the assembler to
  * encode the bits we need for resolving the exception.  See the
  * more extensive comments with fixup_inline_exception below for
@@ -416,16 +398,6 @@
 {
 	return __copy_tofrom_user(to, from, n, from);
 }
-
-#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 void __do_clear_user(void);