From d42e6af613375be7a9a431628ecd742e87230554 Mon Sep 17 00:00:00 2001
From: Glauber Costa <gcosta@redhat.com>
Date: Wed, 25 Jun 2008 12:00:44 -0300
Subject: [PATCH] x86: don't always use EFAULT on __put_user_size.
Let the user of the macro specify the desired return.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
include/asm-x86/uaccess_64.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/asm-x86/uaccess_64.h b/include/asm-x86/uaccess_64.h
index 81308763a4c13..6532d638d5a37 100644
--- a/include/asm-x86/uaccess_64.h
+++ b/include/asm-x86/uaccess_64.h
@@ -37,7 +37,7 @@ extern void __put_user_bad(void);
#define __put_user_nocheck(x, ptr, size) \
({ \
int __pu_err; \
- __put_user_size((x), (ptr), (size), __pu_err); \
+ __put_user_size((x), (ptr), (size), __pu_err, -EFAULT); \
__pu_err; \
})
@@ -65,22 +65,22 @@ extern void __put_user_bad(void);
__pu_err; \
})
-#define __put_user_size(x, ptr, size, retval) \
+#define __put_user_size(x, ptr, size, retval, errret) \
do { \
retval = 0; \
__chk_user_ptr(ptr); \
switch (size) { \
case 1: \
- __put_user_asm(x, ptr, retval, "b", "b", "iq", -EFAULT);\
+ __put_user_asm(x, ptr, retval, "b", "b", "iq", errret);\
break; \
case 2: \
- __put_user_asm(x, ptr, retval, "w", "w", "ir", -EFAULT);\
+ __put_user_asm(x, ptr, retval, "w", "w", "ir", errret);\
break; \
case 4: \
- __put_user_asm(x, ptr, retval, "l", "k", "ir", -EFAULT);\
+ __put_user_asm(x, ptr, retval, "l", "k", "ir", errret);\
break; \
case 8: \
- __put_user_asm(x, ptr, retval, "q", "", "Zr", -EFAULT); \
+ __put_user_asm(x, ptr, retval, "q", "", "Zr", errret); \
break; \
default: \
__put_user_bad(); \
--
2.30.2