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>

diff --git a/include/asm-x86/uaccess_64.h b/include/asm-x86/uaccess_64.h
index 81308763a4c13f28636436092e1ef0e49561dcc4..6532d638d5a37bc8d1e9920cc690c2d5f4c66990 100644 (file)
--- 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();                                       \