aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-06-25 12:59:37 -0300
committerIngo Molnar <mingo@elte.hu>2008-07-09 09:14:25 +0200
commit64a978c1e3b2c0e2b663caf54719319919c5c17f (patch)
tree77ba89f872e82bc4fffe35f31aed354908e95989 /include
parent3f168221167ca7a844fde3bf58e1c7ca0bf9741e (diff)
x86: be more explicit in __put_user_x.
For both __put_user_x and __put_user_8 macros, pass the error variable explicitly. 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>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/uaccess_32.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/asm-x86/uaccess_32.h b/include/asm-x86/uaccess_32.h
index ebfe6b23ba5..2c9067324d2 100644
--- a/include/asm-x86/uaccess_32.h
+++ b/include/asm-x86/uaccess_32.h
@@ -31,11 +31,11 @@ extern void __put_user_2(void);
extern void __put_user_4(void);
extern void __put_user_8(void);
-#define __put_user_x(size, x, ptr) \
+#define __put_user_x(size, x, ptr, __ret_pu) \
asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
:"0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
-#define __put_user_8(x, ptr) \
+#define __put_user_8(x, ptr, __ret_pu) \
asm volatile("call __put_user_8" : "=a" (__ret_pu) \
: "A" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
@@ -66,19 +66,19 @@ extern void __put_user_8(void);
__pu_val = x; \
switch (sizeof(*(ptr))) { \
case 1: \
- __put_user_x(1, __pu_val, ptr); \
+ __put_user_x(1, __pu_val, ptr, __ret_pu); \
break; \
case 2: \
- __put_user_x(2, __pu_val, ptr); \
+ __put_user_x(2, __pu_val, ptr, __ret_pu); \
break; \
case 4: \
- __put_user_x(4, __pu_val, ptr); \
+ __put_user_x(4, __pu_val, ptr, __ret_pu); \
break; \
case 8: \
- __put_user_8(__pu_val, ptr); \
+ __put_user_8(__pu_val, ptr, __ret_pu); \
break; \
default: \
- __put_user_x(X, __pu_val, ptr); \
+ __put_user_x(X, __pu_val, ptr, __ret_pu); \
break; \
} \
__ret_pu; \