[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1214602486-17080-33-git-send-email-gcosta@redhat.com>
Date: Fri, 27 Jun 2008 18:34:39 -0300
From: Glauber Costa <gcosta@...hat.com>
To: linux-kernel@...r.kernel.org
Cc: tglx@...utronix.de, mingo@...e.hu, x86@...nel.org
Subject: [PATCH 32/39] don't always use EFAULT on __get_user_size.
Let the user of the macro specify the desired return.
Signed-off-by: Glauber Costa <gcosta@...hat.com>
---
include/asm-x86/uaccess_64.h | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/asm-x86/uaccess_64.h b/include/asm-x86/uaccess_64.h
index 42c01aa..e0875d7 100644
--- a/include/asm-x86/uaccess_64.h
+++ b/include/asm-x86/uaccess_64.h
@@ -61,27 +61,27 @@ extern void __put_user_bad(void);
({ \
int __gu_err; \
unsigned long __gu_val; \
- __get_user_size(__gu_val, (ptr), (size), __gu_err); \
+ __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT);\
(x) = (__force typeof(*(ptr)))__gu_val; \
__gu_err; \
})
-#define __get_user_size(x, ptr, size, retval) \
+#define __get_user_size(x, ptr, size, retval, errret) \
do { \
retval = 0; \
__chk_user_ptr(ptr); \
switch (size) { \
case 1: \
- __get_user_asm(x, ptr, retval, "b", "b", "=q", -EFAULT);\
+ __get_user_asm(x, ptr, retval, "b", "b", "=q", errret);\
break; \
case 2: \
- __get_user_asm(x, ptr, retval, "w", "w", "=r", -EFAULT);\
+ __get_user_asm(x, ptr, retval, "w", "w", "=r", errret);\
break; \
case 4: \
- __get_user_asm(x, ptr, retval, "l", "k", "=r", -EFAULT);\
+ __get_user_asm(x, ptr, retval, "l", "k", "=r", errret);\
break; \
case 8: \
- __get_user_asm(x, ptr, retval, "q", "", "=r", -EFAULT); \
+ __get_user_asm(x, ptr, retval, "q", "", "=r", errret); \
break; \
default: \
(x) = __get_user_bad(); \
--
1.5.5.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists