x86: user put_user_x instead of all variants.

Follow the pattern, and define a single put_user_x, instead
of defining macros for all available sizes. Exception is
put_user_8, since the "A" constraint does not give us enough
power to specify which register (a or d) to use in the 32-bit
common case.

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>

1 files changed, 7 insertions, 18 deletions

diff --git a/include/asm-x86/uaccess_32.h b/include/asm-x86/uaccess_32.h
index 0ecfe47ad60d..f8abc12a77c2 100644
--- a/include/asm-x86/uaccess_32.h
+++ b/include/asm-x86/uaccess_32.h
@@ -186,25 +186,14 @@ extern void __put_user_2(void);
 extern void __put_user_4(void);
 extern void __put_user_8(void);
 
-#define __put_user_1(x, ptr)                                    \
-        asm volatile("call __put_user_1" : "=a" (__ret_pu)      \
-                     : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
-
-#define __put_user_2(x, ptr)                                    \
-        asm volatile("call __put_user_2" : "=a" (__ret_pu)      \
-                     : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
-
-#define __put_user_4(x, ptr)                                    \
-        asm volatile("call __put_user_4" : "=a" (__ret_pu)      \
-                     : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
+#define __put_user_x(size, x, ptr)                              \
+        asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
+                     :"0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
 
 #define __put_user_8(x, ptr)                                    \
         asm volatile("call __put_user_8" : "=a" (__ret_pu)      \
                      : "A" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
 
-#define __put_user_X(x, ptr)                                    \
-        asm volatile("call __put_user_X" : "=a" (__ret_pu)      \
-                     : "c" (ptr): "ebx")
 
 /**
  * put_user: - Write a simple value into user space.
@@ -232,19 +221,19 @@ extern void __put_user_8(void);
         __pu_val = x;                                           \
         switch (sizeof(*(ptr))) {                               \
         case 1:                                                 \
-                __put_user_1(__pu_val, ptr);                    \
+                __put_user_x(1, __pu_val, ptr);                 \
                 break;                                          \
         case 2:                                                 \
-                __put_user_2(__pu_val, ptr);                    \
+                __put_user_x(2, __pu_val, ptr);                 \
                 break;                                          \
         case 4:                                                 \
-                __put_user_4(__pu_val, ptr);                    \
+                __put_user_x(4, __pu_val, ptr);                 \
                 break;                                          \
         case 8:                                                 \
                 __put_user_8(__pu_val, ptr);                    \
                 break;                                          \
         default:                                                \
-                __put_user_X(__pu_val, ptr);                    \
+                __put_user_x(X, __pu_val, ptr);                 \
                 break;                                          \
         }                                                       \
         __ret_pu;                                               \